Add missing dpkg.conffiles

Rename dpkg configfile to dpkg.cfg

diff --git a/ChangeLog b/ChangeLog
index 03e25197774ded16b30ef42877159a6fdab27b5c..9c7156d7953dc92e3f01646061794eb195252847 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Nov  5 16:28:26 CET 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * debian/dpkg.conffiles: added missing file
+  * debian/rules, main/main.c: rename dpkg configfile to dpkg.cfg
+
 Sun Nov  5 10:00:31 EST 2000 Ben Collins <bcollins@debian.org>
 
   * Create branch point for versioned provides

diff --git a/debian/dpkg.conffiles b/debian/dpkg.conffiles
new file mode 100644 (file)
index 0000000..8104e41
--- /dev/null
+++ b/debian/dpkg.conffiles
@@ -0,0 +1 @@
+/etc/dpkg/dpkg.cfg

diff --git a/debian/rules b/debian/rules
index 6ed0afc296eabdf4c4d80fc61ab0d3573fffc4b7..2768b229e6cb0d9fb37637e51bb5f61964ac6461 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -108,7 +108,7 @@ binary-dpkg: stamp-binary
 
        install -d -m 755 -o root -g root $(TMP_DPKG)/etc/dpkg
        install -p -m 644 -o root -g root debian/dpkg.cfg \
-               $(TMP_DPKG)/etc/dpkg/dpkg
+               $(TMP_DPKG)/etc/dpkg/
 
 # Now that dpkg has been installed, Debianize it
 # Policy stuff

diff --git a/main/main.c b/main/main.c
index 2648a9812852ba543eaa16abda04229a1cc9caee..03f0968d7ad609aec3f022722a49d55c34d66cad 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -413,7 +413,7 @@ int main(int argc, const char *const *argv) {
     }
   }
 
-  myfileopt(CONFIGDIR "/" DPKG, cmdinfos);
+  myfileopt(CONFIGDIR "/" DPKG ".cfg", cmdinfos);
   myopt(&argv,cmdinfos);
   if (!cipaction) badusage(_("need an action option"));