From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, thirteen,
 updated. 3b772d874a34a87798b1ae02ac0eeed3e3d5f60a
Date: Wed, 28 Nov 2012 16:35:20 +0100
Message-ID: <20121128153521.0B43120263@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2712201293701392827=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============2712201293701392827==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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, thirteen has been updated
       via  3b772d874a34a87798b1ae02ac0eeed3e3d5f60a (commit)
       via  bb71011054a715f8781a6b1945af1fe16df3c0db (commit)
      from  ef3bc862489a5dfddd0d242a7eb7a0e545996e04 (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 3b772d874a34a87798b1ae02ac0eeed3e3d5f60a
Merge: bb71011 ef3bc86
Author: Arne Fitzenreiter <Arne_F(a)ipfire.org>
Date:   Wed Nov 28 16:34:45 2012 +0100

    Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into t=
hirteen

commit bb71011054a715f8781a6b1945af1fe16df3c0db
Author: Arne Fitzenreiter <Arne_F(a)ipfire.org>
Date:   Wed Nov 28 16:32:43 2012 +0100

    pycurl: remove dependency to curl because curl is no addon.

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

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

Difference in files:
diff --git a/lfs/pycurl b/lfs/pycurl
index 2bc3c44..cf8bd71 100644
--- a/lfs/pycurl
+++ b/lfs/pycurl
@@ -1,7 +1,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                    =
  #
+# Copyright (C) 2007-2012  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    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D pycurl
-PAK_VER    =3D 1
+PAK_VER    =3D 2
=20
-DEPS       =3D "curl"
+DEPS       =3D ""
=20
 CFLAGS    +=3D -DHAVE_CURL_OPENSSL
=20


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

--===============2712201293701392827==--