[maemo-commits] [maemo-commits] r10027 - projects/haf/trunk/dpkg/debian

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-02-19 18:09:48 +0200 (Mon, 19 Feb 2007)
New Revision: 10027

Modified:
   projects/haf/trunk/dpkg/debian/changelog
   projects/haf/trunk/dpkg/debian/control
   projects/haf/trunk/dpkg/debian/dpkg-dev.install
   projects/haf/trunk/dpkg/debian/dpkg.install
   projects/haf/trunk/dpkg/debian/rules
Log:
  * Moved dpkg-split from dpkg-dev back to dpkg since dpkg calls it during
    normal operation.  (mksplit script is left in dpkg-dev since it is
    only used when splitting.)
  * Changed architecture of dpkg-dev back to "all".


Modified: projects/haf/trunk/dpkg/debian/changelog
===================================================================
--- projects/haf/trunk/dpkg/debian/changelog	2007-02-19 15:41:02 UTC (rev 10026)
+++ projects/haf/trunk/dpkg/debian/changelog	2007-02-19 16:09:48 UTC (rev 10027)
@@ -1,3 +1,14 @@
+dpkg (1.13.25.osso3) unstable; urgency=low
+
+  [ Marius Vollmer, for maemo ]
+
+  * Moved dpkg-split from dpkg-dev back to dpkg since dpkg calls it during
+    normal operation.  (mksplit script is left in dpkg-dev since it is
+    only used when splitting.)
+  * Changed architecture of dpkg-dev back to "all".
+
+ -- Marius Vollmer <marius.vollmer at nokia.com>  Mon, 19 Feb 2007 17:58:53 +0200
+
 dpkg (1.13.25.osso2) unstable; urgency=low
 
   [ Marius Vollmer, for maemo ]

Modified: projects/haf/trunk/dpkg/debian/control
===================================================================
--- projects/haf/trunk/dpkg/debian/control	2007-02-19 15:41:02 UTC (rev 10026)
+++ projects/haf/trunk/dpkg/debian/control	2007-02-19 16:09:48 UTC (rev 10027)
@@ -28,7 +28,7 @@
 Package: dpkg-dev
 Section: utils
 Priority: standard
-Architecture: any
+Architecture: all
 Depends: dpkg (>= 1.13.20), perl5, perl-modules, cpio (>= 2.4.2-2),
  patch (>= 2.2-1), make, binutils
 Recommends: gcc | c-compiler, bzip2

Modified: projects/haf/trunk/dpkg/debian/dpkg-dev.install
===================================================================
--- projects/haf/trunk/dpkg/debian/dpkg-dev.install	2007-02-19 15:41:02 UTC (rev 10026)
+++ projects/haf/trunk/dpkg/debian/dpkg-dev.install	2007-02-19 16:09:48 UTC (rev 10027)
@@ -14,7 +14,6 @@
 usr/bin/dpkg-scansources
 usr/bin/dpkg-shlibdeps
 usr/bin/dpkg-source
-usr/bin/dpkg-split
 usr/lib/dpkg/controllib.pl
 usr/lib/dpkg/dpkg-gettext.pl
 usr/lib/dpkg/mksplit

Modified: projects/haf/trunk/dpkg/debian/dpkg.install
===================================================================
--- projects/haf/trunk/dpkg/debian/dpkg.install	2007-02-19 15:41:02 UTC (rev 10026)
+++ projects/haf/trunk/dpkg/debian/dpkg.install	2007-02-19 16:09:48 UTC (rev 10027)
@@ -6,6 +6,7 @@
 usr/bin/dpkg
 usr/bin/dpkg-deb
 usr/bin/dpkg-query
+usr/bin/dpkg-split
 usr/lib/dpkg/enoent
 usr/sbin
 usr/share/dpkg

Modified: projects/haf/trunk/dpkg/debian/rules
===================================================================
--- projects/haf/trunk/dpkg/debian/rules	2007-02-19 15:41:02 UTC (rev 10026)
+++ projects/haf/trunk/dpkg/debian/rules	2007-02-19 16:09:48 UTC (rev 10027)
@@ -72,7 +72,7 @@
 
 	cd build-tree && $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install
 
-# Put together the dpkg, dselect and dpkg-dev packages
+# Put together the dpkg and dselect packages
 binary-arch: install
 	dh_testdir -a
 	dh_testroot -a
@@ -82,9 +82,6 @@
 	install -d debian/dpkg/sbin
 	mv debian/dpkg/usr/sbin/start-stop-daemon debian/dpkg/sbin
 
-	install -d debian/dpkg-dev/usr/share/doc
-	ln -s dpkg debian/dpkg-dev/usr/share/doc/dpkg-dev
-
 	dh_installchangelogs -pdpkg ChangeLog
 	dh_installdocs -pdpkg
 	install -d debian/dselect/usr/share/doc
@@ -97,10 +94,6 @@
 	install -m 644 debian/dselect.lintian-overrides \
 		       debian/dselect/usr/share/lintian/overrides/dselect
 
-	install -d debian/dpkg-dev/usr/share/lintian/overrides
-	install -m 644 debian/dpkg-dev.lintian-overrides \
-		       debian/dpkg-dev/usr/share/lintian/overrides/dpkg-dev
-
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
@@ -110,9 +103,27 @@
 	dh_md5sums -a
 	dh_builddeb -a
 
-# Nothing to do
+# Put together the dpkg-dev package
 binary-indep: install
+	dh_testdir -i
+	dh_testroot -i
+	dh_install --sourcedir=debian/tmp -i
 
+	install -d debian/dpkg-dev/usr/share/doc
+	ln -s dpkg debian/dpkg-dev/usr/share/doc/dpkg-dev
+
+	install -d debian/dpkg-dev/usr/share/lintian/overrides
+	install -m 644 debian/dpkg-dev.lintian-overrides \
+		       debian/dpkg-dev/usr/share/lintian/overrides/dpkg-dev
+
+	dh_strip -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
 binary: binary-arch binary-indep