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

Rafael Laboissiere rafael at costa.debian.org
Mon Feb 13 14:17:03 UTC 2006 

Author: rafael
Date: 2006-02-13 14:17:01 +0000 (Mon, 13 Feb 2006)
New Revision: 492

Added:
   trunk/packages/octave-forge/debian/patches/50_extra-pdb-sinclude.patch
   trunk/packages/octave-forge/debian/patches/50_main-set-makefile.patch
   trunk/packages/octave-forge/debian/patches/50_make-clean.patch
   trunk/packages/octave-forge/debian/patches/50_make-pattern-rules.patch
   trunk/packages/octave-forge/debian/patches/50_makefile-syntax-fix.patch
   trunk/packages/octave-forge/debian/patches/60_make-distclean.patch
Removed:
   trunk/packages/octave-forge/debian/patches/00list
   trunk/packages/octave-forge/debian/patches/50_extra-pdb-sinclude.dpatch
   trunk/packages/octave-forge/debian/patches/50_main-set-makefile.dpatch
   trunk/packages/octave-forge/debian/patches/50_make-pattern-rules.dpatch
   trunk/packages/octave-forge/debian/patches/50_makefile-syntax-fix.dpatch
Modified:
   trunk/packages/octave-forge/debian/
   trunk/packages/octave-forge/debian/changelog
   trunk/packages/octave-forge/debian/control
   trunk/packages/octave-forge/debian/patches/
   trunk/packages/octave-forge/debian/rules
Log:
Debian release octave-forge_2006.01.28-2


Property changes on: trunk/packages/octave-forge/debian
___________________________________________________________________
Name: svn:ignore
   - tmp
files
patched
substvars
octave-forge.substvars
octave-forge

   + tmp
files
patched
substvars
octave-forge.substvars
octave-forge
stamp-*


Modified: trunk/packages/octave-forge/debian/changelog
===================================================================
--- trunk/packages/octave-forge/debian/changelog	2006-02-09 21:47:18 UTC (rev 491)
+++ trunk/packages/octave-forge/debian/changelog	2006-02-13 14:17:01 UTC (rev 492)
@@ -1,3 +1,17 @@
+octave-forge (2006.01.28-2) unstable; urgency=low
+
+  * debian/control: Build-depends on cdbs (to use simple-patchsys.mk)
+    instead of dpatch
+  * debian/patches/50_make-clean.patch: Patch from upstream CVS to clean
+    files left by make
+  * debian/patches/60_make-distclean.patch: Patch for fixing the upstream
+    behavior for make distclean
+  * debian/rules:
+    - Removed code which was doing the cleanup done in the patches above
+    - Adjusted to use CDBS' simple-patchsys.mk instead od dpatch
+
+ -- Rafael Laboissiere <rafael at debian.org>  Mon, 13 Feb 2006 11:18:53 +0100
+
 octave-forge (2006.01.28-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/octave-forge/debian/control
===================================================================
--- trunk/packages/octave-forge/debian/control	2006-02-09 21:47:18 UTC (rev 491)
+++ trunk/packages/octave-forge/debian/control	2006-02-13 14:17:01 UTC (rev 492)
@@ -4,7 +4,7 @@
 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, netcdfg-dev, units, 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, cdbs
 Build-Conflicts: octave2.0-headers, octave2.0
 
 Package: octave-forge


Property changes on: trunk/packages/octave-forge/debian/patches
___________________________________________________________________
Name: svn:ignore
   + *.log


Deleted: trunk/packages/octave-forge/debian/patches/00list

Deleted: trunk/packages/octave-forge/debian/patches/50_extra-pdb-sinclude.dpatch

Copied: trunk/packages/octave-forge/debian/patches/50_extra-pdb-sinclude.patch (from rev 491, trunk/packages/octave-forge/debian/patches/50_extra-pdb-sinclude.dpatch)
===================================================================
--- trunk/packages/octave-forge/debian/patches/50_extra-pdb-sinclude.dpatch	2006-02-09 21:47:18 UTC (rev 491)
+++ trunk/packages/octave-forge/debian/patches/50_extra-pdb-sinclude.patch	2006-02-13 14:17:01 UTC (rev 492)
@@ -0,0 +1,8 @@
+--- octave-forge-2005.06.13.orig/extra/pdb/Makefile
++++ octave-forge-2005.06.13/extra/pdb/Makefile
+@@ -1,4 +1,4 @@
+-include ../../Makeconf
++sinclude ../../Makeconf
+ 
+ all: creadpdb.oct plotpdb.m
+ 

Deleted: trunk/packages/octave-forge/debian/patches/50_main-set-makefile.dpatch

Copied: trunk/packages/octave-forge/debian/patches/50_main-set-makefile.patch (from rev 491, trunk/packages/octave-forge/debian/patches/50_main-set-makefile.dpatch)
===================================================================
--- trunk/packages/octave-forge/debian/patches/50_main-set-makefile.dpatch	2006-02-09 21:47:18 UTC (rev 491)
+++ trunk/packages/octave-forge/debian/patches/50_main-set-makefile.patch	2006-02-13 14:17:01 UTC (rev 492)
@@ -0,0 +1,15 @@
+--- main.orig/set/Makefile
++++ 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) $< $@
++

