[Pkg-octave-commit] r1222 - in octave/trunk/debian: . in

[Rafael Laboissiere]

Author: rafael
Date: 2008-02-23 09:05:31 +0000 (Sat, 23 Feb 2008)
New Revision: 1222

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/PACKAGE-htmldoc.doc-base.faq
   octave/trunk/debian/rules
Log:
  * Synched with octave2.1; in particular ensures that the generation of
    the ls-R database will work correctly, avoid the problem reported in
    Bug#464334.
  * debian/in/PACKAGE-htmldoc.doc-base.faq: Added slice sections for
    octave2.1 and octave3.0, since the name of the index file is different
    from one branches to another.
  * debian/rules: Process all debian/in* files through slice


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2008-02-22 22:55:56 UTC (rev 1221)
+++ octave/trunk/debian/changelog	2008-02-23 09:05:31 UTC (rev 1222)
@@ -1,3 +1,15 @@
+octave3.0 (1:3.0.0-5) UNRELEASED; urgency=low
+
+  * Synched with octave2.1; in particular ensures that the generation of
+    the ls-R database will work correctly, avoid the problem reported in
+    Bug#464334.
+  * debian/in/PACKAGE-htmldoc.doc-base.faq: Added slice sections for
+    octave2.1 and octave3.0, since the name of the index file is different
+    from one branches to another.
+  * debian/rules: Process all debian/in* files through slice
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 23 Feb 2008 09:53:30 +0100
+
 octave2.1 (1:2.1.73-17) unstable; urgency=low
 
   * Synched with octave3.0; in particular, switch from g77 to gfortran;

Modified: octave/trunk/debian/in/PACKAGE-htmldoc.doc-base.faq
===================================================================
--- octave/trunk/debian/in/PACKAGE-htmldoc.doc-base.faq	2008-02-22 22:55:56 UTC (rev 1221)
+++ octave/trunk/debian/in/PACKAGE-htmldoc.doc-base.faq	2008-02-23 09:05:31 UTC (rev 1222)
@@ -8,6 +8,7 @@
  problems numerically.
 Section: Apps/Math
 
-Format: HTML
+Format: HTML[V_2_1:
 Index: /usr/share/doc/@PACKAGE at -htmldoc/faq/index.html
-Files: /usr/share/doc/@PACKAGE at -htmldoc/faq/*.html
+Files: /usr/share/doc/@PACKAGE at -htmldoc/faq/*.html:][V_3_0:
+Index: /usr/share/doc/@PACKAGE at -htmldoc/faq/Octave-FAQ.html:]

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2008-02-22 22:55:56 UTC (rev 1221)
+++ octave/trunk/debian/rules	2008-02-23 09:05:31 UTC (rev 1222)
@@ -105,10 +105,12 @@
 
 maintainer-scripts: debian/control debian/copyright
 	for in in debian/in/PACKAGE* ; do \
+		slice -o $(sliceterm):debian/temp $$in ; \
 		out=`echo $$in | sed 's:/in/:/:;s/PACKAGE/$(PACKAGE)/'` ; \
 		sed 's/@VERSION@/$(version)/g;s/@PACKAGE@/$(PACKAGE)/g;s/@MAJOR@/$(major)/g;s/@PRIORITY@/$(priority)/g;' \
-			< $$in > $$out ; \
+			< debian/temp > $$out ; \
 	done
+	rm -f debian/temp
 
 	for f in octave-depends defs.make ; do \
 		sed 's/@VERSION@/$(version)/g;s/@MAJOR@/$(major)/g' \
@@ -116,10 +118,6 @@
 	done
 	cp debian/in/$(PACKAGE)-00list debian/patches/00list
 	cp debian/in/$(PACKAGE)-watch debian/watch
-	for ext in .conf .dirs -emacsen.dirs ; do		\
-		slice -o $(sliceterm):debian/$(PACKAGE)$$ext	\
-			debian/in/PACKAGE$$ext ;		\
-	done
 	-cp debian/in/$(PACKAGE)-NEWS debian/NEWS
 
 get-orig-source: upstream
@@ -245,7 +243,7 @@
 		test -f $$f-save && mv $$f-save $$f ;	\
 	done
 
-	rm -f debian/NEWS
+	rm -f debian/NEWS debian/temp
 
 	dh_clean