r9356 - in packages/trunk/xmahjongg/debian: . patches

[Peter Pentchev]

Author: roam-guest
Date: 2009-04-02 13:40:43 +0000 (Thu, 02 Apr 2009)
New Revision: 9356

Added:
   packages/trunk/xmahjongg/debian/patches/03-compiler-warnings.patch
Modified:
   packages/trunk/xmahjongg/debian/changelog
   packages/trunk/xmahjongg/debian/patches/series
   packages/trunk/xmahjongg/debian/rules
Log:
Make the configure script work even with the -Werror flag.


Modified: packages/trunk/xmahjongg/debian/changelog
===================================================================
--- packages/trunk/xmahjongg/debian/changelog	2009-04-02 12:56:36 UTC (rev 9355)
+++ packages/trunk/xmahjongg/debian/changelog	2009-04-02 13:40:43 UTC (rev 9356)
@@ -26,6 +26,8 @@
   * Convert the copyright file to the machine-parseable format and
     actually list all the relevant files' licenses there.
   * Build with -Werror if "werror" is specified in DEB_BUILD_OPTIONS.
+  * Make the configure script produce the same result with or without
+    the -Werror flag at the warnings level used.
 
  -- Peter Pentchev <roam at ringlet.net>  Tue, 31 Mar 2009 17:19:37 +0300
 

Added: packages/trunk/xmahjongg/debian/patches/03-compiler-warnings.patch
===================================================================
--- packages/trunk/xmahjongg/debian/patches/03-compiler-warnings.patch	                        (rev 0)
+++ packages/trunk/xmahjongg/debian/patches/03-compiler-warnings.patch	2009-04-02 13:40:43 UTC (rev 9356)
@@ -0,0 +1,22 @@
+Make the configure script produce the same result with or without -Werror.
+
+--- a/configure
++++ b/configure
+@@ -6193,7 +6193,8 @@
+ int
+ main ()
+ {
+-gettimeofday((void *)0, (void *)0);
++struct timeval tv;
++gettimeofday(&tv, (void *)0);
+   ;
+   return 0;
+ }
+@@ -8267,6 +8268,7 @@
+ 
+   int a;
+   int *b = new(&a) int;
++  a = *b;
+   return 0;
+ 
+   ;

Modified: packages/trunk/xmahjongg/debian/patches/series
===================================================================
--- packages/trunk/xmahjongg/debian/patches/series	2009-04-02 12:56:36 UTC (rev 9355)
+++ packages/trunk/xmahjongg/debian/patches/series	2009-04-02 13:40:43 UTC (rev 9356)
@@ -1,2 +1,3 @@
 01-autotools.patch
 02-manpage-typo.patch
+03-compiler-warnings.patch

Modified: packages/trunk/xmahjongg/debian/rules
===================================================================
--- packages/trunk/xmahjongg/debian/rules	2009-04-02 12:56:36 UTC (rev 9355)
+++ packages/trunk/xmahjongg/debian/rules	2009-04-02 13:40:43 UTC (rev 9356)
@@ -22,7 +22,7 @@
 override_dh_auto_configure:	${QUILT_STAMPFN}
 	./configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/share/games
 	# Avoid rebuilding config.h.in
-	touch config.h.in
+	touch config.h.in && touch configure
 
 override_dh_auto_clean:
 	dh_auto_clean