Added: trunk/packages/octave-forge/debian/patches/50_make-clean.patch
===================================================================
--- trunk/packages/octave-forge/debian/patches/50_make-clean.patch	2006-02-09 21:47:18 UTC (rev 491)
+++ trunk/packages/octave-forge/debian/patches/50_make-clean.patch	2006-02-13 14:17:01 UTC (rev 492)
@@ -0,0 +1,32 @@
+--- octave-forge-2006.01.28.orig/Makefile
++++ octave-forge-2006.01.28/Makefile
+@@ -71,11 +71,13 @@
+ .PHONY: clean distclean dist checkindist changelog
+ 
+ clean: clearlog subdirs
++	-$(RM) fntests.m fntests.log
+ 	-$(RM) core octave-core octave configure.in
++	-$(RM) main/*/PKG_ADD extra/*/PKG_ADD
+ 
+ distclean: clean
+ 	-$(RM) Makeconf octinst.sh config.cache config.status config.log \
+-		build.log build.fail *~
++		admin/RPM/octave-forge.spec build.log build.fail *~
+ 
+ dist: checkindist subdirs
+ 	-$(RM) build.log build.fail
+--- octave-forge-2006.01.28.orig/main/sparse/Makefile
++++ octave-forge-2006.01.28/main/sparse/Makefile
+@@ -130,7 +130,11 @@
+ 
+ S_DOUBLE= $(DLUSRC) $(ALLAUX) $(DZLAUX) $(ZLUSRC)
+ 
+-all: $(NAME).oct $(OBJLINKS) sptest.m 
++# Only build sparse if version is less than 2.9.4
++t2.9.4 = $(NAME).oct $(OBJLINKS) sptest.m 
++TARGETS=$($(word 2, $(sort t$(OCTAVE_VERSION) t2.9.4)))
++
++all: $(TARGETS)
+ 
+ sptest.m: buildtests.sh
+ 	${SHELL} buildtests.sh preset


Property changes on: trunk/packages/octave-forge/debian/patches/50_make-clean.patch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: trunk/packages/octave-forge/debian/patches/50_make-pattern-rules.dpatch

Copied: trunk/packages/octave-forge/debian/patches/50_make-pattern-rules.patch (from rev 491, trunk/packages/octave-forge/debian/patches/50_make-pattern-rules.dpatch)
===================================================================
--- trunk/packages/octave-forge/debian/patches/50_make-pattern-rules.dpatch	2006-02-09 21:47:18 UTC (rev 491)
+++ trunk/packages/octave-forge/debian/patches/50_make-pattern-rules.patch	2006-02-13 14:17:01 UTC (rev 492)
@@ -0,0 +1,35 @@
+--- octave-forge-2005.06.13.orig/main/comm/Makefile
++++ octave-forge-2005.06.13/main/comm/Makefile
+@@ -67,7 +67,7 @@
+ 	@echo "Depending $<"; \
+ 	$(MKOCTFILE) $(MOFLAGS) $(DEFINES) -M $<
+ 
+-%.o:%.cc
++%.o:%.cc ; \
+ 	@echo "Compiling $@"; \
+ 	$(MKOCTFILE) $(MOFLAGS) $(DEFINES) -c $< 
+ 
+--- octave-forge-2005.06.13.orig/main/fixed/Makefile
++++ octave-forge-2005.06.13/main/fixed/Makefile
+@@ -162,9 +162,7 @@
+ 	@echo "Depending $<"; \
+ 	$(MKOCTFILE) $(MOFLAGS) $(DEFINES) -M $<
+ 
+-%.o:%.cc
+-%.o:%.cc %.d
+-	@echo "Compiling $@"; \
++%.o:%.cc ; @echo "Compiling $@"; \
+ 	$(MKOCTFILE) $(MOFLAGS) $(DEFINES) -c $< 
+ 
+ clean: $(SUBDIRS)
+--- octave-forge-2005.06.13.orig/main/fixed/examples/Makefile
++++ octave-forge-2005.06.13/main/fixed/examples/Makefile
+@@ -45,7 +45,7 @@
+ 	@echo "Depending $<"; \
+ 	$(MKOCTFILE) $(MOFLAGS) $(DEFINES) -M $<
+ 
+-%.o: %.cc
++%.o: %.cc ; \
+ 	@echo "Compiling $@"; \
+ 	$(MKOCTFILE) $(MOFLAGS) $(DEFINES) -c $< 
+ 

Deleted: trunk/packages/octave-forge/debian/patches/50_makefile-syntax-fix.dpatch

Copied: trunk/packages/octave-forge/debian/patches/50_makefile-syntax-fix.patch (from rev 491, trunk/packages/octave-forge/debian/patches/50_makefile-syntax-fix.dpatch)
===================================================================
--- trunk/packages/octave-forge/debian/patches/50_makefile-syntax-fix.dpatch	2006-02-09 21:47:18 UTC (rev 491)
+++ trunk/packages/octave-forge/debian/patches/50_makefile-syntax-fix.patch	2006-02-13 14:17:01 UTC (rev 492)
@@ -0,0 +1,13 @@
+--- 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)

Added: trunk/packages/octave-forge/debian/patches/60_make-distclean.patch
===================================================================
--- trunk/packages/octave-forge/debian/patches/60_make-distclean.patch	2006-02-09 21:47:18 UTC (rev 491)
+++ trunk/packages/octave-forge/debian/patches/60_make-distclean.patch	2006-02-13 14:17:01 UTC (rev 492)
@@ -0,0 +1,13 @@
+diff -Nur octave-forge-2006.01.28/Makefile octave-forge-2006.01.28.new/Makefile
+--- octave-forge-2006.01.28/Makefile	2006-02-13 10:54:15.243468280 +0100
++++ octave-forge-2006.01.28.new/Makefile	2006-02-13 11:15:00.077224784 +0100
+@@ -75,7 +75,8 @@
+ 	-$(RM) core octave-core octave configure.in
+ 	-$(RM) main/*/PKG_ADD extra/*/PKG_ADD
+ 
+-distclean: clean
++distclean: subdirs
++	-$(MAKE) clean
+ 	-$(RM) Makeconf octinst.sh config.cache config.status config.log \
+ 		admin/RPM/octave-forge.spec build.log build.fail *~
+ 

Modified: trunk/packages/octave-forge/debian/rules
===================================================================
--- trunk/packages/octave-forge/debian/rules	2006-02-09 21:47:18 UTC (rev 491)
+++ trunk/packages/octave-forge/debian/rules	2006-02-13 14:17:01 UTC (rev 492)
@@ -5,7 +5,7 @@
 
 PACKAGE		= octave-forge
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/octave/debian/defs.make
 
 altname         = octave-forge-alternatives
@@ -53,9 +53,9 @@
                 # see the script cvs_checkout.sh instead
 
 configure:	configure-stamp
-configure-stamp: patch-stamp
+configure-stamp: apply-patches
 		dh_testdir
-		mv configure configure-orig
+		test -f configure-orig || mv configure configure-orig
 		touch extra/MacOSX/NOINSTALL
 		[ -f autogen.sh ] && ./autogen.sh && chmod 0755 configure
 		CC=$(compilerpath)			\
@@ -99,22 +99,23 @@
 		-$(MAKE) check 	OCTAVE=octave2.1
 		touch check-stamp
 
-clean: unpatch
+clean::
 		dh_testdir
 		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 && $(MAKE) distclean
+
+		# The following hack involving the Debian patches should be
+		# removed as soon as the patches 50_make-clean and
+		# 60_make-distclean are integraded upstream
+		./debian/rules apply-patches
+		-test -f Makefile && $(MAKE) distclean
+		./debian/rules reverse-patches
+		rm -f debian/patches/*.log
+
 		-( cd main/fixed/doc ; $(MAKE) realclean )
-		-rm -rf *~ $(debtmp) debian/*~ debian/files*	\
-			fntests.* admin/RPM/octave-forge.spec
-		-rm -f `find . -name PKG_ADD`
+		-rm -rf *~ $(debtmp) debian/*~ debian/files*
 
-		# 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

More information about the Pkg-octave-commit mailing list