Explorar el Código

Fix some mis-merging of the 1.9 branch:
* debian/rules, debian/dpkg.conffiles: dselect was split to a separate deb,
no longer install dselect.cfg into dpkg.deb. Also, dpkg.cfg is no longer
a conffile.

Adam Heath hace 24 años
padre
commit
32b0e5ba5c
Se han modificado 3 ficheros con 7 adiciones y 6 borrados
  1. 7 0
      ChangeLog
  2. 0 2
      debian/dpkg.conffiles
  3. 0 4
      debian/rules

+ 7 - 0
ChangeLog

@@ -1,3 +1,10 @@
+Sun May 26 01:10:24 CDT 2002 Adam Heath <doogie@debian.org>
+
+  * Fix some mis-merging of the 1.9 branch:
+    * debian/rules, debian/dpkg.conffiles: dselect was split to a separate
+      deb, no longer install dselect.cfg into dpkg.deb.  Also, dpkg.cfg is
+      no longer a conffile.
+    
 Sat May 25 22:45:06 CDT 2002 Adam Heath <doogie@debian.org>
 
   * Merge changes from 1.9.20 and 1.9.21.

+ 0 - 2
debian/dpkg.conffiles

@@ -1,4 +1,2 @@
-/etc/dpkg/dpkg.cfg
-/etc/dpkg/dselect.cfg
 /etc/dpkg/origins/debian
 /etc/alternatives/README

+ 0 - 4
debian/rules

@@ -129,10 +129,6 @@ binary-dpkg-most binary-dpkg-static-most: binary-dpkg%-most: stamp-binary%
 		done ; \
 	done
 
-	install -d -m 755 -o root -g root $(TMP_DPKG)/etc/dpkg
-	install -p -m 644 -o root -g root debian/dselect.cfg \
-		$(TMP_DPKG)/etc/dpkg/
-
 # Now that dpkg has been installed, Debianize it
 # Policy stuff
 	find $(TMP_DPKG)/usr/share/man -type f | xargs gzip -9f