[xml/sgml-commit] r572 - in packages/libxml2: . trunk trunk/debian

[Mike Hommey]

Author: glandium
Date: 2006-07-30 07:20:01 +0000 (Sun, 30 Jul 2006)
New Revision: 572

Modified:
   packages/libxml2/
   packages/libxml2/trunk/debian/changelog
   packages/libxml2/trunk/debian/libxml2-dev.install
   packages/libxml2/trunk/debian/rules
   packages/libxml2/trunk/xml2-config.in
Log:
 r1102 at namakemono:  mh | 2006-07-27 19:41:28 +0200
 * debian/rules, debian/libxml2-dev.install: Don't install libxml2.la
   directly and sed it to remove the dependency_libs. Note that will break
   linking statically libxml2 with libtool, we recommend to use pkg-config
   --static --libs libxml-2.0 instead of relying on libtool.
   Closes: #379807, #378511.
 * xml2-config.in: Fixed usage alignment of the new option introduced in
   previous upload.



Property changes on: packages/libxml2
___________________________________________________________________
Name: svk:merge
   - 85a06573-1206-0410-a182-ce9117885d71:/local/libxml2:296
a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxml2:1094
   + 85a06573-1206-0410-a182-ce9117885d71:/local/libxml2:296
a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxml2:1102

Modified: packages/libxml2/trunk/debian/changelog
===================================================================
--- packages/libxml2/trunk/debian/changelog	2006-07-01 12:41:50 UTC (rev 571)
+++ packages/libxml2/trunk/debian/changelog	2006-07-30 07:20:01 UTC (rev 572)
@@ -1,3 +1,15 @@
+libxml2 (2.6.26.dfsg-3) unstable; urgency=medium
+
+  * debian/rules, debian/libxml2-dev.install: Don't install libxml2.la
+    directly and sed it to remove the dependency_libs. Note that will break
+    linking statically libxml2 with libtool, we recommend to use pkg-config
+    --static --libs libxml-2.0 instead of relying on libtool.
+    Closes: #379807, #378511.
+  * xml2-config.in: Fixed usage alignment of the new option introduced in
+    previous upload.
+
+ -- Mike Hommey <glandium at debian.org>  Thu, 27 Jul 2006 19:40:27 +0200
+
 libxml2 (2.6.26.dfsg-2) unstable; urgency=low
 
   * The slithering release.
@@ -30,6 +42,8 @@
   * debian/control: Made libxml2-doc suggest devhelper.
   * libxml-2.0.pc.in, libxml-2.0-uninstalled.pc.in: Split Libs in Libs and
     Libs.private.
+  * configure.in, configure: Adapted to fill the variables correctly for
+    libraries.
   * xml2-config.in, xml2-config.1: Added a --static option to add to --libs
     so that we can split what is needed when building statically and what is
     needed when building dynamically. Closes: #374017.

Modified: packages/libxml2/trunk/debian/libxml2-dev.install
===================================================================
--- packages/libxml2/trunk/debian/libxml2-dev.install	2006-07-01 12:41:50 UTC (rev 571)
+++ packages/libxml2/trunk/debian/libxml2-dev.install	2006-07-30 07:20:01 UTC (rev 572)
@@ -1,6 +1,5 @@
 usr/bin/xml2-config
 usr/lib/libxml2.so
-usr/lib/libxml2.la
 usr/lib/libxml2.a
 usr/lib/xml2Conf.sh
 usr/share/aclocal

Modified: packages/libxml2/trunk/debian/rules
===================================================================
--- packages/libxml2/trunk/debian/rules	2006-07-01 12:41:50 UTC (rev 571)
+++ packages/libxml2/trunk/debian/rules	2006-07-30 07:20:01 UTC (rev 572)
@@ -152,6 +152,7 @@
 	dh_installman -a
 	dh_installchangelogs -plibxml2 ChangeLog
 	dh_install -a --sourcedir=debian/tmp
+	sed "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/libxml2.la > debian/libxml2-dev/usr/lib/libxml2.la
 	dh_pysupport -a
 	dh_python -a
 	dh_link -a

Modified: packages/libxml2/trunk/xml2-config.in
===================================================================
--- packages/libxml2/trunk/xml2-config.in	2006-07-01 12:41:50 UTC (rev 571)
+++ packages/libxml2/trunk/xml2-config.in	2006-07-30 07:20:01 UTC (rev 572)
@@ -15,7 +15,7 @@
   --prefix=DIR		change libxml prefix [default $prefix]
   --exec-prefix=DIR	change libxml exec prefix [default $exec_prefix]
   --libs		print library linking information
-                add --static to print static library linking information
+        		add --static to print static library linking information
   --cflags		print pre-processor and compiler flags
   --modules		module support enabled
   --help		display this help and exit