[Pkg-octave-commit] rev 316 - in trunk/packages/octave/debian: . in

Sun Nov 13 15:55:09 UTC 2005

Author: rafael
Date: 2005-11-13 15:55:08 +0000 (Sun, 13 Nov 2005)
New Revision: 316

Removed:
   trunk/packages/octave/debian/in/PACKAGE-htmldoc.postinst
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/PACKAGE-info.postinst
   trunk/packages/octave/debian/in/octave2.1-00list
   trunk/packages/octave/debian/rules
Log:
Preliminary try to get pacakge octave2.1-info and octave2.9-info not
conflicting with each other.  Caveat: Not yet fully tested.


Modified: trunk/packages/octave/debian/changelog
===================================================================

--- trunk/packages/octave/debian/changelog	2005-11-12 20:19:52 UTC (rev 315)
+++ trunk/packages/octave/debian/changelog	2005-11-13 15:55:08 UTC (rev 316)
@@ -1,24 +1,40 @@
-octave2.9 (2.9.3-2) experimental; urgency=low
+octave2.1 (2.1.72-1) unstable; urgency=low
 
    NOT YET RELEASED!
 
    +++ Changes by Rafael Laboissiere
 
+  * New upstream release
+  * debian/in/octave2.1-00list: Removed patch
+    50_no-check-nested-functions-2.1, which has been applied upstream
+
   * Packages octave2.1-* and octave2.9-* can now be installed together
     (FIXME: THIS DOES NOT WORK FOR octave2.x-info YET!!!)
-  * debian/control: Packages octave*-headers, octave*-doc, and
+  * debian/in/control: Packages octave*-headers, octave*-doc, and
     octave*-htmldoc conflict with versions << 2.1
   * debian/in/PACKAGE-htmldoc.doc-base.*: Make versioned documents for
     doc-base
-  * debian/rules: Install versioned octave-depends, defs.make, and
-    and 50octave.el files
+  * debian/rules:
+    - Install versioned octave-depends, defs.make, and and 50octave.el
+      files
+    - (configure-stamp) Set versioned infofile variable in call to
+      configure
+    - (make-stamp) Save texi files in *-save and replace setfilename
+      macros with versioned names
+    - (clean) Recover original *.texi files
   * debian/in/PACKAGE-headers.postinst: Install alternatives to
     octave-depends and defs.make
+  * debian/in/PACKAGE-info.postinst:
+    - Install versioned info files
+    - Set alternatives to all versioned info files
 
   * debian/rules: cope with the new output of dpkg-architecture for arm
     and m68k, which changed recently (thanks to Christian T. Steigies
     <cts at debian.org> for spotting the problem)
 
+  * debian/in/PACKAGE-htmldoc.postinst: Removed this script, because it
+    does nothing more than include the debhelper-generated one
+
  --
 
 octave2.9 (2.9.3-1) experimental; urgency=low

Deleted: trunk/packages/octave/debian/in/PACKAGE-htmldoc.postinst

Modified: trunk/packages/octave/debian/in/PACKAGE-info.postinst
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE-info.postinst	2005-11-12 20:19:52 UTC (rev 315)
+++ trunk/packages/octave/debian/in/PACKAGE-info.postinst	2005-11-13 15:55:08 UTC (rev 316)
@@ -7,19 +7,30 @@
 
 set -e
 
+# The current Octave version, known to debian/rules at build time
+MAJOR=@MAJOR@
+
 #DEBHELPER#
 
 case "$1" in
     configure)     
 	install-info --quiet --section "Math" "Octave" \
-	   --description="The GNU Octave language for numerical computations."\
-	   /usr/share/info/octave.info.gz
+	   --description="The GNU Octave ($MAJOR) language for numerical computations."\
+	   /usr/share/info/octave$MAJOR.info.gz
 	install-info --quiet --section "Math" "Octave Library" \
-	   --description="The GNU Octave C++ library."\
-	   /usr/share/info/liboctave.info.gz
+	   --description="The GNU Octave ($MAJOR) C++ library."\
+	   /usr/share/info/liboctave$MAJOR.info.gz
 	install-info --quiet --section "Math" "Octave FAQ" \
-	   --description="The GNU Octave FAQ."\
-	   /usr/share/info/Octave-FAQ.info.gz
+	   --description="The GNU Octave ($MAJOR) FAQ."\
+	   /usr/share/info/Octave$MAJOR-FAQ.info.gz
+
+	for f in octave liboctave Octave-FAQ ; do		\
+		update-alternatives --install			\
+			/usr/share/info/$f.info.gz		\
+			$f.info.gz				\
+			/usr/share/info/$f$MAJOR.info.gz 15
+	done
+
        ;;
     abort-upgrade|abort-remove|abort-deconfigure)
         ;;

