[Pkg-octave-commit] rev 591 - in trunk/packages/matwrap/debian: . patches

Rafael Laboissiere rafael at costa.debian.org
Sat Apr 29 20:42:06 UTC 2006 

Author: rafael
Date: 2006-04-29 20:42:04 +0000 (Sat, 29 Apr 2006)
New Revision: 591

Added:
   trunk/packages/matwrap/debian/compat
   trunk/packages/matwrap/debian/matwrap.dirs
   trunk/packages/matwrap/debian/patches/50_namespace-std-for-string.patch
   trunk/packages/matwrap/debian/patches/60_strip-file-extension.patch
   trunk/packages/matwrap/debian/patches/install.pl-get-manpage.patch
   trunk/packages/matwrap/debian/patches/library-path-gcc-4.patch
   trunk/packages/matwrap/debian/patches/makefile-build-target.patch
   trunk/packages/matwrap/debian/watch
Removed:
   trunk/packages/matwrap/debian/dirs
   trunk/packages/matwrap/debian/patches/00list
   trunk/packages/matwrap/debian/patches/50_namespace-std-for-string.dpatch
   trunk/packages/matwrap/debian/patches/60_strip-file-extension.dpatch
Modified:
   trunk/packages/matwrap/debian/
   trunk/packages/matwrap/debian/changelog
   trunk/packages/matwrap/debian/control
   trunk/packages/matwrap/debian/patches/
   trunk/packages/matwrap/debian/rules
Log:
Debian release matwrap_0.57-7


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

   + files
matwrap.1
patched
substvars
tmp
matwrap.substvars
stamp-*
matwrap


Modified: trunk/packages/matwrap/debian/changelog
===================================================================
--- trunk/packages/matwrap/debian/changelog	2006-04-29 15:48:00 UTC (rev 590)
+++ trunk/packages/matwrap/debian/changelog	2006-04-29 20:42:04 UTC (rev 591)
@@ -1,3 +1,20 @@
+matwrap (0.57-7) unstable; urgency=low
+
+  * debian/rules: Switched to cdbs
+  * debian/control:
+    - Build-depends on cdbs (for building the package) and octave (for
+      running the tests)
+    - Upgraded Standards-Version to 3.7.0 (no changes needed)
+  * New patches:
+    - debian/patches/install.pl-get-manpage.patch: Allow correct build of
+      matwrap.1 manpage
+    - debian/patches/library-path-gcc-4.patch: Fix paths for gcc 4.*
+    - debian/patches/makefile-build-target.patch: Introduce dummy target
+      as the first one, such that CDBS build target works
+  * debian/watch: Added file
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 29 Apr 2006 18:21:01 +0200
+
 matwrap (0.57-6) unstable; urgency=low
 
   +++ Changes by Rafael Laboissiere

Added: trunk/packages/matwrap/debian/compat
===================================================================
--- trunk/packages/matwrap/debian/compat	2006-04-29 15:48:00 UTC (rev 590)
+++ trunk/packages/matwrap/debian/compat	2006-04-29 20:42:04 UTC (rev 591)
@@ -0,0 +1 @@
+4

Modified: trunk/packages/matwrap/debian/control
===================================================================
--- trunk/packages/matwrap/debian/control	2006-04-29 15:48:00 UTC (rev 590)
+++ trunk/packages/matwrap/debian/control	2006-04-29 20:42:04 UTC (rev 591)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at debian.org>
-Build-Depends-Indep: debhelper (>= 3.0.0), dpatch
-Standards-Version: 3.6.1
+Build-Depends-Indep: debhelper (>= 4.0.0), cdbs, octave2.1 | octave2.9
+Standards-Version: 3.7.0
 
 Package: matwrap
 Architecture: all

Deleted: trunk/packages/matwrap/debian/dirs

Added: trunk/packages/matwrap/debian/matwrap.dirs
===================================================================
--- trunk/packages/matwrap/debian/matwrap.dirs	2006-04-29 15:48:00 UTC (rev 590)
+++ trunk/packages/matwrap/debian/matwrap.dirs	2006-04-29 20:42:04 UTC (rev 591)
@@ -0,0 +1 @@
+usr/share/doc/matwrap


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


Deleted: trunk/packages/matwrap/debian/patches/00list

Deleted: trunk/packages/matwrap/debian/patches/50_namespace-std-for-string.dpatch

