diff -Nru libxml2-2.8.0+dfsg1/debian/changelog libxml2-2.8.0+dfsg1/debian/changelog --- libxml2-2.8.0+dfsg1/debian/changelog 2012-06-25 13:04:33.000000000 +0100 +++ libxml2-2.8.0+dfsg1/debian/changelog 2012-06-25 14:34:07.000000000 +0100 @@ -1,3 +1,10 @@ +libxml2 (2.8.0+dfsg1-4ubuntu1) quantal; urgency=low + + * Merge with Debian (LP: #987502), remaining changes: + - Don't drop *.la file. Some libraries still depend on it. + + -- Iain Lane Mon, 25 Jun 2012 13:14:43 +0100 + libxml2 (2.8.0+dfsg1-4) unstable; urgency=low * Sanitize the output of `xml2-config --libs`. diff -Nru libxml2-2.8.0+dfsg1/debian/control libxml2-2.8.0+dfsg1/debian/control --- libxml2-2.8.0+dfsg1/debian/control 2012-06-25 13:07:21.000000000 +0100 +++ libxml2-2.8.0+dfsg1/debian/control 2012-06-25 16:43:49.000000000 +0100 @@ -1,7 +1,8 @@ Source: libxml2 Priority: optional Section: libs -Maintainer: Debian XML/SGML Group +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian XML/SGML Group Uploaders: Aron Xu , YunQiang Su Standards-Version: 3.9.3 Build-Depends: debhelper (>= 9), perl, dh-autoreconf, autotools-dev, @@ -144,3 +145,18 @@ This package contains the files needed to use the GNOME XML library in Python programs for use with the Python debug interpreter. +Package: libxml2-udeb +XC-Package-Type: udeb +Architecture: any +Section: debian-installer +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: GNOME XML library - minimal runtime + XML is a metalanguage to let you design your own markup language. + A regular markup language defines a way to describe information in + a certain class of documents (eg HTML). XML lets you define your + own customized markup languages for many classes of document. It + can do this because it's written in SGML, the international standard + metalanguage for markup languages. + . + This is a minimal package for use in debian-installer that yields a + library providing an extensive API to handle such XML data files. diff -Nru libxml2-2.8.0+dfsg1/debian/libxml2-dev.install libxml2-2.8.0+dfsg1/debian/libxml2-dev.install --- libxml2-2.8.0+dfsg1/debian/libxml2-dev.install 2012-06-02 10:10:03.000000000 +0100 +++ libxml2-2.8.0+dfsg1/debian/libxml2-dev.install 2012-06-25 14:44:49.000000000 +0100 @@ -1,6 +1,7 @@ usr/bin/xml2-config usr/lib/*/libxml2.so usr/lib/*/libxml2.a +usr/lib/*/libxml2.la usr/lib/*/xml2Conf.sh usr/share/aclocal usr/lib/*/pkgconfig diff -Nru libxml2-2.8.0+dfsg1/debian/rules libxml2-2.8.0+dfsg1/debian/rules --- libxml2-2.8.0+dfsg1/debian/rules 2012-06-02 22:55:35.000000000 +0100 +++ libxml2-2.8.0+dfsg1/debian/rules 2012-06-25 14:43:13.000000000 +0100 @@ -56,7 +56,8 @@ dh_auto_clean override_dh_auto_install: $(TARGETS:%=doinstall-%) - find debian/ -name *.la -delete + sed -i "/dependency_libs/ s/'.*'/''/" \ + debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libxml2.la doinstall-main: dh_auto_install --builddirectory=builddir/main