r12067 - in packages/trunk/openyahtzee/debian: . patches

[Paul Wise]

Author: pabs
Date: 2011-04-01 12:59:58 +0000 (Fri, 01 Apr 2011)
New Revision: 12067

Added:
   packages/trunk/openyahtzee/debian/patches/
   packages/trunk/openyahtzee/debian/patches/fix-ftbfs-with-new-gcc.patch
   packages/trunk/openyahtzee/debian/patches/series
Modified:
   packages/trunk/openyahtzee/debian/changelog
Log:
Add a patch to fix FTBFS with new GCC (Closes: #565080)

Modified: packages/trunk/openyahtzee/debian/changelog
===================================================================
--- packages/trunk/openyahtzee/debian/changelog	2011-04-01 12:42:52 UTC (rev 12066)
+++ packages/trunk/openyahtzee/debian/changelog	2011-04-01 12:59:58 UTC (rev 12067)
@@ -12,6 +12,7 @@
   * Drop unneeded comments from the manual page
   * Wrap Debian menu file one item per line
   * Switch to dpkg-source v3
+  * Add a patch to fix FTBFS with new GCC (Closes: #565080)
 
  -- Barry deFreese <bdefreese at debian.org>  Tue, 04 Nov 2008 12:03:57 -0500
 

Added: packages/trunk/openyahtzee/debian/patches/fix-ftbfs-with-new-gcc.patch
===================================================================
--- packages/trunk/openyahtzee/debian/patches/fix-ftbfs-with-new-gcc.patch	                        (rev 0)
+++ packages/trunk/openyahtzee/debian/patches/fix-ftbfs-with-new-gcc.patch	2011-04-01 12:59:58 UTC (rev 12067)
@@ -0,0 +1,51 @@
+Author: Paul Wise <pabs at debian.org>
+Description: Fix FTBFS with newer GCC
+Bug-Debian: http://bugs.debian.org/565080
+--- a/src/DBwrapper.cpp
++++ b/src/DBwrapper.cpp
+@@ -96,7 +96,7 @@
+ 		cerr << "sqlite3_compile error:" <<endl;
+ 		cerr << sqlite3_errmsg( m_db ) <<endl;
+ 		cerr << "on insert: " << query <<endl;
+-		values = list<string>::list();
++		values = list<string>();
+ 	} else {
+ 		int busyCnt = 0;
+ 		int number = sqlite3_column_count( stmt );
+@@ -138,7 +138,7 @@
+ 			cerr <<  "sqlite_step error.\n";
+ 			cerr << sqlite3_errmsg( m_db ) << endl;
+ 			cerr << "on query: " << query << endl;
+-			values = list<string>::list();
++			values = list<string>();
+         }
+     }
+ 
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -42,4 +42,4 @@
+ 	openyahtzee.rc
+ 
+ AM_CXXFLAGS = @WX_CXXFLAGS@
+-openyahtzee_LDFLAGS = @WX_LIBS@
++openyahtzee_LDADD = @WX_LIBS@ -ldl
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -54,7 +54,7 @@
+ openyahtzee_OBJECTS = $(am_openyahtzee_OBJECTS)
+ openyahtzee_LDADD = $(LDADD)
+ openyahtzee_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
+-	$(openyahtzee_LDFLAGS) $(LDFLAGS) -o $@
++	$(openyahtzee_LDADD) $(LDFLAGS) -o $@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -211,7 +211,7 @@
+ 	openyahtzee.rc
+ 
+ AM_CXXFLAGS = @WX_CXXFLAGS@
+-openyahtzee_LDFLAGS = @WX_LIBS@
++openyahtzee_LDADD = @WX_LIBS@ -ldl
+ all: all-am
+ 
+ .SUFFIXES:

Added: packages/trunk/openyahtzee/debian/patches/series
===================================================================
--- packages/trunk/openyahtzee/debian/patches/series	                        (rev 0)
+++ packages/trunk/openyahtzee/debian/patches/series	2011-04-01 12:59:58 UTC (rev 12067)
@@ -0,0 +1 @@
+fix-ftbfs-with-new-gcc.patch