[Pkg-gnutls-commits] r1041 - in /packages/gnutls26/branches/branch2.11.x/debian: changelog patches/17_goldhotfix.patch patches/series

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Thu Mar 10 11:19:45 2011
New Revision: 1041

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1041
Log:
Upload 2.11.7-1 to experimental

Added:
    packages/gnutls26/branches/branch2.11.x/debian/patches/17_goldhotfix.patch
Modified:
    packages/gnutls26/branches/branch2.11.x/debian/changelog
    packages/gnutls26/branches/branch2.11.x/debian/patches/series

Modified: packages/gnutls26/branches/branch2.11.x/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.11.x/debian/changelog?rev=1041&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.11.x/debian/changelog (original)
+++ packages/gnutls26/branches/branch2.11.x/debian/changelog Thu Mar 10 11:19:45 2011
@@ -3,8 +3,9 @@
   * New upstream version (rc for 2.12)
     + Drop superfluous patches (15_fixgnutlspc.diff 17_endian.diff)
     + Bump shlibs.
-
- -- Andreas Metzler <ametzler at debian.org>  Thu, 10 Mar 2011 11:00:21 +0100
+  * debian/patches/17_goldhotfix.patch Link gnutls-extra gainst gcrypt.
+
+ -- Andreas Metzler <ametzler at debian.org>  Thu, 10 Mar 2011 12:12:01 +0100
 
 gnutls26 (2.11.6-2) experimental; urgency=low
 

Added: packages/gnutls26/branches/branch2.11.x/debian/patches/17_goldhotfix.patch
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.11.x/debian/patches/17_goldhotfix.patch?rev=1041&op=file
==============================================================================
--- packages/gnutls26/branches/branch2.11.x/debian/patches/17_goldhotfix.patch (added)
+++ packages/gnutls26/branches/branch2.11.x/debian/patches/17_goldhotfix.patch Thu Mar 10 11:19:45 2011
@@ -1,0 +1,18 @@
+Description: Link gnutls-extra gainst libgcrypt
+ Needed for building with gold.
+ This a hotfix, touch generated files. A proper patch has been
+ forwarded upstream.
+Author: Andreas Metzler <ametzler at downhill.at.eu.org>
+Forwarded: http://lists.gnu.org/archive/html/gnutls-devel/2011-03/msg00017.html
+
+--- gnutls26-2.11.7.orig/libextra/Makefile.in
++++ gnutls26-2.11.7/libextra/Makefile.in
+@@ -531,7 +531,7 @@ libgnutls_openssl_la_LDFLAGS = -no-undef
+ @ENABLE_OPENSSL_TRUE@	../lib/libgnutls.la $(am__append_4)
+ 
+ # OpenPGP
+-libgnutls_extra_la_LIBADD = $(LIBSOCKET) ../lib/gl/liblgnu.la \
++libgnutls_extra_la_LIBADD = $(LIBSOCKET) -lgcrypt ../lib/gl/liblgnu.la \
+ 	gl/libxgnu.la ../lib/libgnutls.la
+ libgnutls_extra_la_LDFLAGS = -no-undefined $(am__append_8) \
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \

Modified: packages/gnutls26/branches/branch2.11.x/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/branches/branch2.11.x/debian/patches/series?rev=1041&op=diff
==============================================================================
--- packages/gnutls26/branches/branch2.11.x/debian/patches/series (original)
+++ packages/gnutls26/branches/branch2.11.x/debian/patches/series Thu Mar 10 11:19:45 2011
@@ -1,2 +1,3 @@
 14_version_gettextcat.diff
 16_unnecessarydep.diff
+17_goldhotfix.patch