[xml/sgml-commit] r574 - in packages/libxslt: . trunk trunk/debian

[Mike Hommey]

Author: glandium
Date: 2006-08-03 06:20:54 +0000 (Thu, 03 Aug 2006)
New Revision: 574

Removed:
   packages/libxslt/trunk/debian/libxslt1.install
Modified:
   packages/libxslt/
   packages/libxslt/trunk/debian/changelog
   packages/libxslt/trunk/debian/control
   packages/libxslt/trunk/debian/libxslt1-dev.install
   packages/libxslt/trunk/debian/rules
   packages/libxslt/trunk/xslt-config.in
Log:
 r1106 at namakemono:  mh | 2006-08-03 07:37:11 +0200
 * debian/libxslt1.install: Really removed.
 * debian/control:
   - Force build against latest libxml2 with "hacked" .la file so that
     libxslt's .la file doesn't contain spurious dependencies.
   - Bump Standards-Version to 3.7.2.1: no changes required.
 * debian/libxslt-dev.install: Don't install libexslt.la.
 * debian/rules: Filter out dependency_libs in libexslt.la.
   The 2 latter changes fix build issues with libtool, though it breaks
   static linking with libtool, which was already broken by libxml2 anyway.
   We recommend the use of pkg-config --static --libs instead.
   Closes: #379714.
 * xst-config.in: Fix --static output to use xml2-config.



Property changes on: packages/libxslt
___________________________________________________________________
Name: svk:merge
   - 85a06573-1206-0410-a182-ce9117885d71:/local/libxslt:284
a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxslt:1099
   + 85a06573-1206-0410-a182-ce9117885d71:/local/libxslt:284
a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxslt:1106

Modified: packages/libxslt/trunk/debian/changelog
===================================================================
--- packages/libxslt/trunk/debian/changelog	2006-07-30 07:20:09 UTC (rev 573)
+++ packages/libxslt/trunk/debian/changelog	2006-08-03 06:20:54 UTC (rev 574)
@@ -1,3 +1,20 @@
+libxslt (1.1.17-3) unstable; urgency=medium
+
+  * debian/libxslt1.install: Really removed.
+  * debian/control:
+    - Force build against latest libxml2 with "hacked" .la file so that
+      libxslt's .la file doesn't contain spurious dependencies.
+    - Bump Standards-Version to 3.7.2.1: no changes required.
+  * debian/libxslt-dev.install: Don't install libexslt.la.
+  * debian/rules: Filter out dependency_libs in libexslt.la.
+    The 2 latter changes fix build issues with libtool, though it breaks
+    static linking with libtool, which was already broken by libxml2 anyway.
+    We recommend the use of pkg-config --static --libs instead.
+    Closes: #379714.
+  * xst-config.in: Fix --static output to use xml2-config.
+
+ -- Mike Hommey <glandium at debian.org>  Thu,  3 Aug 2006 07:36:17 +0200
+
 libxslt (1.1.17-2) unstable; urgency=low
 
   * The slithering release.

Modified: packages/libxslt/trunk/debian/control
===================================================================
--- packages/libxslt/trunk/debian/control	2006-07-30 07:20:09 UTC (rev 573)
+++ packages/libxslt/trunk/debian/control	2006-08-03 06:20:54 UTC (rev 574)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
 Uploaders: Mike Hommey <glandium at debian.org>
-Standards-Version: 3.7.2.0
-Build-Depends: debhelper (>= 5.0.37.2), libxml2-dev (>= 2.6.26.dfsg-2), python-all-dev (>= 2.3.5-11), python-support (>= 0.3), libgcrypt11-dev, autotools-dev, binutils (>= 2.14.90.0.7)
+Standards-Version: 3.7.2.1
+Build-Depends: debhelper (>= 5.0.37.2), libxml2-dev (>= 2.6.26.dfsg-3), python-all-dev (>= 2.3.5-11), python-support (>= 0.3), libgcrypt11-dev, autotools-dev, binutils (>= 2.14.90.0.7)
 
 Package: libxslt1.1
 Section: libs

Modified: packages/libxslt/trunk/debian/libxslt1-dev.install
===================================================================
--- packages/libxslt/trunk/debian/libxslt1-dev.install	2006-07-30 07:20:09 UTC (rev 573)
+++ packages/libxslt/trunk/debian/libxslt1-dev.install	2006-08-03 06:20:54 UTC (rev 574)
@@ -2,7 +2,6 @@
 usr/lib/libxslt.a
 usr/lib/libexslt.a
 usr/lib/libxslt.la
-usr/lib/libexslt.la
 usr/lib/libxslt.so
 usr/lib/libexslt.so
 usr/lib/pkgconfig

Deleted: packages/libxslt/trunk/debian/libxslt1.install
===================================================================
--- packages/libxslt/trunk/debian/libxslt1.install	2006-07-30 07:20:09 UTC (rev 573)
+++ packages/libxslt/trunk/debian/libxslt1.install	2006-08-03 06:20:54 UTC (rev 574)
@@ -1 +0,0 @@
-usr/lib/libxsltbreakpoint.so.*

Modified: packages/libxslt/trunk/debian/rules
===================================================================
--- packages/libxslt/trunk/debian/rules	2006-07-30 07:20:09 UTC (rev 573)
+++ packages/libxslt/trunk/debian/rules	2006-08-03 06:20:54 UTC (rev 574)
@@ -154,6 +154,7 @@
 	dh_testdir
 	dh_testroot
 	dh_install -a --sourcedir=$(TMP_DIR)
+	sed "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/libexslt.la > debian/libxslt1-dev/usr/lib/libexslt.la
 	dh_installman -a
 	dh_installdocs -a -A AUTHORS FEATURES NEWS README TODO
 	dh_installexamples -a

Modified: packages/libxslt/trunk/xslt-config.in
===================================================================
--- packages/libxslt/trunk/xslt-config.in	2006-07-30 07:20:09 UTC (rev 573)
+++ packages/libxslt/trunk/xslt-config.in	2006-08-03 06:20:54 UTC (rev 574)
@@ -108,7 +108,7 @@
 fi
 
 if $static; then
-    the_libs="$the_libs @M_LIBS@"
+    the_libs="$the_libs @M_LIBS@ `@XML_CONFIG@ --libs --static`"
 fi
 
 if $libs; then