Modified: trunk/packages/octave/debian/in/octave2.1-00list
===================================================================
--- trunk/packages/octave/debian/in/octave2.1-00list	2005-11-12 20:19:52 UTC (rev 315)
+++ trunk/packages/octave/debian/in/octave2.1-00list	2005-11-13 15:55:08 UTC (rev 316)
@@ -1,2 +1 @@
-50_no-check-nested-functions-2.1
 50_inferior-octave-resync-dirs

Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules	2005-11-12 20:19:52 UTC (rev 315)
+++ trunk/packages/octave/debian/rules	2005-11-13 15:55:08 UTC (rev 316)
@@ -31,6 +31,10 @@
 debini		:= $(debtmp)/usr/share/octave/site/m/startup
 debininew	:= $(debtmp)/usr/share/octave/$(version)/m/startup
 
+texifiles	:= doc/interpreter/octave.texi		\
+			doc/liboctave/liboctave.texi	\
+			doc/faq/Octave-FAQ.texi
+
 ## edd  3 Feb 2003  gcc 3.2, also imposed uniformly via Build-Depends
 ## edd 27 Jun 2003  now that gcc 3.3 is in unstable and testing, relax this
 #c_compiler	= /usr/bin/gcc-3.3
@@ -111,25 +115,26 @@
 
 	[ -f autogen.sh ] &&  ./autogen.sh && chmod 0755 configure
 
-	DEFAULT_PAGER=pager	\
-	CC=$(c_compiler) 	\
-	CXX=$(cxx_compiler)	\
-	F77=$(f77_compiler)	\
-	FLIBS=$(fc_libs)	\
-	./configure		\
-			--prefix=/usr				\
-			--datadir=/usr/share			\
-			--libdir=/usr/lib			\
-			--libexecdir=/usr/lib		 	\
-			--infodir=/usr/share/info		\
-			--mandir=/usr/share/man			\
-			$(atlas)				\
-			--with-hdf5				\
-			--with-fftw				\
-			$(fc_flag)				\
-			--enable-shared				\
-			--enable-rpath				\
-			--disable-static			\
+	DEFAULT_PAGER=pager				\
+	CC=$(c_compiler) 				\
+	CXX=$(cxx_compiler)				\
+	F77=$(f77_compiler)				\
+	FLIBS=$(fc_libs)				\
+	infofile=/usr/share/info/$(PACKAGE).info	\
+	./configure					\
+			--prefix=/usr			\
+			--datadir=/usr/share		\
+			--libdir=/usr/lib		\
+			--libexecdir=/usr/lib		\
+			--infodir=/usr/share/info	\
+			--mandir=/usr/share/man		\
+			$(atlas)			\
+			--with-hdf5			\
+			--with-fftw			\
+			$(fc_flag)			\
+			--enable-shared			\
+			--enable-rpath			\
+			--disable-static		\
 			--build $(arch)
 
 	pod2man debian/octave-depends > octave-depends-$(version).1
@@ -138,6 +143,14 @@
 
 make: configure-stamp make-stamp
 make-stamp:
+
+	for f in $(texifiles) ; do					\
+		cp $$f $$f-save ; 					\
+		perl -pi -e 's/^(\@setfilename .ctave)/${1}$(major)/'	\
+			$$f ; 						\
+	done
+
+
 	$(MAKE)		CFLAGS="$(compilerflags)"		\
 			CXXFLAGS="$(compilerflags)"		\
 			FFLAGS="$(compilerflags)"		\
@@ -161,7 +174,7 @@
 	-rm -vrf libcruft/libcruft.so libcruft/*/Makefile		\
 		install.octave  scripts/gethelp  libcruft/misc/*.d	\
 		scripts/autom4te.cache config.log Makefrag.f77		\
-		src/PKG_ADD src/pic src/*.oct src/*.df
+		src/PKG_ADD src/pic src/*.oct src/*.df doc/*/HTML
         ##doc/interpreter/octave.{dvi,ps} doc/faq/Octave-FAQ_*.html
         ##scripts/DOCSTRINGS
 	test ! -f octave-bug.in.orig || mv octave-bug.in.orig octave-bug.in
@@ -169,6 +182,10 @@
 	rm -f `ls debian/in/PACKAGE* | sed 's/PACKAGE/$(PACKAGE)/;s:/in::'`
 	rm -f octave-depends-$(version).1
 
+	for f in $(texifiles) ; do			\
+		test ! -f $ff-save || mv $ff-save $ff ;	\
+	done
+
 	dh_clean
 
 # install files


