[Pkg-octave-commit] r1423 - in inline-octave/trunk/debian: . patches
Thomas Weber
thomas-guest at alioth.debian.org
Thu Mar 20 22:29:25 UTC 2008
Author: thomas-guest
Date: 2008-03-20 22:29:25 +0000 (Thu, 20 Mar 2008)
New Revision: 1423
Added:
inline-octave/trunk/debian/patches/50_capture_octave_output.diff
inline-octave/trunk/debian/patches/60_copyright_char_in_pod.diff
inline-octave/trunk/debian/patches/series
Removed:
inline-octave/trunk/debian/patches/00list
inline-octave/trunk/debian/patches/50_capture_octave_output.dpatch
inline-octave/trunk/debian/patches/60_copyright_char_in_pod.dpatch
Modified:
inline-octave/trunk/debian/control
inline-octave/trunk/debian/rules
Log:
Switch from dpatch to quilt as patch system
Modified: inline-octave/trunk/debian/control
===================================================================
--- inline-octave/trunk/debian/control 2008-03-20 09:27:01 UTC (rev 1422)
+++ inline-octave/trunk/debian/control 2008-03-20 22:29:25 UTC (rev 1423)
@@ -6,7 +6,7 @@
Thomas Weber <thomas.weber.mail at gmail.com>
DM-Upload-Allowed: yes
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4), dpatch
+Build-Depends: debhelper (>= 4), quilt
Build-Depends-Indep: libinline-perl, octave2.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-octave/inline-octave/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-octave/inline-octave/trunk
Deleted: inline-octave/trunk/debian/patches/00list
===================================================================
--- inline-octave/trunk/debian/patches/00list 2008-03-20 09:27:01 UTC (rev 1422)
+++ inline-octave/trunk/debian/patches/00list 2008-03-20 22:29:25 UTC (rev 1423)
@@ -1,2 +0,0 @@
-50_capture_octave_output
-60_copyright_char_in_pod
Added: inline-octave/trunk/debian/patches/50_capture_octave_output.diff
===================================================================
--- inline-octave/trunk/debian/patches/50_capture_octave_output.diff (rev 0)
+++ inline-octave/trunk/debian/patches/50_capture_octave_output.diff 2008-03-20 22:29:25 UTC (rev 1423)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_capture_octave_output.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Correctly captures warning message from Octave process
+
+ at DPATCH@
+
+--- inline-octave-0.22.orig/t/2_calling.t
++++ inline-octave-0.22/t/2_calling.t
+@@ -26,10 +26,13 @@
+ $v= jnk2(0)->disp();
+ };
+
++do {
++ local $SIG{__WARN__} = sub {
++ my $ok = ($_[0] =~ /toascii/);
++ ok( $ok, 1);
++ };
++
+ # jnk3 gives error for u real
+-eval {
+ jnk3(0);
+ };
+
+-my $ok = ($@ =~ /toascii/);
+-ok( $ok, 1);
Deleted: inline-octave/trunk/debian/patches/50_capture_octave_output.dpatch
===================================================================
--- inline-octave/trunk/debian/patches/50_capture_octave_output.dpatch 2008-03-20 09:27:01 UTC (rev 1422)
+++ inline-octave/trunk/debian/patches/50_capture_octave_output.dpatch 2008-03-20 22:29:25 UTC (rev 1423)
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_capture_octave_output.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Correctly captures warning message from Octave process
-
- at DPATCH@
-
---- inline-octave-0.22.orig/t/2_calling.t
-+++ inline-octave-0.22/t/2_calling.t
-@@ -26,10 +26,13 @@
- $v= jnk2(0)->disp();
- };
-
-+do {
-+ local $SIG{__WARN__} = sub {
-+ my $ok = ($_[0] =~ /toascii/);
-+ ok( $ok, 1);
-+ };
-+
- # jnk3 gives error for u real
--eval {
- jnk3(0);
- };
-
--my $ok = ($@ =~ /toascii/);
--ok( $ok, 1);
Added: inline-octave/trunk/debian/patches/60_copyright_char_in_pod.diff
===================================================================
--- inline-octave/trunk/debian/patches/60_copyright_char_in_pod.diff (rev 0)
+++ inline-octave/trunk/debian/patches/60_copyright_char_in_pod.diff 2008-03-20 22:29:25 UTC (rev 1423)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60_copyright_char_in_pod.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Replaces non-ascci character in POD section
+
+ at DPATCH@
+
+--- inline-octave-0.22.orig/Octave.pm
++++ inline-octave-0.22/Octave.pm
+@@ -1602,7 +1602,7 @@
+
+ =head1 COPYRIGHT
+
+-© MMIII, Andy Adler
++(C) MMIII, Andy Adler
+
+ All Rights Reserved. This module is free software. It may be used,
+ redistributed and/or modified under the same terms as Perl itself.
Deleted: inline-octave/trunk/debian/patches/60_copyright_char_in_pod.dpatch
===================================================================
--- inline-octave/trunk/debian/patches/60_copyright_char_in_pod.dpatch 2008-03-20 09:27:01 UTC (rev 1422)
+++ inline-octave/trunk/debian/patches/60_copyright_char_in_pod.dpatch 2008-03-20 22:29:25 UTC (rev 1423)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 60_copyright_char_in_pod.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Replaces non-ascci character in POD section
-
- at DPATCH@
-
---- inline-octave-0.22.orig/Octave.pm
-+++ inline-octave-0.22/Octave.pm
-@@ -1602,7 +1602,7 @@
-
- =head1 COPYRIGHT
-
--© MMIII, Andy Adler
-+(C) MMIII, Andy Adler
-
- All Rights Reserved. This module is free software. It may be used,
- redistributed and/or modified under the same terms as Perl itself.
Added: inline-octave/trunk/debian/patches/series
===================================================================
--- inline-octave/trunk/debian/patches/series (rev 0)
+++ inline-octave/trunk/debian/patches/series 2008-03-20 22:29:25 UTC (rev 1423)
@@ -0,0 +1,2 @@
+50_capture_octave_output.diff
+60_copyright_char_in_pod.diff
Modified: inline-octave/trunk/debian/rules
===================================================================
--- inline-octave/trunk/debian/rules 2008-03-20 09:27:01 UTC (rev 1422)
+++ inline-octave/trunk/debian/rules 2008-03-20 22:29:25 UTC (rev 1423)
@@ -3,7 +3,7 @@
# debian/rules file for the Debian Linux libinline-octave-perl package
# Copyright (C) 2001 - 2002 by Dirk Eddelbuettel <edd at debian.org>
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
PACKAGE := $(shell grep Package debian/control | sed 's/^Package: //')
version := $(shell head -1 debian/changelog | \
@@ -15,7 +15,7 @@
lynx http://www.cpan.org/authors/id/A/AA/AADLER
build: build-stamp
-build-stamp: patch-stamp
+build-stamp: patch
dh_testdir
# massage Makefile.PL to navigate around interactive question
More information about the Pkg-octave-commit
mailing list