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

[Jörg Sommer]

Author: jo-guest
Date: 2007-09-07 19:41:01 +0000 (Fri, 07 Sep 2007)
New Revision: 873

Modified:
   jed/branches/0.99.19/debian/changelog
   jed/branches/0.99.19/debian/rules
Log:
• 0.99.19/debian/changelog 0.99.19/debian/rules
  · Merged in r871.


Modified: jed/branches/0.99.19/debian/changelog
===================================================================
--- jed/branches/0.99.19/debian/changelog	2007-09-07 19:38:38 UTC (rev 872)
+++ jed/branches/0.99.19/debian/changelog	2007-09-07 19:41:01 UTC (rev 873)
@@ -147,6 +147,16 @@
 
  -- 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
+
+  * 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]
+
+ -- Rafael Laboissiere <rafael at debian.org>  Fri, 7 Sep 2007 21:25:04 +0200
+
 jed (1:0.99.18+dfsg.1-8) unstable; urgency=low
 
   * debian/jed.menu, debian/xjed.menu:

Modified: jed/branches/0.99.19/debian/rules
===================================================================
--- jed/branches/0.99.19/debian/rules	2007-09-07 19:38:38 UTC (rev 872)
+++ jed/branches/0.99.19/debian/rules	2007-09-07 19:41:01 UTC (rev 873)
@@ -69,10 +69,11 @@
 	# fill up /usr/share/doc/jed-common
 	dh_installchangelogs -pjed-common changes.txt
 
-	mv $(jed-common)/usr/share/jed/doc/* \
+	mv $(jed-common)/usr/share/jed/doc/README \
+	    $(jed-common)/usr/share/jed/doc/manual \
 	    $(jed-common)/usr/share/doc/jed-common
-	rmdir $(jed-common)/usr/share/jed/doc
-	dh_link -pjed-common usr/share/doc/jed-common usr/share/jed/doc
+	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 \
 	    debian/Debian-Jed-Policy.txt