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

[Rafael Laboissiere]

Author: rafael
Date: 2005-02-09 15:12:41 +0100 (Wed, 09 Feb 2005)
New Revision: 28

Added:
   trunk/packages/matwrap/debian/patches/
   trunk/packages/matwrap/debian/patches/00list
   trunk/packages/matwrap/debian/patches/50_namespace-std-for-string.dpatch
Modified:
   trunk/packages/matwrap/debian/changelog
   trunk/packages/matwrap/debian/control
   trunk/packages/matwrap/debian/rules
Log:
Started using dpatch for fix std namespace problem in wrapper generator.


Modified: trunk/packages/matwrap/debian/changelog
===================================================================
--- trunk/packages/matwrap/debian/changelog	2005-02-09 13:33:51 UTC (rev 27)
+++ trunk/packages/matwrap/debian/changelog	2005-02-09 14:12:41 UTC (rev 28)
@@ -8,10 +8,16 @@
   * debian/control:
     - Set maintainer Debian Octave Group @ alioth.debian.org
     - Bumped Standards-Version to 3.6.1
-  * debian/rules: Remove debian/matwrap.1 in target clean, such that is
-    does not end in the diff.gz file
+    - Build-Depends on dpatch
+  * debian/rules:
+    - Removed debian/matwrap.1 in target clean, such that is does not end
+      in the diff.gz file
+    - Adjusted for use of dpatch
+  * debian/patches: Added directory with patch for changing "string" into
+    "std::string" in share/matwrap/wrap_octave.pl. This is necessary with
+    modern g++ compilers (patch file: 50_namespace-std-for-string.dpatch).
 
- -- Debian Octave Group <pkg-octave-devel@lists.alioth.debian.org>  Wed,  9 Feb 2005 14:30:34 +0100
+ -- Debian Octave Group <pkg-octave-devel@lists.alioth.debian.org>  Wed,  9 Feb 2005 15:08:11 +0100
 
 matwrap (0.57-3) unstable; urgency=low
 

Modified: trunk/packages/matwrap/debian/control
===================================================================
--- trunk/packages/matwrap/debian/control	2005-02-09 13:33:51 UTC (rev 27)
+++ trunk/packages/matwrap/debian/control	2005-02-09 14:12:41 UTC (rev 28)
@@ -2,7 +2,7 @@
 Section: math
 Priority: optional
 Maintainer: Debian Octave Group <pkg-octave-devel@lists.alioth.debian.org>
-Build-Depends-Indep: debhelper (>= 3.0.0)
+Build-Depends-Indep: debhelper (>= 3.0.0), dpatch
 Standards-Version: 3.6.1
 
 Package: matwrap

Added: trunk/packages/matwrap/debian/patches/00list
===================================================================
--- trunk/packages/matwrap/debian/patches/00list	2005-02-09 13:33:51 UTC (rev 27)
+++ trunk/packages/matwrap/debian/patches/00list	2005-02-09 14:12:41 UTC (rev 28)
@@ -0,0 +1 @@
+50_namespace-std-for-string

Added: trunk/packages/matwrap/debian/patches/50_namespace-std-for-string.dpatch
===================================================================
--- trunk/packages/matwrap/debian/patches/50_namespace-std-for-string.dpatch	2005-02-09 13:33:51 UTC (rev 27)
+++ trunk/packages/matwrap/debian/patches/50_namespace-std-for-string.dpatch	2005-02-09 14:12:41 UTC (rev 28)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_namespace-std-for-string.dpatch by  <root@laboiss2.intra.mpipf-muenchen.mpg.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: New patch generated from matwrap 0.57-4 diff.gz
+
+@DPATCH@
+
+--- 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");


Property changes on: trunk/packages/matwrap/debian/patches/50_namespace-std-for-string.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/matwrap/debian/rules
===================================================================
--- trunk/packages/matwrap/debian/rules	2005-02-09 13:33:51 UTC (rev 27)
+++ trunk/packages/matwrap/debian/rules	2005-02-09 14:12:41 UTC (rev 28)
@@ -3,26 +3,28 @@
 # debian/rules file for the Debian/GNU Linux matwrap package
 # Copyright 1999 - 2002 by Dirk Eddelbuettel <edd@debian.org>
 
-package	= matwrap
+PACKAGE	= matwrap
 debtmp	:= $(shell pwd)/debian/tmp/usr
 
+include /usr/share/dpatch/dpatch.make
+
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
 build: build-stamp
-build-stamp:
+build-stamp: patch-stamp
 	dh_testdir
 	#$(MAKE)
-	pod2man share/$(package)/$(package).pod > debian/$(package).1
+	pod2man share/$(PACKAGE)/$(PACKAGE).pod > debian/$(PACKAGE).1
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
 	#-$(MAKE) clean
 	#-$(MAKE) distclean
-	rm -f debian/$(package).1
+	rm -f debian/$(PACKAGE).1
 	dh_clean
 
 install: build