Copied: trunk/packages/matwrap/debian/patches/50_namespace-std-for-string.patch (from rev 439, trunk/packages/matwrap/debian/patches/50_namespace-std-for-string.dpatch)
===================================================================
--- trunk/packages/matwrap/debian/patches/50_namespace-std-for-string.dpatch	2006-01-19 07:34:54 UTC (rev 439)
+++ trunk/packages/matwrap/debian/patches/50_namespace-std-for-string.patch	2006-04-29 20:42:04 UTC (rev 591)
@@ -0,0 +1,11 @@
+--- matwrap-0.57.orig/share/matwrap/wrap_octave.pl
++++ matwrap-0.57/share/matwrap/wrap_octave.pl
+@@ -648,7 +648,7 @@
+ 
+ $typemap_get_scalar{'char *'} = sub {
+   my ($arg, $argname) = @_;	# Name the arguments.
+-  ("  string _$argname = $arg->{oct_expr}.string_value();\n" .
++  ("  std::string _$argname = $arg->{oct_expr}.string_value();\n" .
+ 				# Get the string.
+    "  _$argname += '\\0';\n" .	# Make sure it's null terminated.
+    "  $arg->{c_var_name} = (char *)_$argname.data();\n");

Deleted: trunk/packages/matwrap/debian/patches/60_strip-file-extension.dpatch

Copied: trunk/packages/matwrap/debian/patches/60_strip-file-extension.patch (from rev 439, trunk/packages/matwrap/debian/patches/60_strip-file-extension.dpatch)
===================================================================
--- trunk/packages/matwrap/debian/patches/60_strip-file-extension.dpatch	2006-01-19 07:34:54 UTC (rev 439)
+++ trunk/packages/matwrap/debian/patches/60_strip-file-extension.patch	2006-04-29 20:42:04 UTC (rev 591)
@@ -0,0 +1,12 @@
+--- matwrap-0.57.orig/share/matwrap/wrap_octave.pl
++++ matwrap-0.57/share/matwrap/wrap_octave.pl
+@@ -359,8 +359,8 @@
+     die("wrap_octave: can't open output file $outfile--$!\n");
+ 
+   $octave_output_file = $outfile; # Remember the name of the output file.
+-  $octave_output_file =~ s/\..*$//; # Strip off the extension.
+   $octave_output_file =~ s at .*/@@; # Strip off the directories.
++  $octave_output_file =~ s/\..*$//; # Strip off the extension.
+ 
+   print OUTFILE "/*
+  * This file was automatically generated for octave by wrap_octave on

Added: trunk/packages/matwrap/debian/patches/install.pl-get-manpage.patch
===================================================================
--- trunk/packages/matwrap/debian/patches/install.pl-get-manpage.patch	2006-04-29 15:48:00 UTC (rev 590)
+++ trunk/packages/matwrap/debian/patches/install.pl-get-manpage.patch	2006-04-29 20:42:04 UTC (rev 591)
@@ -0,0 +1,14 @@
+diff -Nur matwrap-0.57/install.pl matwrap-0.57.new/install.pl
+--- matwrap-0.57/install.pl	2006-04-29 19:44:44.778378000 +0200
++++ matwrap-0.57.new/install.pl	2006-04-29 20:10:10.416446432 +0200
+@@ -77,8 +77,8 @@
+ #
+ # Start installing the files:
+ #
+-foreach (@files) {
+-  &copy_with_substitutions($_);
++foreach my $f (@files) {
++  &copy_with_substitutions($f);
+ }
+ 
+ #

Added: trunk/packages/matwrap/debian/patches/library-path-gcc-4.patch
===================================================================
--- trunk/packages/matwrap/debian/patches/library-path-gcc-4.patch	2006-04-29 15:48:00 UTC (rev 590)
+++ trunk/packages/matwrap/debian/patches/library-path-gcc-4.patch	2006-04-29 20:42:04 UTC (rev 591)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 70_library-path-gcc-4.0.dpatch by  <rafael at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: New patch generated from matwrap 0.57-6 diff.gz
+
+ at DPATCH@
+
+--- matwrap-0.57.orig/bin/matwrap
++++ matwrap-0.57/bin/matwrap
+@@ -215,7 +215,7 @@
+ 	my $incstr = $fname;	# Assume we include the file as is.
+ 	if ($incstr =~ s@^/usr/include/@@ || # Is it a system include file?
+ 	    $incstr =~ s@^/usr/local/include/@@ ||
+-	    $incstr =~ s at .*/gcc-lib/.*/include/@@) { # Is it a system include
++	    $incstr =~ s at .*lib/gcc.*/include/@@) { # Is it a system include
+ 				# file that was fixed by gcc?
+ 	  $include_str .= "#include <$incstr>\n"; # Use a different syntax.
+ 	} else {
+@@ -227,7 +227,7 @@
+ 	  grep(substr($fname, 0, length($_)) eq $_, @cpp_ignore_dirs) ||
+ 				# Or does it begin with the list of forbidden
+ 				# directories?
+-	  $fname =~ m@/gcc-lib/@) { # Somewhere in gcc fixed includes?
++	  $fname =~ m at lib/gcc@) { # Somewhere in gcc fixed includes?
+ 	$remember_defs_in_file = 0; # We're not really interested in this file.
+       } else {
+ 	$remember_defs_in_file = 1; # This is a file we are actually


Property changes on: trunk/packages/matwrap/debian/patches/library-path-gcc-4.patch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/packages/matwrap/debian/patches/makefile-build-target.patch
===================================================================
--- trunk/packages/matwrap/debian/patches/makefile-build-target.patch	2006-04-29 15:48:00 UTC (rev 590)
+++ trunk/packages/matwrap/debian/patches/makefile-build-target.patch	2006-04-29 20:42:04 UTC (rev 591)
@@ -0,0 +1,12 @@
+diff -Nur matwrap-0.57/Makefile matwrap-0.57.new/Makefile
+--- matwrap-0.57/Makefile	1999-12-14 05:05:14.000000000 +0100
++++ matwrap-0.57.new/Makefile	2006-04-29 18:27:31.940253856 +0200
+@@ -31,6 +31,8 @@
+ 
+ EXTRA_FILES = README INSTALL install.pl Makefile ChangeLog TODO
+ 
++all:
++
+ install::
+ 	perl install.pl -prefix $(PREFIX) $(BIN_FILES) $(SHARE_FILES) $(EXAMPLE_FILES)
+ 

Modified: trunk/packages/matwrap/debian/rules
===================================================================
--- trunk/packages/matwrap/debian/rules	2006-04-29 15:48:00 UTC (rev 590)
+++ trunk/packages/matwrap/debian/rules	2006-04-29 20:42:04 UTC (rev 591)
@@ -1,81 +1,35 @@
 #!/usr/bin/make -f
 # 							-*- makefile -*-
 # debian/rules file for the Debian/GNU Linux matwrap package
-# Copyright 1999 - 2002 by Dirk Eddelbuettel <edd at debian.org>
+# Copyright (C) 2006 by Rafael Laboissiere <rafael at debian.org>
 
-PACKAGE	= matwrap
-debtmp	:= $(shell pwd)/debian/tmp/usr
+debusr := $(CURDIR)/debian/matwrap/usr
+debshr := $(debusr)/share
+debdoc := $(debshr)/doc/matwrap
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-# Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
+DEB_MAKE_INSTALL_TARGET := PREFIX=$(debusr) install
 
-build: build-stamp
-build-stamp: patch-stamp
-	dh_testdir
-	#$(MAKE)
-	pod2man share/$(PACKAGE)/$(PACKAGE).pod > debian/$(PACKAGE).1
-	touch build-stamp
+cleanbuilddir/matwrap::
+	( cd share/matwrap/Examples/simple ;	\
+	  make clean ) ;			\
+	done
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	#-$(MAKE) clean
-	#-$(MAKE) distclean
-	rm -f debian/$(PACKAGE).1
-	dh_clean
+build/matwrap::
+	# Run checks
+	( cd share/matwrap/Examples/simple ;		\
+	  make PERL="perl -I../.." octave ;		\
+	  echo "simple_stub; demo" | octave -qf )
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) PREFIX=$(debtmp) 	install
-	# cleanups needed
-	rm -rvf $(debtmp)/mkoctfile_fixed 	  		\
-		$(debtmp)/share/matwrap/Examples/ 		\
-		$(debtmp)/share/matwrap/mkoctfile* 		\
-		$(debtmp)/share/matwrap/fix_mkoctfile.sh 	\
-		$(debtmp)/share/matwrap/matwrap.pod	 	\
-		$(debtmp)/man/
-	# change $PREFIX to leave only trailing /usr
-	perl -p -i -e 's|/.*/debian/tmp||' $(debtmp)/bin/matwrap
-
-# Build architecture-independent files here.
-binary-indep: build install
-#	dh_testversion
-	dh_testdir
-	dh_testroot
-#	dh_installdebconf
-	dh_installdocs		README TODO
-	dh_installexamples	share/matwrap/Examples/*
-	## remove zero-byte file (lintian)
-	rm -v $(debtmp)/share/doc/matwrap/examples/simple/demo.t
-#	dh_installmenu
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installinit
-#	dh_installcron
-	dh_installmanpages
-#	dh_installinfo
-#	dh_undocumented
-	dh_installchangelogs	ChangeLog
-#	dh_link
-	dh_compress
-	dh_fixperms
-#	dh_suidregister
-	dh_installdeb
-	dh_perl
-	dh_gencontrol
-#	dh_md5sums
-	dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-
+install/matwrap::
+	# Put mandir in FSSTND-compliant location
+	mv $(debusr)/man $(debusr)/share
+	# Install examples
+	mv $(debshr)/matwrap/Examples $(debdoc)/examples
+	# Change $PREFIX of matwrap script, leaving only the trailing /usr
+	perl -p -i -e 's|/.*/debian/matwrap||' $(debusr)/bin/matwrap
+	# Remove zero-byte file (lintian warning)
+	rm -fv $(debdoc)/examples/simple/demo.t

Added: trunk/packages/matwrap/debian/watch
===================================================================
--- trunk/packages/matwrap/debian/watch	2006-04-29 15:48:00 UTC (rev 590)
+++ trunk/packages/matwrap/debian/watch	2006-04-29 20:42:04 UTC (rev 591)
@@ -0,0 +1,2 @@
+version=3
+http://lnc.usc.edu/~holt/matwrap/ matwrap-([\d+\.]+|\d+)\.tar\.gz
\ No newline at end of file

More information about the Pkg-octave-commit mailing list