[Pkg-jed-commit] r1082 - in slang-slirp/trunk/debian: . patches

[Rafael Laboissiere]

Author: rafael
Date: 2008-03-19 01:48:49 +0000 (Wed, 19 Mar 2008)
New Revision: 1082

Added:
   slang-slirp/trunk/debian/patches/clean-slirp.ins.patch
   slang-slirp/trunk/debian/patches/function-deref.patch
Removed:
   slang-slirp/trunk/debian/patches/01_clean-slirp.ins.patch
   slang-slirp/trunk/debian/patches/02_function-deref.patch
Modified:
   slang-slirp/trunk/debian/changelog
   slang-slirp/trunk/debian/control
   slang-slirp/trunk/debian/rules
Log:
Switch to quilt

Modified: slang-slirp/trunk/debian/changelog
===================================================================
--- slang-slirp/trunk/debian/changelog	2008-03-19 00:14:13 UTC (rev 1081)
+++ slang-slirp/trunk/debian/changelog	2008-03-19 01:48:49 UTC (rev 1082)
@@ -1,5 +1,6 @@
-slang-slirp (1.9.3.1-3) UNRELEASED; urgency=low
+slang-slirp (1.9.4-1) UNRELEASED; urgency=low
 
+  * Switch to quilt from CDBS's simple-patchsys
   * debian/control: Append trunk/ to the path in Vcs-Svn:, such that
     debcheckout works
 

Modified: slang-slirp/trunk/debian/control
===================================================================
--- slang-slirp/trunk/debian/control	2008-03-19 00:14:13 UTC (rev 1081)
+++ slang-slirp/trunk/debian/control	2008-03-19 01:48:49 UTC (rev 1082)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian JED Group <pkg-jed-sl-modules at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at debian.org>
-Build-Depends: debhelper (>= 4.0.0), libslang2-dev, cdbs, gfortran
+Build-Depends: debhelper (>= 4.0.0), libslang2-dev, cdbs, gfortran, quilt
 Standards-Version: 3.7.3
 Homepage: http://space.mit.edu/cxc/software/slang/modules/slirp/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-jed/slang-slirp/trunk/

Deleted: slang-slirp/trunk/debian/patches/01_clean-slirp.ins.patch
===================================================================
--- slang-slirp/trunk/debian/patches/01_clean-slirp.ins.patch	2008-03-19 00:14:13 UTC (rev 1081)
+++ slang-slirp/trunk/debian/patches/01_clean-slirp.ins.patch	2008-03-19 01:48:49 UTC (rev 1082)
@@ -1,12 +0,0 @@
-diff -Nur slirp-1.9.3-1/Makefile.in slirp-1.9.3-1.new/Makefile.in
---- slirp-1.9.3-1/Makefile.in	2007-04-04 23:20:25.000000000 +0200
-+++ slirp-1.9.3-1.new/Makefile.in	2007-07-23 11:49:47.000000000 +0200
-@@ -196,7 +196,7 @@
- 	done
- 	-$(RM) slirputils.sl slirp builtins.sl Makefile intro.h \
- 		config.h config.log config.status unix.mf \
--		examples/Makefile.inc
-+		examples/Makefile.inc slirp.ins
- 
- test:
- 	@$(MAKE)

Deleted: slang-slirp/trunk/debian/patches/02_function-deref.patch
===================================================================
--- slang-slirp/trunk/debian/patches/02_function-deref.patch	2008-03-19 00:14:13 UTC (rev 1081)
+++ slang-slirp/trunk/debian/patches/02_function-deref.patch	2008-03-19 01:48:49 UTC (rev 1082)
@@ -1,11 +0,0 @@
---- slang-slirp-1.9.3.1.orig/slirputils.sl.in
-+++ slang-slirp-1.9.3.1/slirputils.sl.in
-@@ -918,7 +918,7 @@
- 
- define struct_map(type, struct_arr, field) % {{{
- {
--   !if (length(struct_arr)) return (@Array_Type)(type, 0);
-+   !if (length(struct_arr)) return @Array_Type(type, 0);
-    return array_map(type, &get_struct_field, struct_arr, field);
- } % }}}
- 

Copied: slang-slirp/trunk/debian/patches/clean-slirp.ins.patch (from rev 1081, slang-slirp/trunk/debian/patches/01_clean-slirp.ins.patch)
===================================================================
--- slang-slirp/trunk/debian/patches/clean-slirp.ins.patch	                        (rev 0)
+++ slang-slirp/trunk/debian/patches/clean-slirp.ins.patch	2008-03-19 01:48:49 UTC (rev 1082)
@@ -0,0 +1,12 @@
+diff -Nur slirp-1.9.3-1/Makefile.in slirp-1.9.3-1.new/Makefile.in
+--- slirp-1.9.3-1/Makefile.in	2007-04-04 23:20:25.000000000 +0200
++++ slirp-1.9.3-1.new/Makefile.in	2007-07-23 11:49:47.000000000 +0200
+@@ -196,7 +196,7 @@
+ 	done
+ 	-$(RM) slirputils.sl slirp builtins.sl Makefile intro.h \
+ 		config.h config.log config.status unix.mf \
+-		examples/Makefile.inc
++		examples/Makefile.inc slirp.ins
+ 
+ test:
+ 	@$(MAKE)

Copied: slang-slirp/trunk/debian/patches/function-deref.patch (from rev 1081, slang-slirp/trunk/debian/patches/02_function-deref.patch)
===================================================================
--- slang-slirp/trunk/debian/patches/function-deref.patch	                        (rev 0)
+++ slang-slirp/trunk/debian/patches/function-deref.patch	2008-03-19 01:48:49 UTC (rev 1082)
@@ -0,0 +1,11 @@
+--- slang-slirp-1.9.3.1.orig/slirputils.sl.in
++++ slang-slirp-1.9.3.1/slirputils.sl.in
+@@ -918,7 +918,7 @@
+ 
+ define struct_map(type, struct_arr, field) % {{{
+ {
+-   !if (length(struct_arr)) return (@Array_Type)(type, 0);
++   !if (length(struct_arr)) return @Array_Type(type, 0);
+    return array_map(type, &get_struct_field, struct_arr, field);
+ } % }}}
+ 

Modified: slang-slirp/trunk/debian/rules
===================================================================
--- slang-slirp/trunk/debian/rules	2008-03-19 00:14:13 UTC (rev 1081)
+++ slang-slirp/trunk/debian/rules	2008-03-19 01:48:49 UTC (rev 1082)
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_SCRIPT_ENV += CFLAGS="-fPIC -g -Wall -O2" FCFLAGS="-fPIC -g -O2"