No longer generate any BYHAND files. Also, fix bug in pseudo-tags

installation.

diff --git a/ChangeLog b/ChangeLog
index d2f9fd6bbafab3d365abe5ffe01c0f355390e483..728c92ac8b7fec0866c8e04c6e9064ef69b17b92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 15 19:08:28 CDT 2003 Adam Heath <doogie@debian.org>
+
+  * debian/rules: No longer generate any BYHAND files.  Also, fix bug in
+    pseudo-tags installation.
+
 Mon Sep 15 18:53:06 CDT 2003 Adam Heath <doogie@debian.org>
 
   * debian/rules, debian/pseudo-tags: Install

diff --git a/debian/changelog b/debian/changelog
index a006b0d75f2e24708faffce7ab23ef0510d980da..704173851d93d0496ec04f195d0f8566dc78d860 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 dpkg (1.10.11) unstable; urgency=low
 
+  * dpkg no longer provides any BYHAND files.  If you need the source
+    tarball, use the orig.tar.gz file available in the pool.  The
+    precompiled tars were hold-overs from when debs were not standard
+    ar/tar files.
   * Install /usr/share/doc/dpkg/pseudo-tags, which talks about the bug
     titling we use to mark bugs for filtering in the Debian bts.
   * Updated ca.po.

diff --git a/debian/rules b/debian/rules
index 8e8c67ad40199410e12ce207e4d5c422bb2a5751..c732c5c26ae8792b6f554cdad7d461610327e6f1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -119,9 +119,10 @@ binary-dpkg-most binary-dpkg-static-most: binary-dpkg%-most: stamp-binary%
        set -e ; for i in dpkg dpkg-deb md5sum ; do \
                cp -a $(INSTALL_TMP)/usr/bin/$$i$(static) $(TMP_DPKG)/usr/bin/$$i ; \
        done
-       set -e ; for i in ChangeLog THANKS TODO copyright debian/pseudo-tags; do \
+       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 \
@@ -313,25 +314,8 @@ binary-dpkg-doc: stamp-binary
 
 binary-arch-static: binary-dpkg-static
 binary-arch: binary-dpkg binary-dpkg-static-most binary-dselect
-       set -e ; \
-       v=`sed -n 's/^Version: //p' $(TMP_DPKG)/DEBIAN/control`; \
-       for type in "" -static; do\
-               if [ -d $(TMP_DPKG)$$type ]; then\
-                       f=dpkg-$${v}_$(arch)$$type.nondebbin.tar ; \
-                       tar -C $(TMP_DPKG)$$type -cf $(CURDIR)/../$$f usr var ; \
-                       gzip -9f ../$$f ; \
-                       dpkg-distaddfile -fdebian/files $$f.gz byhand -; \
-               fi;\
-       done
 
 binary-indep: binary-dpkg-dev binary-dpkg-doc
-       set -e ; set -x ; \
-       v=`sed -n 's/^Version: //p' $(TMP_DPKG_DEV)/DEBIAN/control`; \
-       f=dpkg-$${v}.tar.gz ; \
-       if [ -f ../dpkg_$${v}.tar.gz ] ; then \
-               cp ../dpkg_$${v}.tar.gz ../$$f ; \
-               dpkg-distaddfile -fdebian/files  $$f byhand - ; \
-       fi
 
 define checkdir
        test -f include/dpkg.h.in