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

Sun Apr 20 10:42:58 UTC 2008

Author: rafael
Date: 2008-04-20 10:42:58 +0000 (Sun, 20 Apr 2008)
New Revision: 1096

Removed:
   slang-slirp/trunk/debian/patches/minus-sign-manpage.patch
   slang-slirp/trunk/debian/patches/series
Modified:
   slang-slirp/trunk/debian/changelog
   slang-slirp/trunk/debian/control
   slang-slirp/trunk/debian/rules
Log:
Restore to version 1.9.4-1

Modified: slang-slirp/trunk/debian/changelog
===================================================================

--- slang-slirp/trunk/debian/changelog	2008-04-20 10:33:31 UTC (rev 1095)
+++ slang-slirp/trunk/debian/changelog	2008-04-20 10:42:58 UTC (rev 1096)
@@ -1,15 +1,10 @@
-slang-slirp (1.9.4-1) UNRELEASED; urgency=low
+slang-slirp (1.9.4-1) unstable; urgency=low
 
-  * New upstream release.
-  * debian/patches/{clean-slirp.ins,minus-sign-manpage}.patch: Drop patches
-    (applied upstrea) 
-  * debian/patches/minus-sign-manpage.patch: Add patch for escaping "-"
-    signs that mean the "minus" character
-  * Switch to quilt from CDBS's simple-patchsys
-  * debian/control: Append trunk/ to the path in Vcs-Svn:, such that
-    debcheckout works
+  * New upstream release
+  * Dropped patches 01_clean-slirp.ins.patch and 02_function-deref.patch
+    (applied upstream)
 
- -- Rafael Laboissiere <rafael at debian.org>  Wed, 19 Mar 2008 02:50:29 +0100
+ -- Rafael Laboissiere <rafael at debian.org>  Thu, 31 Jan 2008 04:31:28 +0100
 
 slang-slirp (1.9.3.1-2) unstable; urgency=low
 

Modified: slang-slirp/trunk/debian/control
===================================================================
--- slang-slirp/trunk/debian/control	2008-04-20 10:33:31 UTC (rev 1095)
+++ slang-slirp/trunk/debian/control	2008-04-20 10:42:58 UTC (rev 1096)
@@ -3,10 +3,10 @@
 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, quilt
+Build-Depends: debhelper (>= 4.0.0), libslang2-dev, cdbs, gfortran
 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/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-jed/slang-slirp/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-jed/slang-slirp/
 
 Package: slang-slirp

