[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#250175: Move dpkg-architecture to dpkg



Package: dpkg-dev
Version: 1.10.22
Severity: wishlist
Tags: patch

Hi!

Please move dpkg-architecture to dpkg, so it can be used on maintainer
scripts (e.g. postinst and such) without depending on dpkg-dev.

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.4.26-1-k7
Locale: LANG=C, LC_CTYPE=C
diff -ur dpkg-1.10.21.old/debian/control dpkg-1.10.21/debian/control
--- dpkg-1.10.21.old/debian/control	2004-04-19 12:42:22.000000000 +0200
+++ dpkg-1.10.21/debian/control	2004-05-21 00:36:14.000000000 +0200
@@ -49,7 +49,7 @@
 Section: utils
 Priority: standard
 Architecture: all
-Depends: perl5, perl-modules, cpio (>= 2.4.2-2), patch (>= 2.2-1), make, binutils
+Depends: dpkg (>= FIRST_VERSION_WITH_DPKG_ARCHITECTURE), perl5, perl-modules, cpio (>= 2.4.2-2), patch (>= 2.2-1), make, binutils
 Recommends: c-compiler
 Suggests: gnupg, debian-keyring
 Conflicts: dpkgname
diff -ur dpkg-1.10.21.old/debian/rules dpkg-1.10.21/debian/rules
--- dpkg-1.10.21.old/debian/rules	2003-09-19 19:29:09.000000000 +0200
+++ dpkg-1.10.21/debian/rules	2004-05-21 01:03:19.000000000 +0200
@@ -120,13 +120,14 @@
 	set -e ; for i in dpkg dpkg-deb md5sum ; do \
 		cp -a $(INSTALL_TMP)/usr/bin/$$i$(static) $(TMP_DPKG)/usr/bin/$$i ; \
 	done
+	cp -a $(INSTALL_TMP)/usr/bin/dpkg-architecture $(TMP_DPKG)/usr/bin/
 	set -e ; for i in ChangeLog THANKS TODO copyright; do \
 		cp -a $(INSTALL_TMP)/usr/share/doc/dpkg/$$i $(TMP_DPKG)/usr/share/doc/dpkg$(static)/ ; \
 	done
 	cp -a debian/pseudo-tags $(TMP_DPKG)/usr/share/doc/dpkg$(static)/
 	set -e ; for i in "" de fr ja sv ; do \
 		install -d -m 755 -o root -g root $(TMP_DPKG)/usr/share/man/$$i/man1 ; \
-		for m in md5sum.1 dpkg-deb.1 ; do \
+		for m in md5sum.1 dpkg-deb.1 dpkg-architecture.1 ; do \
 			if [ -f $(INSTALL_TMP)/usr/share/man/$$i/man1/$$m ] ; then \
 				cp -a $(INSTALL_TMP)/usr/share/man/$$i/man1/$$m $(TMP_DPKG)/usr/share/man/$$i/man1/$$m ; \
 			fi ; \
@@ -150,7 +151,7 @@
 # Now that dpkg has been installed, Debianize it
 # Policy stuff
 	find $(TMP_DPKG)/usr/share/man -type f | xargs gzip -9f
-	strip --remove-section=.comment --remove-section=.note \
+	-strip --remove-section=.comment --remove-section=.note \
 		--strip-unneeded $(TMP_DPKG)/usr/bin/* $(TMP_DPKG)/sbin/* \
 		$(TMP_DPKG)/usr/lib/dpkg/enoent
 	mv $(TMP_DPKG)/usr/share/doc/dpkg$(static)/ChangeLog \
@@ -197,13 +198,13 @@
 	mv $(INSTALL_TMP)/usr/lib/dpkg/controllib.pl $(TMP_DPKG_DEV)/usr/lib/dpkg/
 	set -e ; for i in dpkg-name dpkg-source dpkg-genchanges dpkg-gencontrol \
 		dpkg-shlibdeps dpkg-buildpackage dpkg-distaddfile 822-date \
-		dpkg-scanpackages dpkg-scansources dpkg-architecture \
+		dpkg-scanpackages dpkg-scansources \
 		dpkg-parsechangelog dpkg-checkbuilddeps ; do \
 		mv $(INSTALL_TMP)/usr/bin/$$i $(TMP_DPKG_DEV)/usr/bin/ ; \
 	done
 	set -e ; for i in "" de fr ja sv ; do \
 		install -d -m 755 -o root -g root $(TMP_DPKG_DEV)/usr/share/man/$$i/man1 ; \
-		for m in dpkg-name.1 dpkg-source.1 822-date.1 dpkg-architecture.1 \
+		for m in dpkg-name.1 dpkg-source.1 822-date.1 \
 			dpkg-buildpackage.1 dpkg-distaddfile.1 dpkg-genchanges.1 \
 			dpkg-gencontrol.1 dpkg-parsechangelog.1 dpkg-shlibdeps.1 \
 			dpkg-checkbuilddeps.1 ; do \

Reply to: