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

[Paul Wise]

Author: pabs
Date: 2011-04-01 13:48:38 +0000 (Fri, 01 Apr 2011)
New Revision: 12072

Added:
   packages/trunk/openyahtzee/debian/patches/use-system-sqlite3.patch
Modified:
   packages/trunk/openyahtzee/debian/changelog
   packages/trunk/openyahtzee/debian/patches/series
   packages/trunk/openyahtzee/debian/rules
Log:
Remove new embedded code copy of sqlite3

Modified: packages/trunk/openyahtzee/debian/changelog
===================================================================
--- packages/trunk/openyahtzee/debian/changelog	2011-04-01 13:30:29 UTC (rev 12071)
+++ packages/trunk/openyahtzee/debian/changelog	2011-04-01 13:48:38 UTC (rev 12072)
@@ -5,6 +5,7 @@
 
   [ Paul Wise ]
   * New upstream release
+    - Remove new embedded code copy of sqlite3
   * Wrap build-deps one per line
   * Add ${misc:Depends} to dependencies just in case
   * Fix the watch file to find latest release

Modified: packages/trunk/openyahtzee/debian/patches/series
===================================================================
--- packages/trunk/openyahtzee/debian/patches/series	2011-04-01 13:30:29 UTC (rev 12071)
+++ packages/trunk/openyahtzee/debian/patches/series	2011-04-01 13:48:38 UTC (rev 12072)
@@ -1 +1,2 @@
 fix-ftbfs-with-new-gcc.patch
+use-system-sqlite3.patch

Added: packages/trunk/openyahtzee/debian/patches/use-system-sqlite3.patch
===================================================================
--- packages/trunk/openyahtzee/debian/patches/use-system-sqlite3.patch	                        (rev 0)
+++ packages/trunk/openyahtzee/debian/patches/use-system-sqlite3.patch	2011-04-01 13:48:38 UTC (rev 12072)
@@ -0,0 +1,45 @@
+Author: Paul Wise <pabs at debian.org>
+Description: Use the system sqlite3 instead of an embedded copy
+--- a/openyahtzee.vcproj
++++ b/openyahtzee.vcproj
+@@ -208,10 +208,6 @@
+ 				>
+ 			</File>
+ 			<File
+-				RelativePath=".\src\sqlite\sqlite3.c"
+-				>
+-			</File>
+-			<File
+ 				RelativePath=".\src\wxDynamicBitmap.cpp"
+ 				>
+ 			</File>
+--- a/src/DBwrapper.h
++++ b/src/DBwrapper.h
+@@ -30,7 +30,7 @@
+ to allow to access different kinds of data bases seamlessly
+ */
+ 
+-#include "sqlite/sqlite3.h"
++#include <sqlite3.h>
+ #include <string>
+ #include <list>
+ 
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -21,9 +21,7 @@
+ 	three.xpm \
+ 	four.xpm \
+ 	five.xpm \
+-	six.xpm \
+-	sqlite/sqlite3.c \
+-	sqlite/sqlite3.h
++	six.xpm
+ 
+ # set the include path found by configure
+ AM_CPPFLAGS = $(all_includes)
+@@ -42,4 +40,4 @@
+ 	openyahtzee.rc
+ 
+ AM_CXXFLAGS = @WX_CXXFLAGS@
+-openyahtzee_LDADD = @WX_LIBS@ -ldl
++openyahtzee_LDADD = @WX_LIBS@ -lsqlite3 -ldl

Modified: packages/trunk/openyahtzee/debian/rules
===================================================================
--- packages/trunk/openyahtzee/debian/rules	2011-04-01 13:30:29 UTC (rev 12071)
+++ packages/trunk/openyahtzee/debian/rules	2011-04-01 13:48:38 UTC (rev 12072)
@@ -6,4 +6,5 @@
 	dh $@ --parallel --with autotools_dev --with autoreconf
 
 override_dh_auto_configure:
+	rm -rf src/sqlite*
 	dh_auto_configure -- --bindir=/usr/games