Deleted: slang-slirp/trunk/debian/patches/minus-sign-manpage.patch
===================================================================
--- slang-slirp/trunk/debian/patches/minus-sign-manpage.patch	2008-04-20 10:33:31 UTC (rev 1095)
+++ slang-slirp/trunk/debian/patches/minus-sign-manpage.patch	2008-04-20 10:42:58 UTC (rev 1096)
@@ -1,175 +0,0 @@
-Index: slang-slirp-1.9.4/doc/man/man1/slirp.1
-===================================================================
---- slang-slirp-1.9.4.orig/doc/man/man1/slirp.1	2008-03-19 02:39:26.000000000 +0100
-+++ slang-slirp-1.9.4/doc/man/man1/slirp.1	2008-03-19 02:44:09.000000000 +0100
-@@ -28,131 +28,131 @@
- S-Lang whatsoever.
- .SH "OPTIONS"
- .TP
--\fB-c++\fR
-+\fB\-c++\fR
- Mandate that input headers be interpreted as C++, which can
- be helpful to coerce the interpretation of files
- that either lack a .hh suffix or do not contain class
- definitions or other explicit C++ syntax.
- .TP
--\fB-cfront\fR
-+\fB\-cfront\fR
- Generate standalone C wrappers (.cc and .h files),
- instead of S-Lang bindings, for C++ interface
- .TP
--\fB-const_strings\fR
-+\fB\-const_strings\fR
- Treat 'char*' return values as 'const char*'
- .TP
--\fB-d\fR
-+\fB\-d\fR
- Include slirp_debug_pause() debugging stub within module
- .TP
--\fB-debug\fR
-+\fB\-debug\fR
- Run in interactive SLDB debugger (S-Lang 2 only)
- .TP
--\fB-fortran_strlen <i>\fR
-+\fB\-fortran_strlen <i>\fR
- Indicate where hidden string len args are placed in
- wrappers of Fortran calls accepting CHARACTER args
- (0 = append length args to end of arg list [default]
- 1 = insert length args directly after CHARACTER arg)
- .TP
--\fB-g\fR
-+\fB\-g\fR
- Emit debugging output
- .TP
--\fB-fprefix <pref>\fR
-+\fB\-fprefix <pref>\fR
- Emit code only for functions which begin with an
- exact match to <pref>, instead of default regexp
- .TP
--\fB-h -help --help\fR
-+\fB\-h \-help \-\-help\fR
- This message
- .TP
--\fB-ignore <option>\fR
-+\fB\-ignore <option>\fR
- Tune the emission of ignored symbol messages: use 'notrunc'
- to append to existing ignored symbol list (default: the
- ignored symbol list is truncated at startup), or specify an
- alternate output file name (default: ./ignored.txt)
- .TP
--\fB-I  <dir>\fR
-+\fB-\I  <dir>\fR
- Add <dir> to search path for headers during code
--generation; will also be reflected in -make output
-+generation; will also be reflected in \-make output
- .TP
--\fB-L  <dir>\fR
-+\fB\-L  <dir>\fR
- Add <dir> to search path at link time; for -make
- .TP
--\fB-l  <lib>\fR
-+\fB\-l  <lib>\fR
- Add <lib> to library list at link time; for -make
- .TP
--\fB-ldflags <flags>\fR
--Use when -L or -l are inappropriate; for -make
-+\fB\-ldflags <flags>\fR
-+Use when \-L or \-l are inappropriate; for -make
- .TP
--\fB-m  <name>\fR
-+\fB\-m  <name>\fR
- Override default module name with <name>
- .TP
--\fB-make\fR
-+\fB\-make\fR
- Generate a best-effort Makefile for compiling module
--(-make is also implied by -L, -l, and -ldflags)
-+(\-make is also implied by -\L, -\l, and -\ldflags)
- .TP
--\fB-mapnames <R> <S>\fR
--Synonym for -rename (deprecated)
-+\fB\-mapnames <R> <S>\fR
-+Synonym for \-rename (deprecated)
- .TP
--\fB-noinit\fR
-+\fB\-noinit\fR
- Do not generate an initialization fragment
- .TP
--\fB-nopop\fR
-+\fB\-nopop\fR
- Avoid explicit pop of func arguments, if possible
- (also turns off generation of Usage: statements)
- .TP
--\fB-noautotype\fR
-+\fB\-noautotype\fR
- Disable mapping of unknown types to opaque ptr types
- .TP
--\fB-otree\fR
-+\fB\-otree\fR
- Print hierarchical listing of all opaque types
- defined by the current invocation, then exit
- .TP
- \fB-openmp\fR
- Emit OpenMP #pragmas to parallelize vectorized code
--(implies -vec, i.e. turns on vectorization)
-+(implies \-vec, i.e. turns on vectorization)
- .TP
--\fB-print\fR
-+\fB\-print\fR
- Print interface for code which would be generated,
- but don't actually generate any code
- .TP
--\fB-rc  <file>\fR
-+\fB\-rc  <file>\fR
- Load customizations from <file>, rather than from
- first of ./slirprc or $SLIRPRC
- .TP
--\fB-refscalars\fR
-+\fB\-refscalars\fR
- Support passing scalars as array/ref arguments
- (default: on for Fortran bindings, off for C/C++)
- .TP
--\fB-rename  <R> <S>\fR
-+\fB\-rename  <R> <S>\fR
- Map C functions with prefixes matching the S-Lang
- regexp R to S-Lang functions beginning with string S
- (set S=NULL to map regexp prefix to empty string)
- .TP
--\fB-stdout\fR
-+\fB\-stdout\fR
- Emit code to stdout, instead of files
- .TP
--\fB-stubs\fR
-+\fB\-stubs\fR
- Generate stub (empty) implementations for input
- header files, allowing the module interface to be
- exercised without linking in the underlying library
- or any of its dependencies
- .TP
--\fB-tmapout <file>\fR
-+\fB\-tmapout <file>\fR
- Save a copy of the active typemap table to <file>
- .TP
--\fB-tmapin  <file>\fR
-+\fB\-tmapin  <file>\fR
- evalfile() additional typemaps from <file>
- .TP
--\fB-vec\fR
-+\fB\-vec\fR
- Attempt to vectorize every function within input interface
- .TP
--\fB--version\fR
-+\fB\-\-version\fR
- Output version information
- .TP
--\fB-v\fR
-+\fB\-v\fR
- Show verbose loading messages
- .TP
--\fB-vh -vhelp, --vhelp\fR
--Verbose help (normal --help output, plus rarely used options)
-+\fB\-vh \-vhelp, \-\-vhelp\fR
-+Verbose help (normal \-\-help output, plus rarely used options)
- .SH "AUTHOR"
- .PP
- The author of SLIRP is Michael S. Noble <mnoble at space.mit.edu>\&.

Deleted: slang-slirp/trunk/debian/patches/series
===================================================================
--- slang-slirp/trunk/debian/patches/series	2008-04-20 10:33:31 UTC (rev 1095)
+++ slang-slirp/trunk/debian/patches/series	2008-04-20 10:42:58 UTC (rev 1096)
@@ -1 +0,0 @@
-minus-sign-manpage.patch

Modified: slang-slirp/trunk/debian/rules
===================================================================
--- slang-slirp/trunk/debian/rules	2008-04-20 10:33:31 UTC (rev 1095)
+++ slang-slirp/trunk/debian/rules	2008-04-20 10:42:58 UTC (rev 1096)
@@ -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/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_CONFIGURE_SCRIPT_ENV += CFLAGS="-fPIC -g -Wall -O2" FCFLAGS="-fPIC -g -O2"
 


