r14353 - in packages/trunk/kanatest/debian: . patches
Barry deFreese
bdefreese at alioth.debian.org
Fri Jun 28 12:26:17 UTC 2013
Author: bdefreese
Date: 2013-06-28 12:26:16 +0000 (Fri, 28 Jun 2013)
New Revision: 14353
Modified:
packages/trunk/kanatest/debian/patches/003_gtk_ftbfs_fix.patch
packages/trunk/kanatest/debian/rules
Log:
Forgot to import rules and 003 patch into SVN.
Modified: packages/trunk/kanatest/debian/patches/003_gtk_ftbfs_fix.patch
===================================================================
--- packages/trunk/kanatest/debian/patches/003_gtk_ftbfs_fix.patch 2013-06-28 02:59:43 UTC (rev 14352)
+++ packages/trunk/kanatest/debian/patches/003_gtk_ftbfs_fix.patch 2013-06-28 12:26:16 UTC (rev 14353)
@@ -2,10 +2,11 @@
Subject: Compilation fixes (based on patch by Miyako Miyamura)
Origin: upstream, http://svn.gna.org/viewcvs/kanatest?view=rev&revision=60
Slightly modified to apply on 0.4.8
-
-diff -Nrwu kanatest-0.4.8/src/about.c kanatest-0.4.8.patched/src/about.c
---- kanatest-0.4.8/src/about.c 2009-04-12 21:10:45.000000000 +0200
-+++ kanatest-0.4.8.patched/src/about.c 2011-03-28 11:29:41.474534374 +0200
+Updated: 2013-06-28
+Index: kanatest-0.4.8/src/about.c
+===================================================================
+--- kanatest-0.4.8.orig/src/about.c 2013-06-27 18:16:59.000000000 -0400
++++ kanatest-0.4.8/src/about.c 2013-06-27 18:16:59.000000000 -0400
@@ -430,7 +430,12 @@
g_signal_connect (G_OBJECT (close_button), "clicked",
G_CALLBACK (about_close_button_cb), appGUI);
@@ -19,9 +20,10 @@
gtk_widget_grab_default (close_button);
-diff -Nrwu kanatest-0.4.8/src/chart.c kanatest-0.4.8.patched/src/chart.c
---- kanatest-0.4.8/src/chart.c 2009-04-12 21:10:45.000000000 +0200
-+++ kanatest-0.4.8.patched/src/chart.c 2011-03-28 11:29:41.474534374 +0200
+Index: kanatest-0.4.8/src/chart.c
+===================================================================
+--- kanatest-0.4.8.orig/src/chart.c 2013-06-27 18:16:50.000000000 -0400
++++ kanatest-0.4.8/src/chart.c 2013-06-27 18:16:59.000000000 -0400
@@ -260,7 +260,12 @@
g_signal_connect (G_OBJECT (close_button), "clicked",
G_CALLBACK (chart_close_button_cb), appGUI);
@@ -35,9 +37,10 @@
chart_display_kanas(HIRAGANA, appGUI);
-diff -Nrwu kanatest-0.4.8/src/gui.c kanatest-0.4.8.patched/src/gui.c
---- kanatest-0.4.8/src/gui.c 2009-04-12 21:10:45.000000000 +0200
-+++ kanatest-0.4.8.patched/src/gui.c 2011-03-28 11:55:23.361872656 +0200
+Index: kanatest-0.4.8/src/gui.c
+===================================================================
+--- kanatest-0.4.8.orig/src/gui.c 2013-06-27 18:16:50.000000000 -0400
++++ kanatest-0.4.8/src/gui.c 2013-06-27 18:16:59.000000000 -0400
@@ -121,7 +121,7 @@
GUI *appGUI = (GUI *)user_data;
@@ -153,9 +156,10 @@
gtk_widget_set_tooltip_text (appGUI->quit_button, _("Exit!"));
gui_disable_test (appGUI);
-diff -Nrwu kanatest-0.4.8/src/gui_utils.c kanatest-0.4.8.patched/src/gui_utils.c
---- kanatest-0.4.8/src/gui_utils.c 2009-04-12 21:10:45.000000000 +0200
-+++ kanatest-0.4.8.patched/src/gui_utils.c 2011-03-28 11:29:41.474534374 +0200
+Index: kanatest-0.4.8/src/gui_utils.c
+===================================================================
+--- kanatest-0.4.8.orig/src/gui_utils.c 2013-06-27 18:16:50.000000000 -0400
++++ kanatest-0.4.8/src/gui_utils.c 2013-06-27 18:16:59.000000000 -0400
@@ -294,7 +294,7 @@
GSList *tags = NULL, *tagp = NULL;
GtkTextTag *tag;
@@ -174,9 +178,10 @@
if (slink != 0) {
link = g_slist_nth_data (links_list, slink);
-diff -Nrwu kanatest-0.4.8/src/options.c kanatest-0.4.8.patched/src/options.c
---- kanatest-0.4.8/src/options.c 2009-04-12 21:10:45.000000000 +0200
-+++ kanatest-0.4.8.patched/src/options.c 2011-03-28 11:39:35.223723345 +0200
+Index: kanatest-0.4.8/src/options.c
+===================================================================
+--- kanatest-0.4.8.orig/src/options.c 2013-06-27 18:16:50.000000000 -0400
++++ kanatest-0.4.8/src/options.c 2013-06-27 18:16:59.000000000 -0400
@@ -105,13 +105,13 @@
void
kana_selected_cb (GtkToggleButton *button, gpointer user_data) {
@@ -402,9 +407,19 @@
switch(config.repeat_mode) {
case REPEAT_ALL:
-diff -Nrwu kanatest-0.4.8/src/stats.c kanatest-0.4.8.patched/src/stats.c
---- kanatest-0.4.8/src/stats.c 2009-04-12 21:10:45.000000000 +0200
-+++ kanatest-0.4.8.patched/src/stats.c 2011-03-28 11:36:40.450921732 +0200
+Index: kanatest-0.4.8/src/stats.c
+===================================================================
+--- kanatest-0.4.8.orig/src/stats.c 2013-06-27 18:16:50.000000000 -0400
++++ kanatest-0.4.8/src/stats.c 2013-06-27 18:16:59.000000000 -0400
+@@ -84,7 +84,7 @@
+
+ info_dialog = gtk_message_dialog_new (GTK_WINDOW(appGUI->sts->stat_window),
+ GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
+- GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, buffer);
++ GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", buffer);
+
+ gtk_window_set_title(GTK_WINDOW(info_dialog), _("Question"));
+ gtk_widget_show (info_dialog);
@@ -148,7 +148,7 @@
MESSAGE *msg = (MESSAGE *)user_data;
@@ -448,3 +463,16 @@
if (appGUI->sts->active_tab != -1) {
gtk_notebook_set_current_page (GTK_NOTEBOOK (appGUI->sts->notebook), appGUI->sts->active_tab);
}
+Index: kanatest-0.4.8/src/test.c
+===================================================================
+--- kanatest-0.4.8.orig/src/test.c 2009-04-12 15:10:45.000000000 -0400
++++ kanatest-0.4.8/src/test.c 2013-06-27 18:17:55.000000000 -0400
+@@ -538,7 +538,7 @@
+
+ info_dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW(appGUI->main_window),
+ GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
+- GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, message);
++ GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, "%s", message);
+
+ gtk_window_set_title (GTK_WINDOW(info_dialog), _("Information"));
+ gtk_widget_show (info_dialog);
Modified: packages/trunk/kanatest/debian/rules
===================================================================
--- packages/trunk/kanatest/debian/rules 2013-06-28 02:59:43 UTC (rev 14352)
+++ packages/trunk/kanatest/debian/rules 2013-06-28 12:26:16 UTC (rev 14353)
@@ -1,10 +1,5 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/quilt/quilt.make
-
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -16,52 +11,10 @@
configure_flags += --host=$(DEB_HOST_GNU_TYPE)
endif
-config.status: $(QUILT_STAMPFN) configure
- dh_testdir
+%:
+ dh $@
+
+override_dh_auto_configure:
./configure $(configure_flags) --prefix=/usr \
--bindir=\$${prefix}/bin --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --datadir=\$${prefix}/share
-
-build: build-stamp
-build-stamp: config.status
- dh_testdir
- $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed"
- touch build-stamp
-
-clean: unpatch
- dh_testdir
- dh_testroot
- [ ! -f Makefile ] || $(MAKE) distclean
- rm -f po/*.gmo
- rm -f po/*.mo
- dh_clean build-stamp
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kanatest
- dh_install debian/kanatest.xpm usr/share/pixmaps
- dh_install debian/kanatest.desktop usr/share/applications
-
-binary-indep: build install
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs README
- dh_installmenu
- dh_installman debian/kanatest.1
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
More information about the Pkg-games-commits
mailing list