* Don't preserve ownership when copying config.guess an...

Author: mdz
Date: 2003-09-22 14:36:20 GMT
* Don't preserve ownership when copying config.guess and config.sub.
This broke builds where the clean target was run with different
privileges than the rest of the build (i.e., root) (Closes: #212183)
* On second thought, don't copy config.guess and config.sub at all.  I'd
rather they always match what is in CVS.

diff --git a/debian/changelog b/debian/changelog
index daa0b2f89f0e44c8665499e5598edeb8f6ff03b9..596458214b96277b966154c4fa779663f3f7d8eb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
-apt (0.5.13) unstable; urgency=low
+apt (0.5.13) unstable; urgency=medium
 
   * Document configuration file comment syntax in apt.conf(5)
     (Closes: #211262)
   * s/removed/installed/ in a comment in apt-get.cc
   * Move comment for ListParser::ParseDepends into the right place
+  * Don't preserve ownership when copying config.guess and config.sub.
+    This broke builds where the clean target was run with different
+    privileges than the rest of the build (i.e., root) (Closes: #212183)
+  * On second thought, don't copy config.guess and config.sub at all.  I'd
+    rather they always match what is in CVS.
 
- -- 
+ -- Matt Zimmerman <mdz@debian.org>  Mon, 22 Sep 2003 10:28:17 -0400
 
 apt (0.5.12) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 9f13f71243c61d653c4e62489f6a6b16186b5182..f90defa26e8fd6eb4717587b4b016ff182d368c0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # Made with the aid of dh_make, by Craig Small
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # Some lines taken from debmake, by Christoph Lameter.
-# $Id: rules,v 1.54 2003/08/10 23:54:57 mdz Exp $
+# $Id: rules,v 1.55 2003/09/22 14:36:20 mdz Exp $
 
 # LD_LIBRARY_PATH=pwd/debian/apt/usr/lib dh_shlibdeps -papt
 # dpkg: /home/jgg/work/apt2/debian/apt/usr/lib/libapt-pkg.so.2.9 not found.
@@ -99,14 +99,6 @@ build/configure-stamp: configure
        dh_testdir
        -mkdir build
        cp COPYING debian/copyright
-ifneq ($(wildcard /usr/share/misc/config.sub),)
-       cp -a /usr/share/misc/config.sub buildlib/config.sub
-       echo Updating buildlib/config.sub
-endif
-ifneq ($(wildcard /usr/share/misc/config.guess),)
-       cp -a /usr/share/misc/config.guess buildlib/config.guess
-       echo Updating buildlib/config.guess
-endif
        cd build && ../configure $(confflags)
        touch $@