[Pkg-octave-commit] rev 486 - in branches/2.9transition/packages/octave-forge/debian: . patches

Colin ingram cjingram-guest at costa.debian.org
Tue Feb 7 19:03:26 UTC 2006 

Author: cjingram-guest
Date: 2006-02-07 19:03:24 +0000 (Tue, 07 Feb 2006)
New Revision: 486

Added:
   branches/2.9transition/packages/octave-forge/debian/patches/50_admin-octlink.dpatch
   branches/2.9transition/packages/octave-forge/debian/patches/50_main-set-makefile.dpatch
   branches/2.9transition/packages/octave-forge/debian/patches/50_makefile-syntax-fix.dpatch
Modified:
   branches/2.9transition/packages/octave-forge/debian/changelog
   branches/2.9transition/packages/octave-forge/debian/control
   branches/2.9transition/packages/octave-forge/debian/patches/00list
   branches/2.9transition/packages/octave-forge/debian/rules
Log:
debian/control
** ported changes from trunk r465:484

debian/patches
** ported changes from trunk r465:484
** added 50_admin-octlink to patch 2006.01.28 release with missing octlink.sh file

debian/changelog
** ported changes from trunk r465:484

debian/rules
** ported changes from trunk r465:484

note: debian/rules should now build a 2.9.4 package from teh 2006.01.28 release source


