public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6201ce613a2d2bceaf9bce3305de292f658e2fe0
Date: Wed, 02 Jan 2013 22:03:38 +0100	[thread overview]
Message-ID: <20130102210338.E214120142@argus.ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 2740 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  6201ce613a2d2bceaf9bce3305de292f658e2fe0 (commit)
       via  e4061f1f14ebcea7928fdef06e7940446f268b79 (commit)
      from  31d619a6ef001219e7268e63fd7cdd6dc7c9271b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6201ce613a2d2bceaf9bce3305de292f658e2fe0
Merge: 31d619a e4061f1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Jan 2 22:02:43 2013 +0100

    Merge remote-tracking branch 'stevee/pakfire3-fixes' into next

commit e4061f1f14ebcea7928fdef06e7940446f268b79
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Wed Jan 2 20:26:18 2013 +0100

    pakfire3: Fix dependencies.
    
    There was a wrong dependency (libsatsolver) declared, which doesn't exist anymore.
    The dependency to pygpgme was missing.

-----------------------------------------------------------------------

Summary of changes:
 lfs/pakfire3 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/lfs/pakfire3 b/lfs/pakfire3
index a0e19dd..61dd988 100644
--- a/lfs/pakfire3
+++ b/lfs/pakfire3
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  IPFire Team  <info(a)ipfire.org>                          #
+# Copyright (C) 2013  IPFire Team  <info(a)ipfire.org>                          #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -32,9 +32,9 @@ DL_FROM    = http://source.ipfire.org/releases/pakfire/
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG	   = pakfire3
-PAK_VER    = 1
+PAK_VER    = 2
 
-DEPS       = "libsatsolver pycurl python-progressbar python-xattr sqlite urlgrabber"
+DEPS       = "libsolv pycurl pygpgme python-progressbar python-xattr sqlite urlgrabber"
 
 ###############################################################################
 # Top-level Rules


hooks/post-receive
--
IPFire 2.x development tree

                 reply	other threads:[~2013-01-02 21:03 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130102210338.E214120142@argus.ipfire.org \
    --to=git@ipfire.org \
    --cc=ipfire-scm@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox