r12093 - in packages/trunk/netrek-client-cow/debian: . patches

[Peter Pentchev]

Author: roam-guest
Date: 2011-04-08 13:15:02 +0000 (Fri, 08 Apr 2011)
New Revision: 12093

Added:
   packages/trunk/netrek-client-cow/debian/patches/001-configure-gmp-version.patch
Modified:
   packages/trunk/netrek-client-cow/debian/changelog
   packages/trunk/netrek-client-cow/debian/patches/series
   packages/trunk/netrek-client-cow/debian/rules
Log:
Fix the FTBFS by properly checking for libgmp > 1.

Closes:		#620528
Reported by:	Cyril Brulebois <kibi at debian.org>


Modified: packages/trunk/netrek-client-cow/debian/changelog
===================================================================
--- packages/trunk/netrek-client-cow/debian/changelog	2011-04-06 08:19:03 UTC (rev 12092)
+++ packages/trunk/netrek-client-cow/debian/changelog	2011-04-08 13:15:02 UTC (rev 12093)
@@ -1,12 +1,21 @@
 netrek-client-cow (3.3.0-2) UNRELEASED; urgency=low
 
+  * Team upload.
+
+  [ Barry deFreese ]
   * Some packaging changes suggested by upstream.
     + Update package description.
     + Update debian/netrek-client-cow.6.
   * Bump Standards Version to 3.8.3. (No changes needed).
 
- -- Barry deFreese <bdefreese at debian.org>  Wed, 02 Sep 2009 11:34:58 -0400
+  [ Peter Pentchev ]
+  * Add the 001-configure-gmp-version patch to fix the check for
+    libgmp versions larger than 1.  Closes: #620528
+    - to accomplish this, move the "quilt push" snippet before
+      the configure script invocation
 
+ -- Peter Pentchev <roam at ringlet.net>  Fri, 08 Apr 2011 16:06:48 +0300
+
 netrek-client-cow (3.3.0-1) unstable; urgency=low
 
   [ Barry deFreese ]

Added: packages/trunk/netrek-client-cow/debian/patches/001-configure-gmp-version.patch
===================================================================
--- packages/trunk/netrek-client-cow/debian/patches/001-configure-gmp-version.patch	                        (rev 0)
+++ packages/trunk/netrek-client-cow/debian/patches/001-configure-gmp-version.patch	2011-04-08 13:15:02 UTC (rev 12093)
@@ -0,0 +1,19 @@
+Description: Recognize GMP versions other than 1.
+Bug-Debian: http://bugs.debian.org/620528
+Forwarded: no
+Author: Peter Pentchev <roam at ringlet.net>
+Last-Update: 2011-04-08
+
+Index: b/configure
+===================================================================
+--- a/configure
++++ b/configure
+@@ -7194,7 +7194,7 @@
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP ""gmp=.*2"" >/dev/null 2>&1; then
++  $EGREP ""gmp=.*[02-9]"" >/dev/null 2>&1; then
+   cat >>confdefs.h <<\_ACEOF
+ #define HAVE_GMP2_H 1
+ _ACEOF

Modified: packages/trunk/netrek-client-cow/debian/patches/series
===================================================================
--- packages/trunk/netrek-client-cow/debian/patches/series	2011-04-06 08:19:03 UTC (rev 12092)
+++ packages/trunk/netrek-client-cow/debian/patches/series	2011-04-08 13:15:02 UTC (rev 12093)
@@ -1 +1 @@
-#No current patches.
+001-configure-gmp-version.patch

Modified: packages/trunk/netrek-client-cow/debian/rules
===================================================================
--- packages/trunk/netrek-client-cow/debian/rules	2011-04-06 08:19:03 UTC (rev 12092)
+++ packages/trunk/netrek-client-cow/debian/rules	2011-04-08 13:15:02 UTC (rev 12093)
@@ -18,6 +18,7 @@
 
 config.status: configure
 	dh_testdir
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	# Add here commands to configure the package.
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
@@ -38,7 +39,6 @@
 
 build-stamp:  config.status 
 	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 
 	# Add here commands to compile the package.
 	$(MAKE)