Modified: branches/2.9transition/packages/octave-forge/debian/changelog
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/changelog	2006-02-05 01:44:10 UTC (rev 485)
+++ branches/2.9transition/packages/octave-forge/debian/changelog	2006-02-07 19:03:24 UTC (rev 486)
@@ -1,3 +1,26 @@
+octave-forge (2006.01.28-1) unstable; urgency=low
+
+  * New upstream release
+  * This version fixes the problem with the 'legend' command failing the
+    first time it is called (closes: #302034)
+  * debian/control:
+    - Build-depends on units and netcdfg-dev, since interfaces to that
+      program and this library have been added in this new upstream
+      version
+    - Suggests units
+  * debian/rules (in clean target):
+    - Call make distclean
+    - Remove files that are left behind after make clean
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sun,  5 Feb 2006 00:59:06 +0100
+
+octave-forge (2005.06.13-12) unstable; urgency=low
+
+  * debian/control: Build-depend on octave2.1-headers >= 2.1.72-9, which
+    refers only to the versioned octave-config-2.1.72 (closes: #349139)
+
+ -- Rafael Laboissiere <rafael at debian.org>  Wed, 25 Jan 2006 22:04:27 +0100
+
 octave-forge (2005.06.13-11) unstable; urgency=low
 
   * debian/rules: Explicitly call octave-config-2.1.72 instead of

Modified: branches/2.9transition/packages/octave-forge/debian/control
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/control	2006-02-05 01:44:10 UTC (rev 485)
+++ branches/2.9transition/packages/octave-forge/debian/control	2006-02-07 19:03:24 UTC (rev 486)
@@ -4,14 +4,14 @@
 Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at debian.org>
 Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4), octave2.1-headers (>= 2.1.72-8), libxt-dev, gfortran, libqhull-dev, libginac-dev (>= 1.3.3-2+b1), libgmp3-dev, autoconf, libjpeg62-dev, libpng12-dev, libncurses5-dev, libreadline5-dev, tetex-bin, libgsl0-dev, dpatch
+Build-Depends: debhelper (>= 4), octave2.1-headers (>= 2.1.72-9), libxt-dev, gfortran, libqhull-dev, libginac-dev (>= 1.3.3-2+b1), libgmp3-dev, autoconf, libjpeg62-dev, libpng12-dev, libncurses5-dev, libreadline5-dev, tetex-bin, libgsl0-dev, netcdfg-dev, units, dpatch
 Build-Conflicts: octave2.0-headers, octave2.0
 
 Package: octave-forge
 Replaces: octave-matcompat
 Architecture: any
 Depends: ${octave:Depends}, ${shlibs:Depends}
-Suggests: grace
+Suggests: grace, units
 Description: Contributed functions for GNU Octave from http://octave.sf.net
  The octave-forge project contains over 500 contributed functions for
  GNU Octave which are not in the main distribution. These functions are

Modified: branches/2.9transition/packages/octave-forge/debian/patches/00list
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/patches/00list	2006-02-05 01:44:10 UTC (rev 485)
+++ branches/2.9transition/packages/octave-forge/debian/patches/00list	2006-02-07 19:03:24 UTC (rev 486)
@@ -1,2 +1,5 @@
 50_extra-pdb-sinclude
 50_make-pattern-rules
+50_main-set-makefile
+50_makefile-syntax-fix
+50_admin-octlink

Added: branches/2.9transition/packages/octave-forge/debian/patches/50_admin-octlink.dpatch
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/patches/50_admin-octlink.dpatch	2006-02-05 01:44:10 UTC (rev 485)
+++ branches/2.9transition/packages/octave-forge/debian/patches/50_admin-octlink.dpatch	2006-02-07 19:03:24 UTC (rev 486)
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_admin-octlink.dpatch by Colin Ingram <synergizedmusic at gmail.com>
+##
+## DP: Adds missing admin/octlink.sh
+
+ at DPATCH@
+diff -urNad octave-forge-2006.01.28~/admin/octlink.sh octave-forge-2006.01.28/admin/octlink.sh
+--- octave-forge-2006.01.28~/admin/octlink.sh	1969-12-31 18:00:00.000000000 -0600
++++ octave-forge-2006.01.28/admin/octlink.sh	2006-02-01 04:07:10.000000000 -0600
+@@ -0,0 +1,6 @@
++#! /bin/sh
++
++FN2=`echo $2 | sed -e's/.octlink//'`
++FN1=`echo $1 | sed -e's/.oct//'`
++if test -e $2 ; then /bin/rm $2; fi
++echo "autoload (\"$FN2\", which (\"$FN1\"));" > $2


Property changes on: branches/2.9transition/packages/octave-forge/debian/patches/50_admin-octlink.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: branches/2.9transition/packages/octave-forge/debian/patches/50_main-set-makefile.dpatch
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/patches/50_main-set-makefile.dpatch	2006-02-05 01:44:10 UTC (rev 485)
+++ branches/2.9transition/packages/octave-forge/debian/patches/50_main-set-makefile.dpatch	2006-02-07 19:03:24 UTC (rev 486)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_makefile-fixes.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Add lacking main/set/Makefile
+
+ at DPATCH@
+
+--- octave-forge-2006.01.28.orig/main/set/Makefile
++++ octave-forge-2006.01.28/main/set/Makefile
+@@ -0,0 +1,12 @@
++sinclude ../../Makeconf
++
++t2.9.0=ismember.m setdiff.m unique.m
++DEPRECIATED_TARGETS=$($(word 2, $(sort t$(OCTAVE_VERSION) t2.9.0)))
++
++all : $(DEPRECIATED_TARGETS)
++
++clean: ; -$(RM) core octave-core $(DEPRECIATED_TARGETS) *~
++
++%.m: %.m.in
++	-$(INSTALL) $< $@
++


Property changes on: branches/2.9transition/packages/octave-forge/debian/patches/50_main-set-makefile.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: branches/2.9transition/packages/octave-forge/debian/patches/50_makefile-syntax-fix.dpatch
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/patches/50_makefile-syntax-fix.dpatch	2006-02-05 01:44:10 UTC (rev 485)
+++ branches/2.9transition/packages/octave-forge/debian/patches/50_makefile-syntax-fix.dpatch	2006-02-07 19:03:24 UTC (rev 486)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_makefile-fixes.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Fix syntax error in main/general/Makefile
+
+ at DPATCH@
+
+--- octave-forge-2006.01.28.orig/main/general/Makefile
++++ octave-forge-2006.01.28/main/general/Makefile
+@@ -6,8 +6,8 @@
+ t2.9.0=isequal.m sortrows.m
+ t2.9.4=blkdiag.m
+ DEPRECIATED_TARGETS=$($(word 2, $(sort t$(OCTAVE_VERSION) t2.1.58))) \
+-	$($(word 2, $(sort t$(OCTAVE_VERSION) t2.9.0)) \
+-	$($(word 2, $(sort t$(OCTAVE_VERSION) t2.9.4))
++	$($(word 2, $(sort t$(OCTAVE_VERSION) t2.9.0))) \
++	$($(word 2, $(sort t$(OCTAVE_VERSION) t2.9.4)))
+ PROGS=$(DEPRECIATED_TARGETS) command.oct deref.oct mark_for_deletion.oct
+ 
+ all: $(PROGS)


Property changes on: branches/2.9transition/packages/octave-forge/debian/patches/50_makefile-syntax-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: branches/2.9transition/packages/octave-forge/debian/rules
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/rules	2006-02-05 01:44:10 UTC (rev 485)
+++ branches/2.9transition/packages/octave-forge/debian/rules	2006-02-07 19:03:24 UTC (rev 486)
@@ -55,8 +55,9 @@
 configure:	configure-stamp
 configure-stamp: patch-stamp
 		dh_testdir
+		mv configure configure-orig
+		touch extra/MacOSX/NOINSTALL
 		touch main/sparse/NOINSTALL
-		touch extra/MacOSX/NOINSTALL
 		[ -f autogen.sh ] && ./autogen.sh && chmod 0755 configure
 		CC=$(compilerpath)			\
 		CXX=$(cpppath)				\
@@ -65,8 +66,8 @@
 		CFLAGS=$(compilerflags)			\
 		CXXFLAGS=$(compilerflags)		\
 		FFLAGS=$(compilerflags)			\
-		OCTAVE="octave-2.9.4"			\
-		MKOCTFILE="mkoctfile-2.9.4"		\
+		OCTAVE="octave-2.9.4"                   \
+		MKOCTFILE="mkoctfile-2.9.4"             \
 		./configure --prefix=/usr --with-altmpath=$(altmdir)
                 # clean the tsa/ directory
                 # ( cd extra/tsa && ../../debian/tsacleanup.pl )
@@ -106,13 +107,17 @@
 		dh_testroot
 		-test -f configure-orig && mv configure-orig configure
 		rm -f configure-stamp build-stamp install-stamp check-stamp
-		-test -f Makefile && $(MAKE) clean
-		-rm -rf *~ $(debtmp) debian/*~ debian/files* build	\
-			config.status config.cache config.log conftest	\
-			extra/symband/*.oct build.log			\
-			main/fixed/doc/fixed.ps 			\
-			main/fixed/doc/fixed.info Makeconf octinst.sh	\
+		-test -f Makefile && $(MAKE) clean && $(MAKE) distclean
+		-( cd main/fixed/doc ; $(MAKE) realclean )
+		-rm -rf *~ $(debtmp) debian/*~ debian/files*	\
 			fntests.* admin/RPM/octave-forge.spec
+		-rm -f `find . -name PKG_ADD`
+
+		# The following should be dropped when the 
+		# main/set/Makefile is included in the upstream tarball
+		-rm -f main/set/ismember.m main/set/setdiff.m	\
+			main/set/unique.m 
+
 		dh_clean
 
 binary-indep: 	build install check
@@ -122,7 +127,7 @@
 		dh_testdir
 		dh_testroot
 #		dh_installdebconf
-		dh_installdocs		TODO README RELEASE-NOTES
+		dh_installdocs		AUTHORS TODO README RELEASE-NOTES
 		dh_installexamples	extra/pdb/bin/rasmol.sh
 #		dh_installmenu
 #		dh_installemacsen

More information about the Pkg-octave-commit mailing list