[Pkg-jed-commit] r907 - jed/branches/0.99.19/debian

[Jörg Sommer]

Author: jo-guest
Date: 2007-09-25 14:44:21 +0000 (Tue, 25 Sep 2007)
New Revision: 907

Added:
   jed/branches/0.99.19/debian/jed-common.preinst
Modified:
   jed/branches/0.99.19/debian/changelog
   jed/branches/0.99.19/debian/rules
Log:
• debian/changelog debian/rules debian/jed-common.preinst
  · Added the changes from the trunk tree for the relocation of the help
    files. r876, r877, r878


Modified: jed/branches/0.99.19/debian/changelog
===================================================================
--- jed/branches/0.99.19/debian/changelog	2007-09-25 14:34:03 UTC (rev 906)
+++ jed/branches/0.99.19/debian/changelog	2007-09-25 14:44:21 UTC (rev 907)
@@ -147,16 +147,22 @@
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 15 Apr 2007 11:37:36 +0200
 
-jed (1:0.99.18+dfsg.1-9) UNRELEASED; urgency=low
+jed (1:0.99.18+dfsg.1-9) unstable; urgency=low
 
   * debian/rules:
     + Policy 12.3 requires that programs stay working after removing of
       /usr/share/doc/. Due to this we can't move the internal help files
       to /usr/share/doc. Now, they are back in /usr/share/jed/doc and a
-      symlink is placed in /usr/share/doc/jed. [JS]
+      symlink is placed in /usr/share/doc/jed.
 
- -- Rafael Laboissiere <rafael at debian.org>  Fri, 7 Sep 2007 21:25:04 +0200
+  * debian/jed-common.preinst:
+    + Added for a properly upgrade to the help files in /usr/share/jed/doc,
+      because policy 6.6 item 4 states that dpkg does not replace directories
+      by symlinks et vice versa. Due to this we must remove the old
+      directories and the symlink in the preinst script.
 
+ -- Jörg Sommer <joerg at alea.gnuu.de>  Sun, 9 Sep 2007 17:45:31 +0200
+
 jed (1:0.99.18+dfsg.1-8) unstable; urgency=low
 
   * debian/jed.menu, debian/xjed.menu:

Copied: jed/branches/0.99.19/debian/jed-common.preinst (from rev 878, jed/trunk/debian/jed-common.preinst)
===================================================================
--- jed/branches/0.99.19/debian/jed-common.preinst	                        (rev 0)
+++ jed/branches/0.99.19/debian/jed-common.preinst	2007-09-25 14:44:21 UTC (rev 907)
@@ -0,0 +1,24 @@
+#!/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#

Modified: jed/branches/0.99.19/debian/rules
===================================================================
--- jed/branches/0.99.19/debian/rules	2007-09-25 14:34:03 UTC (rev 906)
+++ jed/branches/0.99.19/debian/rules	2007-09-25 14:44:21 UTC (rev 907)
@@ -72,7 +72,6 @@
 	mv $(jed-common)/usr/share/jed/doc/README \
 	    $(jed-common)/usr/share/jed/doc/manual \
 	    $(jed-common)/usr/share/doc/jed-common
-	dh_link -pjed-common usr/share/jed/doc/hlp usr/share/doc/jed-common/hlp
 	dh_link -pjed-common usr/share/jed/doc/txt usr/share/doc/jed-common/txt
 	dh_installdocs -pjed-common debian/README.Debian \
 	    debian/init.d/README.Debian-startup \