tags 652157 +patch
thanks

Patch is attatched which fixes the build failure and makes debian/rules clean work properly.
diff -urN mysql-gui-tools-5.0r14+openSUSE/debian/patches/05-enable-deprecated.patch mysql-gui-tools-5.0r14+openSUSE.new/debian/patches/05-enable-deprecated.patch
--- mysql-gui-tools-5.0r14+openSUSE/debian/patches/05-enable-deprecated.patch	1970-01-01 00:00:00.000000000 +0000
+++ mysql-gui-tools-5.0r14+openSUSE.new/debian/patches/05-enable-deprecated.patch	2012-01-12 21:06:24.000000000 +0000
@@ -0,0 +1,37 @@
+Description: remove G_DISABLE_DEPRECATED to avoid G_CONST_RETURN failures
+Author: Peter Green <plugw...@p10link.net>
+Bug-Debian: http://bugs.debian.org/652157
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- mysql-gui-tools-5.0r14+openSUSE.orig/query-browser/source/linux/gtksourceview/gtksourceview/Makefile.am
++++ mysql-gui-tools-5.0r14+openSUSE/query-browser/source/linux/gtksourceview/gtksourceview/Makefile.am
+@@ -9,7 +9,6 @@ endif
+ INCLUDES = 				\
+ 	-DDATADIR=\""$(datadir)"\" 	\
+ 	-DG_LOG_DOMAIN=\"GtkSourceView\"\
+-	-DG_DISABLE_DEPRECATED 		\
+ 	-DGTK_DISABLE_DEPRECATED 	\
+ 	-DGDK_DISABLE_DEPRECATED 	\
+ 	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
+--- mysql-gui-tools-5.0r14+openSUSE.orig/query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in
++++ mysql-gui-tools-5.0r14+openSUSE/query-browser/source/linux/gtksourceview/gtksourceview/Makefile.in
+@@ -202,7 +202,6 @@ SUBDIRS = language-specs gnu-regex
+ INCLUDES = \
+ 	-DDATADIR=\""$(datadir)"\" 	\
+ 	-DG_LOG_DOMAIN=\"GtkSourceView\"\
+-	-DG_DISABLE_DEPRECATED 		\
+ 	-DGTK_DISABLE_DEPRECATED 	\
+ 	-DGDK_DISABLE_DEPRECATED 	\
+ 	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
diff -urN mysql-gui-tools-5.0r14+openSUSE/debian/patches/series mysql-gui-tools-5.0r14+openSUSE.new/debian/patches/series
--- mysql-gui-tools-5.0r14+openSUSE/debian/patches/series	2011-03-21 09:26:51.000000000 +0000
+++ mysql-gui-tools-5.0r14+openSUSE.new/debian/patches/series	2012-01-12 21:05:21.000000000 +0000
@@ -2,3 +2,4 @@
 01-fix_FTBFS_GNU-kFreeBSD.patch
 02-fix_FTBFS_newer_libmysqlclient-dev.patch
 03-fix_FTBFS_binutils-gold.patch
+05-enable-deprecated.patch
diff -urN mysql-gui-tools-5.0r14+openSUSE/debian/rules mysql-gui-tools-5.0r14+openSUSE.new/debian/rules
--- mysql-gui-tools-5.0r14+openSUSE/debian/rules	2011-03-21 09:09:49.000000000 +0000
+++ mysql-gui-tools-5.0r14+openSUSE.new/debian/rules	2012-01-12 21:04:56.000000000 +0000
@@ -110,6 +110,10 @@
 	rm -f administrator/po/*.po-merged
 	rm -f query-browser/po/*.gmo
 	rm -f query-browser/source/linux/gtksourceview/po/POTFILES
+	rm -f query-browser/library/tests/Makefile
+	rm -f query-browser/library/tests/test_query_analyze/Makefile
+	rm -f query-browser/library/tests/test_query_composition/Makefile
+	rm -f query-browser/library/tests/test_strip_sql/Makefile
 	
 	# Reset config files	
 	chmod +x debian/configupdate

Reply via email to