[Pkg-octave-commit] rev 284 - in trunk/packages/inline-octave/debian: . patches

[Rafael Laboissiere]

Author: rafael
Date: 2005-10-21 14:15:33 +0000 (Fri, 21 Oct 2005)
New Revision: 284

Added:
   trunk/packages/inline-octave/debian/patches/50_capture_octave_output.dpatch
   trunk/packages/inline-octave/debian/patches/60_copyright_char_in_pod.dpatch
Modified:
   trunk/packages/inline-octave/debian/changelog
   trunk/packages/inline-octave/debian/patches/00list
   trunk/packages/inline-octave/debian/rules
Log:
>From debian/changelog:

  * debian/patches/50_capture_octave_output.dpatch: Added patch (makes
    t/2_calling.t work)
  * debian/patches/50_octave_binary_name.dpatch: Added patch (fixes
    non-ascii copyright character in POD section of Octave.pm)
  * debian/rules: Run the regression tests when building the package

Also, removed some dh-make cruft in debian/rules.









Modified: trunk/packages/inline-octave/debian/changelog
===================================================================
--- trunk/packages/inline-octave/debian/changelog	2005-10-20 15:01:55 UTC (rev 283)
+++ trunk/packages/inline-octave/debian/changelog	2005-10-21 14:15:33 UTC (rev 284)
@@ -10,6 +10,11 @@
   +++ Changes made by Rafael Laboissiere
 
   * debian/control: Standards-Version upgraded to 3.6.2 (no chnages needed)
+  * debian/patches/50_capture_octave_output.dpatch: Added patch (makes
+    t/2_calling.t work)
+  * debian/patches/50_octave_binary_name.dpatch: Added patch (fixes
+    non-ascii copyright character in POD section of Octave.pm)
+  * debian/rules: Run the regression tests when building the package
 
  --
 

Modified: trunk/packages/inline-octave/debian/patches/00list
===================================================================
--- trunk/packages/inline-octave/debian/patches/00list	2005-10-20 15:01:55 UTC (rev 283)
+++ trunk/packages/inline-octave/debian/patches/00list	2005-10-21 14:15:33 UTC (rev 284)
@@ -1 +1,3 @@
 50_octave_binary_name
+50_capture_octave_output
+60_copyright_char_in_pod

Added: trunk/packages/inline-octave/debian/patches/50_capture_octave_output.dpatch
===================================================================
--- trunk/packages/inline-octave/debian/patches/50_capture_octave_output.dpatch	2005-10-20 15:01:55 UTC (rev 283)
+++ trunk/packages/inline-octave/debian/patches/50_capture_octave_output.dpatch	2005-10-21 14:15:33 UTC (rev 284)
@@ -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);


Property changes on: trunk/packages/inline-octave/debian/patches/50_capture_octave_output.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/packages/inline-octave/debian/patches/60_copyright_char_in_pod.dpatch
===================================================================
--- trunk/packages/inline-octave/debian/patches/60_copyright_char_in_pod.dpatch	2005-10-20 15:01:55 UTC (rev 283)
+++ trunk/packages/inline-octave/debian/patches/60_copyright_char_in_pod.dpatch	2005-10-21 14:15:33 UTC (rev 284)
@@ -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.


Property changes on: trunk/packages/inline-octave/debian/patches/60_copyright_char_in_pod.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/inline-octave/debian/rules
===================================================================
--- trunk/packages/inline-octave/debian/rules	2005-10-20 15:01:55 UTC (rev 283)
+++ trunk/packages/inline-octave/debian/rules	2005-10-21 14:15:33 UTC (rev 284)
@@ -23,9 +23,9 @@
 #	perl -p -i -e "s/= \"octave\";/= \"octave2.1\";/" 	Makefile.PL
 #	perl -p -i -e "s/_validated= 0;/_validated= 1;/" 	Makefile.PL
 
-	perl Makefile.PL OCTAVE=octave2.1 INSTALLDIRS=vendor 
-	$(MAKE) 
-        # $(MAKE) test
+	perl Makefile.PL OCTAVE=octave2.1 INSTALLDIRS=vendor
+	$(MAKE)
+	$(MAKE) test
 	touch build-stamp
 
 clean: unpatch
@@ -45,8 +45,8 @@
 	dh_installdirs
 	$(MAKE) install PREFIX=$(PWD)/debian/tmp/usr
 	dh_strip
-	dh_perl	
-	dh_installdocs		
+	dh_perl
+	dh_installdocs
 	dh_installexamples	t/*.t
 	chmod 644 $(CURDIR)/debian/tmp/usr/share/doc/$(PACKAGE)/examples/*t
 #	dh_installmenu
@@ -54,7 +54,7 @@
 #	dh_installcron
 #	dh_installmanpages
 #	dh_undocumented
-	dh_installchangelogs	
+	dh_installchangelogs
 	dh_compress --exclude=.t
 	dh_fixperms
 #	dh_suidregister
@@ -65,7 +65,7 @@
 	dh_md5sums
 	dh_builddeb
 
-source diff:                                                                  
+source diff:
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
 binary: binary-indep binary-arch