[xml/sgml-commit] r160 - packages/libxml2/trunk/debian

[Mike Hommey]

Author: glandium-guest
Date: 2004-06-02 01:03:35 -0600 (Wed, 02 Jun 2004)
New Revision: 160

Modified:
   packages/libxml2/trunk/debian/changelog
   packages/libxml2/trunk/debian/control
   packages/libxml2/trunk/debian/rules
Log:
debian/control: changed deps on libz-dev to zlib1g-dev | libz-dev.
debian/rules: made binary-indep target actually build the libxml2-doc package which is Arch: all.


Modified: packages/libxml2/trunk/debian/changelog
===================================================================
--- packages/libxml2/trunk/debian/changelog	2004-06-02 02:20:18 UTC (rev 159)
+++ packages/libxml2/trunk/debian/changelog	2004-06-02 07:03:35 UTC (rev 160)
@@ -1,3 +1,11 @@
+libxml2 (2.6.10-3) unstable; urgency=low
+
+  * debian/control: changed deps on libz-dev to zlib1g-dev | libz-dev.
+  * debian/rules: made binary-indep target actually build the libxml2-doc
+    package which is Arch: all. Closes: #251971.
+
+ -- Mike Hommey <mh@glandium.org>  Wed,  2 Jun 2004 15:57:21 +0900
+
 libxml2 (2.6.10-2) unstable; urgency=low
 
   * debian/watch: updated the watch file to exclude the cvs-snapshot from

Modified: packages/libxml2/trunk/debian/control
===================================================================
--- packages/libxml2/trunk/debian/control	2004-06-02 02:20:18 UTC (rev 159)
+++ packages/libxml2/trunk/debian/control	2004-06-02 07:03:35 UTC (rev 160)
@@ -4,7 +4,7 @@
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs@lists.alioth.debian.org>
 Uploaders: Mike Hommey <mh@glandium.org>
 Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4.0.0), libz-dev, python2.3-dev, autotools-dev
+Build-Depends: debhelper (>= 4.0.0), zlib1g-dev | libz-dev, python2.3-dev, autotools-dev
 
 Package: libxml2
 Architecture: any
@@ -43,7 +43,7 @@
 Package: libxml2-dev
 Architecture: any
 Section: libdevel
-Depends: libxml2 (= ${Source-Version}), libz-dev
+Depends: libxml2 (= ${Source-Version}), zlib1g-dev | libz-dev
 Replaces: libxml2 (<= 2.6.6-1), libxml2-headers (= 2.6.7-1)
 Conflicts: libxml2 (<= 2.6.6-1), libxml2-headers (= 2.6.7-1)
 Description: Development files for the GNOME XML library

Modified: packages/libxml2/trunk/debian/rules
===================================================================
--- packages/libxml2/trunk/debian/rules	2004-06-02 02:20:18 UTC (rev 159)
+++ packages/libxml2/trunk/debian/rules	2004-06-02 07:03:35 UTC (rev 160)
@@ -65,28 +65,41 @@
 
 # Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
+	dh_testdir -i
+	dh_testroot -i
+	dh_installdocs -i -A AUTHORS TODO README
+	dh_installchangelogs -i ChangeLog
+	dh_install -i --sourcedir=debian/tmp
+	dh_link -i
+	dh_strip -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
 # Build architecture-dependent files here.
 binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installexamples
-	dh_installdocs -A AUTHORS TODO README
+	dh_testdir -a
+	dh_testroot -a
+	dh_installexamples -a
+	dh_installdocs -a -A AUTHORS TODO README
 	dh_installdocs -plibxml2-python2.3 python/TODO
-	dh_installman
-	dh_installchangelogs ChangeLog
-	dh_install --sourcedir=debian/tmp
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs -V 'libxml2 (>= 2.6.10)'
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_installman -a
+	dh_installchangelogs -a ChangeLog
+	dh_install -a --sourcedir=debian/tmp
+	dh_link -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_makeshlibs -a -V 'libxml2 (>= 2.6.10)'
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
 source diff:                                                                  
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false