[Pkg-voip-commits] r3087 - in srtp/trunk/debian: . patches

[Jonas Smedegaard]

Author: js
Date: 2007-01-30 00:02:57 +0100 (Tue, 30 Jan 2007)
New Revision: 3087

Added:
   srtp/trunk/debian/patches/1001_negative_valued_char_must_be_signed.patch
   srtp/trunk/debian/patches/README
   srtp/trunk/debian/patches/series
Removed:
   srtp/trunk/debian/patches/00list
   srtp/trunk/debian/patches/13_config.dpatch
Modified:
   srtp/trunk/debian/rules
Log:
Switch from dpatch to quilt. Drop config patch handled automagically by CDBS. Add patch to fix 'comparison is always' errors with tests.

Deleted: srtp/trunk/debian/patches/00list
===================================================================
--- srtp/trunk/debian/patches/00list	2007-01-29 21:03:24 UTC (rev 3086)
+++ srtp/trunk/debian/patches/00list	2007-01-29 23:02:57 UTC (rev 3087)
@@ -1 +0,0 @@
-13_config.dpatch

Added: srtp/trunk/debian/patches/1001_negative_valued_char_must_be_signed.patch
===================================================================
--- srtp/trunk/debian/patches/1001_negative_valued_char_must_be_signed.patch	2007-01-29 21:03:24 UTC (rev 3086)
+++ srtp/trunk/debian/patches/1001_negative_valued_char_must_be_signed.patch	2007-01-29 23:02:57 UTC (rev 3087)
@@ -0,0 +1,22 @@
+--- srtp-1.4.2.dfsg.orig/test/srtp_driver.c
++++ srtp-1.4.2.dfsg/test/srtp_driver.c
+@@ -138,7 +138,7 @@
+ 
+ int
+ main (int argc, char *argv[]) {
+-  char q;
++  signed char q;
+   unsigned do_timing_test    = 0;
+   unsigned do_rejection_test = 0;
+   unsigned do_codec_timing   = 0;
+--- srtp-1.4.2.dfsg.orig/test/rdbx_driver.c
++++ srtp-1.4.2.dfsg/test/rdbx_driver.c
+@@ -70,7 +70,7 @@
+ main (int argc, char *argv[]) {
+   double rate;
+   err_status_t status;
+-  char q;
++  signed char q;
+   unsigned do_timing_test = 0;
+   unsigned do_validation = 0;
+ 

Deleted: srtp/trunk/debian/patches/13_config.dpatch
===================================================================
--- srtp/trunk/debian/patches/13_config.dpatch	2007-01-29 21:03:24 UTC (rev 3086)
+++ srtp/trunk/debian/patches/13_config.dpatch	2007-01-29 23:02:57 UTC (rev 3087)
@@ -1,30 +0,0 @@
-#! /bin/sh -e
-## config.dpatch by Ralf Treinen <treinen at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: replace all config.{guess,sub} by the vesion installed in
-## DP: /usr/share/misc
-
-if [ $# -lt 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-       -patch)	find . -name config.guess -o -name config.sub \
-	 		| tar cf debian/patched/config.guess+sub.tar -T -;
-		find . -name config.guess \
-			-exec ln -sf /usr/share/misc/config.guess '{}' \; ;
-		find . -name config.sub \
-			-exec ln -sf /usr/share/misc/config.sub '{}' \; ;;
-		
-       -unpatch) tar xf debian/patched/config.guess+sub.tar;;
-
-        *)
-                echo >&2 \
-		  "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
-# arch-tag: 8a610a57-687b-4395-8ff2-79265c0a4eb3

Added: srtp/trunk/debian/patches/README
===================================================================
--- srtp/trunk/debian/patches/README	2007-01-29 21:03:24 UTC (rev 3086)
+++ srtp/trunk/debian/patches/README	2007-01-29 23:02:57 UTC (rev 3087)
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.

Copied: srtp/trunk/debian/patches/series (from rev 3074, srtp/trunk/debian/patches/00list)
===================================================================
--- srtp/trunk/debian/patches/00list	2007-01-28 00:01:18 UTC (rev 3074)
+++ srtp/trunk/debian/patches/series	2007-01-29 23:02:57 UTC (rev 3087)
@@ -0,0 +1 @@
+1001_negative_valued_char_must_be_signed.patch

Modified: srtp/trunk/debian/rules
===================================================================
--- srtp/trunk/debian/rules	2007-01-29 21:03:24 UTC (rev 3086)
+++ srtp/trunk/debian/rules	2007-01-29 23:02:57 UTC (rev 3087)
@@ -4,7 +4,7 @@
 include debian/cdbs/1/rules/buildcore.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include debian/cdbs/1/rules/copyright-check.mk
 include debian/cdbs/1/rules/buildinfo.mk
 
@@ -15,6 +15,8 @@
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-debug
 endif
 
+DEB_MAKE_BUILD_TARGET = librstp.a libsrtpdoc
+
 DEB_MAKE_CLEAN_TARGET = superclean
 
 
@@ -54,14 +56,13 @@
 	@@mkdir -p ../tarballs
 	@@echo Downloading $(FILENAME) from $(URL) ...
 	@@wget -N -nv -T10 -t3 -O ../tarballs/$(FILENAME) $(URL)
-	@@echo Removing non dfsg compliant parts out of it
+	@@echo Stripping non-DFSG files, prebuilt PDF file, and CVS noise
 	@@mkdir -p ../tarballs/dfsg
 	@@tar -xzf ../tarballs/$(FILENAME) -C ../tarballs/dfsg
-	@@rm -r ../tarballs/dfsg/$(SRCDIR)/doc/rfc3711.txt
-	@@echo Fixing the tar warning
 	@@find ../tarballs/dfsg/$(SRCDIR) -type d -name CVS -exec rm -rf '{}' ';'
 	@@find ../tarballs/dfsg/$(SRCDIR) -type f -name .cvsignore -exec rm -f '{}' ';'
-	@@echo Building the dfsg tarball
+	@@find ../tarballs/dfsg/$(SRCDIR) -type f -wholename '**/doc/draft*.txt' -or -wholename '**/doc/rfc*.txt' -or -wholename '**/doc/*.pdf' -exec rm -f '{}' ';'
+	@@echo Building new tarball
 	@@GZIP=-9 tar -b1 -czf ../tarballs/$(DFSGNAME) -C ../tarballs/dfsg $(SRCDIR)
 	@@echo Cleaning up
 	@@rm -rf ../tarballs/dfsg