[Pkg-octave-commit] [SCM] octave-odepkg branch, master, updated. 680a85792602089ca7c7af62141d352a2079d73b

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 7f52808c0eb611bc9936e2ea2b988844f978d03b
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sun May 24 17:15:22 2009 +0200

    Proper way of adding info dir section
    
    Instead of entering INFO-DIR-SECTION and *-INFO-DIR-ENTRY in the .info
    file, change the .texi source by adding @dircategory and @direntry macros.
    This implies that the odepkg.info file must be now built from sources, what
    is implemented in debian/rules.  Finally, remove doc/odepkg.info through
    debian/clean.

diff --git a/debian/changelog b/debian/changelog
index a5190c4..7ddadcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,13 @@ octave-odepkg (0.6.6-1) UNRELEASED; urgency=low
     + Use DEP5 URL in Format-Specification
     + Use separate License stanzas for instructing about the location of
       the different licenses used in the package
-  * debian/patches/info-dir-section.diff: Add description
+  * debian/patches/info-dir-section.diff: Changed this patch to add
+    @dircategory and @direntry macros directly into the texinfo source
+    file
+  * debian/rules: Build the odepkg.info file from the texinfo source and
+    install it instead of inst/doc.info
+  * debian/clean: Remove odepkg.info, which is generated during package
+    build
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 12 Apr 2009 17:50:53 +0200
 
diff --git a/debian/clean b/debian/clean
index f75ab03..13e5f04 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1,2 @@
 src/Makeconf src/config.log src/config.status
-
+doc/odepkg.info
diff --git a/debian/patches/info-dir-section.diff b/debian/patches/info-dir-section.diff
index 97ce7c4..b4c92bb 100644
--- a/debian/patches/info-dir-section.diff
+++ b/debian/patches/info-dir-section.diff
@@ -1,19 +1,23 @@
+Change this patch to add @dircategory and @direntry macros directly
+into the texinfo source file.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sun, 24 May 2009 17:06:44 +0200
+
 Add info-dir information at the header of doc.info file
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 17 Feb 2008 16:01:04 +0100
 
-Index: trunk/inst/doc.info
-===================================================================
---- trunk.orig/inst/doc.info	2008-04-08 16:47:35.000000000 +0000
-+++ trunk/inst/doc.info	2008-04-08 16:48:26.000000000 +0000
-@@ -1,5 +1,10 @@
- This is odepkg.info, produced by makeinfo version 4.11 from odepkg.texi.
+--- a/doc/odepkg.texi
++++ b/doc/odepkg.texi
+@@ -37,6 +37,11 @@
+ @end titlepage
+ @c %*** End of TITLEPAGE
  
-+INFO-DIR-SECTION Math
-+START-INFO-DIR-ENTRY
-+* OdePkg: (octave-odepkg).  solve differential equations with the Octave language
-+END-INFO-DIR-ENTRY
++ at dircategory Mathematics
++ at direntry
++* OdePkg: (odepkg).         solve ordinary differential equations in Octave
++ at end direntry
 +
- 
- File: odepkg.info,  Node: Top,  Next: Beginners Guide,  Prev: (dir),  Up: (dir)
- 
+ @c %*** Start of BODY
+ @contents
+ @ifnottex
diff --git a/debian/rules b/debian/rules
index e27e179..081e27c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,10 @@
 include /usr/share/cdbs/1/class/octave-pkg.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-INFO = octave-odepkg.info
-install/octave-odepkg::
-	cp inst/doc.info $(INFO)
-	dh_installinfo $(INFO)
-	rm -f $(INFO) debian/octave-odepkg/usr/share/octave/packages/*/*.info
+pkg = octave-odepkg
+debshr = $(CURDIR)/debian/$(pkg)/usr/share
+
+install/$(pkg)::
+	( cd doc ; make odepkg.info )
+	dh_installinfo doc/odepkg.info
+	rm -f $(debshr)/octave/packages/*/doc.info

-- 
octave-odepkg