[Pkg-jed-commit] [SCM] Debian packaging of JED branch, master, updated. 1%3A0.99.18+dfsg.1-10-291-ga668a94

[Jörg Sommer]

The following commit has been merged in the master branch:
commit fa97590a405f6649b037045accc557064f3d79f6
Author: Jörg Sommer <joerg at alea.gnuu.de>
Date:   Sat Nov 21 18:40:18 2009 +0100

    jed-common: Remove code for transition of doc files out of /u/s/doc
    
    In version 1:0.99.18+dfsg.1-9 (114a34a34ae1b129f4a0109671bdbbebf73e24e6)
    we moved some (internal) documentation files of jed from /usr/share/doc
    back to /usr/share/jed, due to Policy 12.3 requires that programs stay
    working after removing of /usr/share/doc. This transition required a
    special handling (9979ea78f5bcc1dfeb4a29ee7c913f32252bc999) of the
    replaced directories in /usr/share/doc, because dpkg doesn't care for
    typechanges (directory to symlink or vice versa).
    
    Now, an upgrade from the version in stable would not introduce such a
    typechange and hence we do not need this special tweaking anymore.

diff --git a/debian/changelog b/debian/changelog
index 6ff2969..ff86d4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,10 @@ jed (1:0.99.19~pre210-1) UNRELEASED; urgency=low
   * Droppend jed-common's dependency on findutils, because the current
     version in stable is recent enough and essential.
 
+  * Removed the jed-common.preinst script (added in 1:0.99.18+dfsg.1-9),
+    because an upgrade from the current stable version doesn't need this
+    fix anymore.
+
  -- Jörg Sommer <joerg at alea.gnuu.de>  Thu, 01 Jan 1970 00:00:00 +0000
 
 jed (1:0.99.19~pre175-1) experimental; urgency=low
diff --git a/debian/jed-common.preinst b/debian/jed-common.preinst
deleted file mode 100644
index 49b010a..0000000
--- a/debian/jed-common.preinst
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-  upgrade)
-    # Policy 6.6 item 4 tells that dpkg does not replace a directory in the old
-    # package by a symlink in the new package. We must remove the directory to
-    # make dpkg installs the symlink
-    for i in hlp txt; do
-        if [ -d /usr/share/doc/jed-common/$i ]; then
-            rm -r /usr/share/doc/jed-common/$i
-        fi
-    done
-
-    # The same problem with symlinks replaced by directories.
-    if [ -L /usr/share/jed/doc ]; then
-        rm /usr/share/jed/doc
-    fi
-    ;;
-  install|abort-upgrade) ;;
-esac
-
-#DEBHELPER#

-- 
Debian packaging of JED