[Pkg-octave-commit] r1491 - in matwrap/trunk/debian: . patches
Thomas Weber
thomas-guest at alioth.debian.org
Sun Mar 23 09:42:08 UTC 2008
Author: thomas-guest
Date: 2008-03-23 09:42:08 +0000 (Sun, 23 Mar 2008)
New Revision: 1491
Added:
matwrap/trunk/debian/patches/install.pl-get-manpage.diff
matwrap/trunk/debian/patches/library-path-gcc-4.diff
matwrap/trunk/debian/patches/makefile-build-target.diff
matwrap/trunk/debian/patches/namespace-std-for-string.diff
matwrap/trunk/debian/patches/series
matwrap/trunk/debian/patches/strip-file-extension.diff
Removed:
matwrap/trunk/debian/patches/50_namespace-std-for-string.patch
matwrap/trunk/debian/patches/60_strip-file-extension.patch
matwrap/trunk/debian/patches/install.pl-get-manpage.patch
matwrap/trunk/debian/patches/library-path-gcc-4.patch
matwrap/trunk/debian/patches/makefile-build-target.patch
Modified:
matwrap/trunk/debian/changelog
matwrap/trunk/debian/control
matwrap/trunk/debian/rules
Log:
Switch to quilt as patch system
Modified: matwrap/trunk/debian/changelog
===================================================================
--- matwrap/trunk/debian/changelog 2008-03-23 00:27:14 UTC (rev 1490)
+++ matwrap/trunk/debian/changelog 2008-03-23 09:42:08 UTC (rev 1491)
@@ -6,8 +6,9 @@
[ Thomas Weber ]
* debian/control: Vcs-fields point to the trunk/ directory
+ * Switch to quilt as patch system
- -- Rafael Laboissiere <rafael at debian.org> Wed, 23 Jan 2008 23:49:40 +0100
+ -- Thomas Weber <thomas.weber.mail at gmail.com> Sun, 23 Mar 2008 09:58:33 +0100
matwrap (0.57-9) unstable; urgency=low
Modified: matwrap/trunk/debian/control
===================================================================
--- matwrap/trunk/debian/control 2008-03-23 00:27:14 UTC (rev 1490)
+++ matwrap/trunk/debian/control 2008-03-23 09:42:08 UTC (rev 1491)
@@ -5,7 +5,7 @@
Uploaders: Rafael Laboissiere <rafael at debian.org>,
Thomas Weber <thomas.weber.mail at gmail.com>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 4.0.0), cdbs
+Build-Depends: debhelper (>= 4.0.0), cdbs, quilt
Build-Depends-Indep: octave2.1-headers (>= 1:2.1.73-14) | octave3.0-headers
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-octave/matwrap/trunk
Deleted: matwrap/trunk/debian/patches/50_namespace-std-for-string.patch
===================================================================
--- matwrap/trunk/debian/patches/50_namespace-std-for-string.patch 2008-03-23 00:27:14 UTC (rev 1490)
+++ matwrap/trunk/debian/patches/50_namespace-std-for-string.patch 2008-03-23 09:42:08 UTC (rev 1491)
@@ -1,11 +0,0 @@
---- 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: matwrap/trunk/debian/patches/60_strip-file-extension.patch
===================================================================
--- matwrap/trunk/debian/patches/60_strip-file-extension.patch 2008-03-23 00:27:14 UTC (rev 1490)
+++ matwrap/trunk/debian/patches/60_strip-file-extension.patch 2008-03-23 09:42:08 UTC (rev 1491)
@@ -1,12 +0,0 @@
---- 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: matwrap/trunk/debian/patches/install.pl-get-manpage.diff
===================================================================
--- matwrap/trunk/debian/patches/install.pl-get-manpage.diff (rev 0)
+++ matwrap/trunk/debian/patches/install.pl-get-manpage.diff 2008-03-23 09:42:08 UTC (rev 1491)
@@ -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) {
+- ©_with_substitutions($_);
++foreach my $f (@files) {
++ ©_with_substitutions($f);
+ }
+
+ #
Deleted: matwrap/trunk/debian/patches/install.pl-get-manpage.patch
===================================================================
--- matwrap/trunk/debian/patches/install.pl-get-manpage.patch 2008-03-23 00:27:14 UTC (rev 1490)
+++ matwrap/trunk/debian/patches/install.pl-get-manpage.patch 2008-03-23 09:42:08 UTC (rev 1491)
@@ -1,14 +0,0 @@
-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) {
-- ©_with_substitutions($_);
-+foreach my $f (@files) {
-+ ©_with_substitutions($f);
- }
-
- #
Added: matwrap/trunk/debian/patches/library-path-gcc-4.diff
===================================================================
--- matwrap/trunk/debian/patches/library-path-gcc-4.diff (rev 0)
+++ matwrap/trunk/debian/patches/library-path-gcc-4.diff 2008-03-23 09:42:08 UTC (rev 1491)
@@ -0,0 +1,25 @@
+## 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
+
+--- 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
Deleted: matwrap/trunk/debian/patches/library-path-gcc-4.patch
===================================================================
--- matwrap/trunk/debian/patches/library-path-gcc-4.patch 2008-03-23 00:27:14 UTC (rev 1490)
+++ matwrap/trunk/debian/patches/library-path-gcc-4.patch 2008-03-23 09:42:08 UTC (rev 1491)
@@ -1,28 +0,0 @@
-#! /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
Added: matwrap/trunk/debian/patches/makefile-build-target.diff
===================================================================
--- matwrap/trunk/debian/patches/makefile-build-target.diff (rev 0)
+++ matwrap/trunk/debian/patches/makefile-build-target.diff 2008-03-23 09:42:08 UTC (rev 1491)
@@ -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)
+
Deleted: matwrap/trunk/debian/patches/makefile-build-target.patch
===================================================================
--- matwrap/trunk/debian/patches/makefile-build-target.patch 2008-03-23 00:27:14 UTC (rev 1490)
+++ matwrap/trunk/debian/patches/makefile-build-target.patch 2008-03-23 09:42:08 UTC (rev 1491)
@@ -1,12 +0,0 @@
-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)
-
Added: matwrap/trunk/debian/patches/namespace-std-for-string.diff
===================================================================
--- matwrap/trunk/debian/patches/namespace-std-for-string.diff (rev 0)
+++ matwrap/trunk/debian/patches/namespace-std-for-string.diff 2008-03-23 09:42:08 UTC (rev 1491)
@@ -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");
Added: matwrap/trunk/debian/patches/series
===================================================================
--- matwrap/trunk/debian/patches/series (rev 0)
+++ matwrap/trunk/debian/patches/series 2008-03-23 09:42:08 UTC (rev 1491)
@@ -0,0 +1,5 @@
+namespace-std-for-string.diff
+strip-file-extension.diff
+install.pl-get-manpage.diff
+library-path-gcc-4.diff
+makefile-build-target.diff
Added: matwrap/trunk/debian/patches/strip-file-extension.diff
===================================================================
--- matwrap/trunk/debian/patches/strip-file-extension.diff (rev 0)
+++ matwrap/trunk/debian/patches/strip-file-extension.diff 2008-03-23 09:42:08 UTC (rev 1491)
@@ -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
Modified: matwrap/trunk/debian/rules
===================================================================
--- matwrap/trunk/debian/rules 2008-03-23 00:27:14 UTC (rev 1490)
+++ matwrap/trunk/debian/rules 2008-03-23 09:42:08 UTC (rev 1491)
@@ -9,7 +9,7 @@
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
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_MAKE_INSTALL_TARGET := PREFIX=$(debusr) install
More information about the Pkg-octave-commit
mailing list