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

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit ac9cc17864e7e1fa22f4ed90731eb35d11832eb4
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sun May 17 10:43:56 2009 +0200

    Add info-dir-section and menu entry to jed.info
    
    This is part of the dpkg -> GNU install-info transition [1].  The necessary
    information is added manually to the jed.info file after it is built by
    hevea by preppending the contents of the newly introduced file
    debian/info-dir.
    
    I tried first to get hevea to add the necessary info to the genereated info
    file, but this is apparently impossible [2].
    
    The removal of the calls to install-info from the postinst and prerm scripts
    will be done later, once the new dpkg and texinfo packages will be uploaded
    to unstable.
    
    [1] http://wiki.debian.org/Transitions/DpkgToGnuInstallInfo
    [2] http://article.gmane.org/gmane.comp.tex.hevea/89

diff --git a/debian/changelog b/debian/changelog
index 7d52a3b..4391ee6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jed (1:0.99.18+dfsg.1-13) UNRELEASED; urgency=low
+
+  * debian/rules: Add info-dir-section and menu entry to jed.info (closes:
+    #528877)
+  * debian/info-dir: New file containing the information above
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 16 May 2009 18:31:36 +0200
+
 jed (1:0.99.18+dfsg.1-12) unstable; urgency=low
 
   * /etc/jed.d/05jed-common.sl [GM]:
diff --git a/debian/info-dir b/debian/info-dir
new file mode 100644
index 0000000..af86513
--- /dev/null
+++ b/debian/info-dir
@@ -0,0 +1,4 @@
+INFO-DIR-SECTION Editors
+START-INFO-DIR-ENTRY
+* JED: (jed).  Programmers editor.
+END-INFO-DIR-ENTRY
diff --git a/debian/rules b/debian/rules
index 8626f38..4d53d0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,8 +85,10 @@ binary-indep: config.status
 	# generate info files from jed.tex
 	rmdir $(jed-common)/usr/share/jed/info
 	mkdir -p $(jed-common)/usr/share/info
-	cd $(jed-common)/usr/share/info/; hevea -fix -info -o jed.info \
-	    $(jed-common)/usr/share/doc/jed-common/manual/jed.tex
+	cd $(jed-common)/usr/share/info/; hevea -fix -info -o jed.info	\
+	    $(jed-common)/usr/share/doc/jed-common/manual/jed.tex ; 	\
+	    cat $(jed-common)/../info-dir jed.info > tmp ;		\
+	    mv tmp jed.info
 
 	mv $(jed-common)/usr/share/doc/jed-common/manual \
 	    $(jed-common)/usr/share/doc/jed-common/html

-- 
Debian packaging of JED