Merge

diff --git a/debian/changelog b/debian/changelog
index 09df428..415aa62 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+grml-etc (1.1.11) unstable; urgency=low
+
+  * Change dpkg-divert handling in preinst. This hopefully
+    addresses the changes introduced with #508392 in dpkg.
+  * Drop unused files from overrides.
+
+ -- Michael Prokop <mika@grml.org>  Tue, 30 Dec 2008 13:26:10 +0100
+
 grml-etc (1.1.10) unstable; urgency=low
 
   * Add /etc/skel/.ipython/ipy_user_conf.py from '%upgrade'

diff --git a/debian/overrides b/debian/overrides
index 7585523..251a3c8 100644 (file)
--- a/debian/overrides
+++ b/debian/overrides
@@ -7,9 +7,7 @@ grml-etc: package-installs-into-etc-rc.d etc/rc3.d/important_notice
 grml-etc: package-installs-into-etc-rc.d etc/rc4.d/important_notice
 grml-etc: package-installs-into-etc-rc.d etc/rc5.d/important_notice
 grml-etc: package-installs-into-etc-rc.d etc/rc6.d/important_notice
-grml-etc: script-not-executable ./etc/skel/.pekwm/start
 grml-etc: script-not-executable ./etc/resolv.conf.template
-grml-etc: executable-not-elf-or-script ./etc/skel/.gkrellm2/themes/Modern/gkrellmrc
 grml-etc: file-in-etc-rc.d-marked-as-conffile /etc/rcS.d/important_notice
 grml-etc: script-in-etc-init.d-not-registered-via-update-rc.d /etc/init.d/firewall
 grml-etc: script-in-etc-init.d-not-registered-via-update-rc.d /etc/init.d/grml-home

diff --git a/debian/preinst b/debian/preinst
index ba60baa..20e4b94 100755 (executable)
--- a/debian/preinst
+++ b/debian/preinst
@@ -39,29 +39,25 @@ rm_conffile() {
 
 case "$1" in
    install|upgrade)
-        if [ -r /etc/mgetty/login.config ] ; then
-           for cmd in $TO_DIVERT1; do
-               divert_gen $cmd /etc/mgetty
-           done
-        fi
+        for cmd in $TO_DIVERT1; do
+            divert_gen $cmd /etc/mgetty
+        done
+
         for cmd in $TO_DIVERT2; do
             divert_gen $cmd /etc/init.d
         done
-        if [ -d /etc/kismet ] ; then
-           for cmd in $TO_DIVERT3; do
-               divert_gen $cmd /etc/kismet
-           done
-        fi
-        if [ -d /etc/pcmcia ] ; then
-           for cmd in $TO_DIVERT4; do
-               divert_gen $cmd /etc/pcmcia
-           done
-        fi
-        if [ -d /etc/X11/windowlab ] ; then
-           for cmd in $TO_DIVERT5; do
-               divert_gen $cmd /etc/X11/windowlab
-           done
-        fi
+
+        for cmd in $TO_DIVERT3; do
+            divert_gen $cmd /etc/kismet
+        done
+
+        for cmd in $TO_DIVERT4; do
+            divert_gen $cmd /etc/pcmcia
+        done
+
+        for cmd in $TO_DIVERT5; do
+            divert_gen $cmd /etc/X11/windowlab
+        done
 
         # did I mention that dpkg-divert sucks?
         if [ -n "$2" ] ; then