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

Fri Feb 16 18:51:38 EET 2007

Author: marivoll
Date: 2007-02-16 18:51:37 +0200 (Fri, 16 Feb 2007)
New Revision: 9984

Modified:
   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:
  * Replaced some Perl script with shell version and moved other scripts
    to dpkg-dev to make the dpkg package independent from Perl.
  * Removed Build-Dependency on libselinux1-dev, configure without it.
  * Made dpkg-dev architecture any since it now contains dpkg-split.
  * Moved dpkg l10n and man files to dpkg-dev package.


Modified: projects/haf/trunk/dpkg/debian/control
===================================================================

--- projects/haf/trunk/dpkg/debian/control	2007-02-16 16:45:26 UTC (rev 9983)
+++ projects/haf/trunk/dpkg/debian/control	2007-02-16 16:51:37 UTC (rev 9984)
@@ -7,8 +7,7 @@
 Bugs: debbugs://bugs.debian.org
 Standards-Version: 3.7.2
 Build-Depends: debhelper (>= 4.1.81), pkg-config, po4a (>= 0.23),
- libncurses5-dev | libncurses-dev, zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev,
- libselinux1-dev (>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
+ libncurses5-dev | libncurses-dev, zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev
 
 Package: dpkg
 Architecture: any
@@ -29,7 +28,7 @@
 Package: dpkg-dev
 Section: utils
 Priority: standard
-Architecture: all
+Architecture: any
 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-16 16:45:26 UTC (rev 9983)
+++ projects/haf/trunk/dpkg/debian/dpkg-dev.install	2007-02-16 16:51:37 UTC (rev 9984)
@@ -14,8 +14,34 @@
 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
 usr/lib/dpkg/parsechangelog
+usr/share/locale/*/LC_MESSAGES/dpkg.mo
+usr/share/man/*/*/cleanup-info.8
+usr/share/man/*/cleanup-info.8
+usr/share/man/*/*/dpkg-deb.1
+usr/share/man/*/dpkg-deb.1
+usr/share/man/*/*/dpkg-divert.8
+usr/share/man/*/dpkg-divert.8
+usr/share/man/*/*/dpkg-query.1
+usr/share/man/*/dpkg-query.1
+usr/share/man/*/*/dpkg-split.1
+usr/share/man/*/dpkg-split.1
+usr/share/man/*/*/dpkg-statoverride.8
+usr/share/man/*/dpkg-statoverride.8
+usr/share/man/*/*/dpkg.cfg.5
+usr/share/man/*/dpkg.cfg.5
+usr/share/man/*/*/dpkg.1
+usr/share/man/*/dpkg.1
+usr/share/man/*/*/install-info.8
+usr/share/man/*/install-info.8
+usr/share/man/*/*/start-stop-daemon.8
+usr/share/man/*/start-stop-daemon.8
+usr/share/man/*/*/update-alternatives.8
+usr/share/man/*/update-alternatives.8
 usr/share/locale/*/LC_MESSAGES/dpkg-dev.mo
 usr/share/man/*/*/822-date.1
 usr/share/man/*/822-date.1

Modified: projects/haf/trunk/dpkg/debian/dpkg.install
===================================================================
--- projects/haf/trunk/dpkg/debian/dpkg.install	2007-02-16 16:45:26 UTC (rev 9983)
+++ projects/haf/trunk/dpkg/debian/dpkg.install	2007-02-16 16:51:37 UTC (rev 9984)
@@ -6,35 +6,9 @@
 usr/bin/dpkg
 usr/bin/dpkg-deb
 usr/bin/dpkg-query
-usr/bin/dpkg-split
-usr/lib/dpkg/dpkg-gettext.pl
 usr/lib/dpkg/enoent
-usr/lib/dpkg/mksplit
 usr/sbin
 usr/share/dpkg
-usr/share/locale/*/LC_MESSAGES/dpkg.mo
-usr/share/man/*/*/cleanup-info.8
-usr/share/man/*/cleanup-info.8
-usr/share/man/*/*/dpkg-deb.1
-usr/share/man/*/dpkg-deb.1
-usr/share/man/*/*/dpkg-divert.8
-usr/share/man/*/dpkg-divert.8
-usr/share/man/*/*/dpkg-query.1
-usr/share/man/*/dpkg-query.1
-usr/share/man/*/*/dpkg-split.1
-usr/share/man/*/dpkg-split.1
-usr/share/man/*/*/dpkg-statoverride.8
-usr/share/man/*/dpkg-statoverride.8
-usr/share/man/*/*/dpkg.cfg.5
-usr/share/man/*/dpkg.cfg.5
-usr/share/man/*/*/dpkg.1
-usr/share/man/*/dpkg.1
-usr/share/man/*/*/install-info.8
-usr/share/man/*/install-info.8
-usr/share/man/*/*/start-stop-daemon.8
-usr/share/man/*/start-stop-daemon.8
-usr/share/man/*/*/update-alternatives.8
-usr/share/man/*/update-alternatives.8
 var/lib/dpkg/alternatives
 var/lib/dpkg/info
 var/lib/dpkg/parts

Modified: projects/haf/trunk/dpkg/debian/rules
===================================================================
--- projects/haf/trunk/dpkg/debian/rules	2007-02-16 16:45:26 UTC (rev 9983)
+++ projects/haf/trunk/dpkg/debian/rules	2007-02-16 16:51:37 UTC (rev 9984)
@@ -28,9 +28,9 @@
 # Don't enable everything on all platforms
 DEB_HOST_ARCH_OS  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-	confflags += --with-selinux=static
-endif
+#ifeq ($(DEB_HOST_ARCH_OS),linux)
+#	confflags += --with-selinux=static
+#endif
 
 
 # Create configure script if necessary, automake handles rebuilding it.
@@ -72,7 +72,7 @@
 
 	cd build-tree && $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install
 
-# Put together the dpkg and dselect packages
+# Put together the dpkg, dselect and dpkg-dev packages
 binary-arch: install
 	dh_testdir -a
 	dh_testroot -a
@@ -82,6 +82,9 @@
 	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
@@ -94,6 +97,10 @@
 	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
@@ -103,27 +110,9 @@
 	dh_md5sums -a
 	dh_builddeb -a
 
-# Put together the dpkg-dev package
+# Nothing to do
 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
 
 


