[Pkg-octave-commit] rev 484 - in trunk/packages/octave-forge/debian: . patches

Sun Feb 5 01:44:05 UTC 2006

Author: rafael
Date: 2006-02-05 01:44:05 +0000 (Sun, 05 Feb 2006)
New Revision: 484

Added:
   trunk/packages/octave-forge/debian/patches/50_main-set-makefile.dpatch
   trunk/packages/octave-forge/debian/patches/50_makefile-syntax-fix.dpatch
Modified:
   trunk/packages/octave-forge/debian/changelog
   trunk/packages/octave-forge/debian/control
   trunk/packages/octave-forge/debian/patches/00list
   trunk/packages/octave-forge/debian/rules
Log:
Debian release octave-forge_2006.01.28-1

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

--- trunk/packages/octave-forge/debian/changelog	2006-02-03 23:09:00 UTC (rev 483)
+++ trunk/packages/octave-forge/debian/changelog	2006-02-05 01:44:05 UTC (rev 484)
@@ -1,3 +1,19 @@
+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

Modified: trunk/packages/octave-forge/debian/control
===================================================================
--- trunk/packages/octave-forge/debian/control	2006-02-03 23:09:00 UTC (rev 483)
+++ trunk/packages/octave-forge/debian/control	2006-02-05 01:44:05 UTC (rev 484)
@@ -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-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, 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: trunk/packages/octave-forge/debian/patches/00list
===================================================================
--- trunk/packages/octave-forge/debian/patches/00list	2006-02-03 23:09:00 UTC (rev 483)
+++ trunk/packages/octave-forge/debian/patches/00list	2006-02-05 01:44:05 UTC (rev 484)
@@ -1,2 +1,4 @@
 50_extra-pdb-sinclude
 50_make-pattern-rules
+50_main-set-makefile
+50_makefile-syntax-fix

Added: trunk/packages/octave-forge/debian/patches/50_main-set-makefile.dpatch
===================================================================
--- trunk/packages/octave-forge/debian/patches/50_main-set-makefile.dpatch	2006-02-03 23:09:00 UTC (rev 483)
+++ trunk/packages/octave-forge/debian/patches/50_main-set-makefile.dpatch	2006-02-05 01:44:05 UTC (rev 484)
@@ -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: trunk/packages/octave-forge/debian/patches/50_main-set-makefile.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/packages/octave-forge/debian/patches/50_makefile-syntax-fix.dpatch
===================================================================
--- trunk/packages/octave-forge/debian/patches/50_makefile-syntax-fix.dpatch	2006-02-03 23:09:00 UTC (rev 483)
+++ trunk/packages/octave-forge/debian/patches/50_makefile-syntax-fix.dpatch	2006-02-05 01:44:05 UTC (rev 484)
@@ -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: trunk/packages/octave-forge/debian/patches/50_makefile-syntax-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/octave-forge/debian/rules
===================================================================
--- trunk/packages/octave-forge/debian/rules	2006-02-03 23:09:00 UTC (rev 483)
+++ trunk/packages/octave-forge/debian/rules	2006-02-05 01:44:05 UTC (rev 484)
@@ -104,13 +104,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


