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

[Rafael Laboissiere]

Author: rafael
Date: 2006-08-15 20:05:08 +0000 (Tue, 15 Aug 2006)
New Revision: 369

Removed:
   slang-slirp/trunk/debian/patches/pointer-int-cast.patch
Modified:
   slang-slirp/trunk/debian/changelog
   slang-slirp/trunk/debian/rules
   slang-slirp/trunk/debian/watch
Log:
Debian release slang-slirp_1.9.0-1-1

Modified: slang-slirp/trunk/debian/changelog
===================================================================
--- slang-slirp/trunk/debian/changelog	2006-08-15 19:57:22 UTC (rev 368)
+++ slang-slirp/trunk/debian/changelog	2006-08-15 20:05:08 UTC (rev 369)
@@ -1,3 +1,17 @@
+slang-slirp (1.9.0-1-1) unstable; urgency=low
+
+  * New upstream release
+  * Install file CHANGELOG as the upstream changelog
+  * debian/rules:
+    - Cleanup examples directories before inclusion in the binary package
+    - Clean ignored.txt files left by make check
+  * debian/patches/pointer-int-cast.patch: Removed this patch, which has
+    been applied upstream
+  * debian/watch: Updated regular expression for allowing hyphen in
+    upstream version numbers
+
+ -- Rafael Laboissiere <rafael at debian.org>  Tue, 15 Aug 2006 19:30:55 +0200
+
 slang-slirp (1.7.9-2) unstable; urgency=low
 
   * debian/patches/pointer-int-cast.patch: Added patch as suggested by the

Deleted: slang-slirp/trunk/debian/patches/pointer-int-cast.patch
===================================================================
--- slang-slirp/trunk/debian/patches/pointer-int-cast.patch	2006-08-15 19:57:22 UTC (rev 368)
+++ slang-slirp/trunk/debian/patches/pointer-int-cast.patch	2006-08-15 20:05:08 UTC (rev 369)
@@ -1,16 +0,0 @@
-diff -Nur slirp-1.7.9/refs.c slirp-1.7.9.new/refs.c
---- slirp-1.7.9/refs.c	2006-06-09 00:30:34.455413000 +0200
-+++ slirp-1.7.9.new/refs.c	2006-06-09 00:32:02.511855888 +0200
-@@ -84,9 +84,10 @@
- 
- static unsigned int  ref_get_size(Slirp_Ref *sref, int which_dimension)
- {
--   /* Trick: avoid strict compiler warnings if this func winds up unused */
--   unsigned int size = (unsigned int)&ref_get_size;
-+   unsigned int size;
- 
-+   if (0) (void) &ref_get_size; /* avoid compiler warnings if unused */
-+   
-    /* Slirp_Ref encapsulates arrays, S-Lang refs, and S-Lang mmt types,   */
-    /* the latter two of which are considered to point to a single object  */
- 

Modified: slang-slirp/trunk/debian/rules
===================================================================
--- slang-slirp/trunk/debian/rules	2006-08-15 19:57:22 UTC (rev 368)
+++ slang-slirp/trunk/debian/rules	2006-08-15 20:05:08 UTC (rev 369)
@@ -8,9 +8,18 @@
 DEB_MAKE_INSTALL_TARGET := install RPATH= DESTDIR=$(DEB_DESTDIR)
 DEB_MAKE_CHECK_TARGET := test
 
+DEB_INSTALL_CHANGELOGS_ALL = CHANGELOG
+
+debexp := $(CURDIR)/debian/examples
+
 build/slang-slirp::
 	cp -a examples debian
-	rm -f debian/examples/stubs/test.ref
+	rm -f $(debexp)/stubs/test.ref
+	find $(debexp) -name ignored.txt | xargs rm -f
+	for d in $(shell ls $(debexp)) ; do		\
+		$(MAKE) -C $(debexp)/$$d distclean ;	\
+	done
 
 clean::
-	rm -rf debian/examples
\ No newline at end of file
+	rm -rf $(debexp)
+	find examples -name ignored.txt | xargs rm -f

Modified: slang-slirp/trunk/debian/watch
===================================================================
--- slang-slirp/trunk/debian/watch	2006-08-15 19:57:22 UTC (rev 368)
+++ slang-slirp/trunk/debian/watch	2006-08-15 20:05:08 UTC (rev 369)
@@ -1,4 +1,2 @@
 version=3
-
-opts="uversionmangle=s/-/./" \
-  ftp://space.mit.edu/pub/mnoble/slirp/slirp-([\d.-]*)\.tar.gz
+ftp://space.mit.edu/pub/mnoble/slirp/slirp-([\d.-]*)\.tar.gz