[Pkg-gnutls-commits] r123 - in /packages/gnutls13/trunk/debian: changelog libgnutls-dev.README.Debian patches/13_lessdeps_gnutls-config.diff patches/16_libs.private_gnutls-extra.diff patches/16_libs.private_gnutls.diff

ametzler at users.alioth.debian.org ametzler at users.alioth.debian.org
Sun Jul 2 13:09:07 UTC 2006


Author: ametzler
Date: Sun Jul  2 13:09:04 2006
New Revision: 123

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=123
Log:
Strip "libgnutls-config --libs" to only list stuff required for dynamic linking. #375815

Added:
    packages/gnutls13/trunk/debian/libgnutls-dev.README.Debian
    packages/gnutls13/trunk/debian/patches/13_lessdeps_gnutls-config.diff
    packages/gnutls13/trunk/debian/patches/16_libs.private_gnutls-extra.diff
    packages/gnutls13/trunk/debian/patches/16_libs.private_gnutls.diff
Modified:
    packages/gnutls13/trunk/debian/changelog

Modified: packages/gnutls13/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls13/trunk/debian/changelog?rev=123&op=diff
==============================================================================
--- packages/gnutls13/trunk/debian/changelog (original)
+++ packages/gnutls13/trunk/debian/changelog Sun Jul  2 13:09:04 2006
@@ -1,8 +1,14 @@
-gnutls13 (1.4.0-3) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Andreas Metzler <ametzler at downhill.aus.cc>  Sat, 17 Jun 2006 21:08:36 +0200
+gnutls13 (1.4.0-3) unstable; urgency=low
+
+  [ Andreas Metzler ]
+  * Strip "libgnutls-config --libs"' output to only list stuff required for
+    dynamic linking. (Closes: #375815). Document this in "libgnutls-dev's
+    README.Debian.
+  * Pull patches/16_libs.private_gnutls.diff and
+    debian/patches/16_libs.private_gnutls-extra.diff from upstream to make
+    pkg-config usable for static linking.
+
+ -- Andreas Metzler <ametzler at debian.org>  Sun,  2 Jul 2006 12:10:56 +0200
 
 gnutls13 (1.4.0-2) unstable; urgency=low
 

Added: packages/gnutls13/trunk/debian/libgnutls-dev.README.Debian
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls13/trunk/debian/libgnutls-dev.README.Debian?rev=123&op=file
==============================================================================
--- packages/gnutls13/trunk/debian/libgnutls-dev.README.Debian (added)
+++ packages/gnutls13/trunk/debian/libgnutls-dev.README.Debian Sun Jul  2 13:09:04 2006
@@ -1,0 +1,10 @@
+libgnutls-config is patched to only list stuff needed for dynamic
+linking against libgnutls (i.e. "-lgnutls") on Debian. Static linking
+requires using either
+
+a) libtool
+b) "pkg-config --libs --static gnutls" instead of libgnutls-config --libs.
+
+This also applies to libgnutls-extra-config.
+
+Andreas Metzler

Added: packages/gnutls13/trunk/debian/patches/13_lessdeps_gnutls-config.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls13/trunk/debian/patches/13_lessdeps_gnutls-config.diff?rev=123&op=file
==============================================================================
--- packages/gnutls13/trunk/debian/patches/13_lessdeps_gnutls-config.diff (added)
+++ packages/gnutls13/trunk/debian/patches/13_lessdeps_gnutls-config.diff Sun Jul  2 13:09:04 2006
@@ -1,0 +1,13 @@
+diff -Nur gnutls13-1.4.0.foo/lib/libgnutls-config.in gnutls13-1.4.0/lib/libgnutls-config.in
+--- gnutls13-1.4.0.foo/lib/libgnutls-config.in	2005-07-02 21:41:49.000000000 +0000
++++ gnutls13-1.4.0/lib/libgnutls-config.in	2006-07-02 10:04:39.382609128 +0000
+@@ -4,7 +4,8 @@
+ exec_prefix=@exec_prefix@
+ exec_prefix_set=no
+ 
+-gnutls_libs="@LIBGNUTLS_LIBS@"
++#gnutls_libs="@LIBGNUTLS_LIBS@"
++gnutls_libs="-lgnutls"
+ gnutls_cflags="@LIBGNUTLS_CFLAGS@"
+ gnutls_la_file="@libdir@/libgnutls.la"
+ 

Added: packages/gnutls13/trunk/debian/patches/16_libs.private_gnutls-extra.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls13/trunk/debian/patches/16_libs.private_gnutls-extra.diff?rev=123&op=file
==============================================================================
--- packages/gnutls13/trunk/debian/patches/16_libs.private_gnutls-extra.diff (added)
+++ packages/gnutls13/trunk/debian/patches/16_libs.private_gnutls-extra.diff Sun Jul  2 13:09:04 2006
@@ -1,0 +1,20 @@
+===================================================================
+RCS file: /cvs/gnutls/gnutls/libextra/gnutls-extra.pc.in,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- gnutls/libextra/gnutls-extra.pc.in	2005/01/24 19:11:09	1.2
++++ gnutls/libextra/gnutls-extra.pc.in	2006/06/26 09:06:41	1.3
+@@ -1,5 +1,5 @@
+ # Process this file with autoconf to produce a pkg-config metadata file.
+-# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation
++# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation
+ # Author: Simon Josefsson
+ # 
+ # This file is free software; as a special exception the author gives
+@@ -20,4 +20,5 @@
+ Requires: gnutls
+ Version: @VERSION@
+ Libs: -L${libdir} -lgnutls-extra
++Libs.private: @LIBGNUTLS_EXTRA_LIBS@
+ Cflags: -I${includedir}

Added: packages/gnutls13/trunk/debian/patches/16_libs.private_gnutls.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls13/trunk/debian/patches/16_libs.private_gnutls.diff?rev=123&op=file
==============================================================================
--- packages/gnutls13/trunk/debian/patches/16_libs.private_gnutls.diff (added)
+++ packages/gnutls13/trunk/debian/patches/16_libs.private_gnutls.diff Sun Jul  2 13:09:04 2006
@@ -1,0 +1,20 @@
+===================================================================
+RCS file: /cvs/gnutls/gnutls/lib/gnutls.pc.in,v
+retrieving revision 2.3
+retrieving revision 2.4
+diff -u -r2.3 -r2.4
+--- gnutls/lib/gnutls.pc.in	2005/01/24 19:11:19	2.3
++++ gnutls/lib/gnutls.pc.in	2006/06/26 09:06:42	2.4
+@@ -1,5 +1,5 @@
+ # Process this file with autoconf to produce a pkg-config metadata file.
+-# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation
++# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation
+ # Author: Simon Josefsson
+ # 
+ # This file is free software; as a special exception the author gives
+@@ -19,4 +19,5 @@
+ Description: Transport Security Layer implementation for the GNU system
+ Version: @VERSION@
+ Libs: -L${libdir} -lgnutls
++Libs.private: @LIBGNUTLS_LIBS@ 
+ Cflags: -I${includedir}




More information about the Pkg-gnutls-commits mailing list