r12039 - in packages/tags/kanatest: . 0.4.8-2/debian 0.4.8-2/debian/patches
Evgeni Golov
evgeni at alioth.debian.org
Mon Mar 28 11:39:12 UTC 2011
Author: evgeni
Date: 2011-03-28 11:39:04 +0000 (Mon, 28 Mar 2011)
New Revision: 12039
Added:
packages/tags/kanatest/0.4.8-2/
packages/tags/kanatest/0.4.8-2/debian/changelog
packages/tags/kanatest/0.4.8-2/debian/control
packages/tags/kanatest/0.4.8-2/debian/patches/002_updated_emails_and_links.patch
packages/tags/kanatest/0.4.8-2/debian/patches/003_gtk_ftbfs_fix.patch
packages/tags/kanatest/0.4.8-2/debian/patches/series
packages/tags/kanatest/0.4.8-2/debian/source/
Removed:
packages/tags/kanatest/0.4.8-2/debian/changelog
packages/tags/kanatest/0.4.8-2/debian/control
packages/tags/kanatest/0.4.8-2/debian/patches/series
Log:
[svn-buildpackage] Tagging kanatest 0.4.8-2
Deleted: packages/tags/kanatest/0.4.8-2/debian/changelog
===================================================================
--- packages/trunk/kanatest/debian/changelog 2011-03-18 10:42:55 UTC (rev 11970)
+++ packages/tags/kanatest/0.4.8-2/debian/changelog 2011-03-28 11:39:04 UTC (rev 12039)
@@ -1,233 +0,0 @@
-kanatest (0.4.8-2) UNRELEASED; urgency=low
-
- * debian/control:
- + Update my email adress.
- + Update the homepage link.
- * debian/watch:
- + Upstream homepage has moved, update watchfile.
-
- -- Evgeni Golov <evgeni at debian.org> Tue, 26 May 2009 11:32:11 +0200
-
-kanatest (0.4.8-1) unstable; urgency=low
-
- * New upstream release.
- * debian/patches/004_ru_po.diff:
- + Drop the patch, upstream has updated the translation.
- * debian/copyright:
- + Update copyright years.
- * debian/control:
- + Bump Standards-Version to 3.8.1, no changes.
-
- -- Evgeni Golov <sargentd at die-welt.net> Fri, 17 Apr 2009 08:52:58 +0200
-
-kanatest (0.4.6-2) unstable; urgency=low
-
- [ Barry deFreese ]
- * Update my e-mail address.
-
- [ Evgeni Golov ]
- * Upload to unstable again.
- * debian/patches/004_ru_po.diff:
- + Update russian translation.
- * debian/patches/{003_de_po,002_kfreebsd_fix}.diff:
- + Really drop patches, not only not apply them.
-
- -- Evgeni Golov <sargentd at die-welt.net> Mon, 16 Feb 2009 21:16:37 +0100
-
-kanatest (0.4.6-1) experimental; urgency=low
-
- * New upstream release, upload to experimental.
- * debian/patches/003_de_po.diff:
- + Applied upstream, thus droped.
- * debian/patches/002_kfreebsd_fix.diff
- + upstream has cleaned up the includes, patch droped.
- * debian/kanatest.6:
- + Set section to 1, not 6
- + Rename to kanatest.1
- * debian/rules:
- + Install binary to /usr/bin, data to /usr/share.
- + Set LDFLAGS="-Wl,-z,defs -Wl,--as-needed" to tighten deps.
- + dh_installchangelogs only takes one argument, install the README
- correctly with dh_installdocs and not install AUTHORS at all.
- + Remove the comment header.
- + Only pass --host= to configure when cross-building.
- + Clean up the clean target.
- * debian/copyright:
- + Use the machine-readable format.
- * debian/control:
- + Add ${misc:Depends} to Depends.
- * debian/patches/001_PATH_MAX_fix.diff:
- + Hurd does not have PATH_MAX, fix FTBFS by defining it.
-
- -- Evgeni Golov <sargentd at die-welt.net> Thu, 18 Dec 2008 22:32:47 +0100
-
-kanatest (0.4.4-2) unstable; urgency=low
-
- [ Barry deFreese ]
- * Bump Standars Version to 3.7.3 (No changes needed)
-
- [ Ansgar Burchardt ]
- * debian/menu:
- + Change section to Applications/Education instead of Games
- * debian/kanatest.desktop:
- + Change categories to Education, Languages instead of Game
- * debian/control:
- + Change section to text instead of games
-
- [ Evgeni Golov ]
- * debian/rules:
- + let config.stamp depend on $(QUILT_STAMPFN) instead of patch
- so configure isn't run twice
- + wrap the configure options for better reading
- + don't set CFLAGS, let dpkg handle them
- * debian/patches/003_de_po.diff:
- + Add German translation, thanks Mathias Brodala <info at noctus.net>!
- Closes: #500064
- * debian/control:
- + Bump Standars-Version to 3.8.0
- + Add myself to Uploaders
- * debian/README.source:
- + Add README.source with information about quilt-usage, as
- recommended by Policy
-
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 25 Sep 2008 11:58:15 +0000
-
-kanatest (0.4.4-1) unstable; urgency=low
-
- [ Eddy Petrișor ]
- * Gtk should be written as GTK in the desktop file
- * added a Romanian translation of the comment in the desktop file
-
- [ Cyril Brulebois ]
- * Adjusted XS-Vcs-Svn and XS-Vcs-Browser fields in the control file.
-
- [ Barry deFreese ]
- * New upstream release (Closes: #451414)
- * Add watch file (Closes: #451416)
- * Add Homepage field in control
- * Make distclean not ignore errors
- * Remove XS- from VCS fields in control
- * Fix up clean target
- * Revert 000_config_sub_guess.diff - Improved upstream build system
- * 002_kfreebsd_fix.diff (Closes: #416873)
- + Conditionally include limits.h on linux - Fixes FTBFS on kfreebsd
- + Thanks to Cyril Brulebois for the patch
- * Add myself to uploaders
- * Remove deprecated Encoding field from desktop and fix categories
- * Include quilt.make and fix rules to patch/unpatch
-
- [ Mike O'Connor ]
- * make sure docs/*.pmo are built (Closes: #441711)
- * add missing build-depends on gettext
-
- [ Paul Wise ]
- * Move non-free ttf-mikachan from Recommends to Suggests
- * Add a descriptive longtitle to the menu file
- * Support noopt and nostrip properly
-
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 19 Nov 2007 14:12:32 +0930
-
-kanatest (0.4.2-2) unstable; urgency=low
-
- * debian/control:
- + Build-depend against libxml2-dev.
-
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sat, 07 Apr 2007 14:21:36 +0200
-
-kanatest (0.4.2-1) unstable; urgency=low
-
- [ Gonéri Le Bouder ]
- * add French comment in desktop file
- * remove the Applications category from the desktop file since
- it's not an official category
- http://standards.freedesktop.org/menu-spec/latest/apa.html
- * call dh_desktop to run update-desktop-database
-
- [ Sam Hocevar ]
- * New upstream release (Closes: #416493).
- * debian/control:
- + Added Vcs fields.
- + Recommend ttf-kochi-mincho | ttf-mikachan | ttf-kochi-gothic because
- the software now uses the system fonts to display kanas.
- * debian/compat:
- + Set level to 5.
- * debian/kanatest.6:
- + Upstream's manpage disappeared. Readded mine.
-
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 30 Mar 2007 12:39:45 +0200
-
-kanatest (0.3.6-3) unstable; urgency=low
-
- * Moved packaging to the Debian Games Team.
- * Use quilt for patch management.
- * debian/control:
- + Set policy to 3.7.2.
- + Build-depend on quilt.
- * debian/copyright:
- + Fixed the FSF address.
- * debian/kanatest.6:
- + Removed this file, upstream's manpage is all right.
-
- * debian/patches/000_config_sub_guess.diff:
- + New patch from old diff.gz -- update config.sub and config.guess files.
-
- * debian/patches/020_data_path.diff:
- + New patch from old diff.gz -- disable data path overriding.
-
- * debian/patches/030_de_po.diff:
- + New patch by Jens Seidel: fix the de.po file's charset (Closes: #314023).
-
- * debian/patches/030_manpage.diff:
- + New patch -- substitute ${prefix} (Closes: #282528) and fix the
- project's webpage.
-
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 17 May 2006 03:28:01 +0200
-
-kanatest (0.3.6-2) unstable; urgency=low
-
- * debian/copyright:
- + Converted this file to UTF-8.
- * debian/control:
- + Set policy to 3.6.1.1.
- * debian/menu debian/kanatest.desktop:
- + Added a GNOME menu entry and pixmap thanks to Dan Korostelev.
- + Added a pixmap for the Debian menu entry thanks to Dan Korostelev.
- (Closes: #257433).
-
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 10 Aug 2004 12:01:34 +0200
-
-kanatest (0.3.6-1) unstable; urgency=low
-
- * New upstream release (Closes: #245780).
-
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 25 Apr 2004 20:35:59 +0200
-
-kanatest (0.3.4-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 15 Sep 2003 12:58:49 +0200
-
-kanatest (0.3.3-1) unstable; urgency=low
-
- * New upstream release.
- * debian/control:
- + Set policy to 3.6.1.0.
-
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sat, 30 Aug 2003 22:53:41 +0200
-
-kanatest (0.3.1-2) unstable; urgency=low
-
- * Fixed a bug on fresh installs that prevented kanatest to load its
- graphic files (Closes: #198835).
-
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 26 Jun 2003 10:39:13 +0200
-
-kanatest (0.3.1-1) unstable; urgency=low
-
- * Initial Release (Closes: #197466).
- * Wrote a manpage for kanatest(6).
- * Disabled the data path overriding in src/prefs.c.
-
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 16 Jun 2003 02:38:18 +0200
-
Copied: packages/tags/kanatest/0.4.8-2/debian/changelog (from rev 12038, packages/trunk/kanatest/debian/changelog)
===================================================================
--- packages/tags/kanatest/0.4.8-2/debian/changelog (rev 0)
+++ packages/tags/kanatest/0.4.8-2/debian/changelog 2011-03-28 11:39:04 UTC (rev 12039)
@@ -0,0 +1,238 @@
+kanatest (0.4.8-2) unstable; urgency=low
+
+ * debian/control:
+ + Update my email address.
+ + Update the homepage link.
+ + Standards-Version: 3.9.1
+ * debian/watch:
+ + Upstream homepage has moved, update watchfile.
+ * Add 002_updated_emails_and_links.patch to fix old links and emails.
+ LP: #462599
+ * Add 003_gtk_ftbfs_fix.patch to fix FTBFS with GTK+ >= 2.22.
+ * Set 1.0 in debian/source/format.
+
+ -- Evgeni Golov <evgeni at debian.org> Mon, 28 Mar 2011 13:35:04 +0200
+
+kanatest (0.4.8-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/patches/004_ru_po.diff:
+ + Drop the patch, upstream has updated the translation.
+ * debian/copyright:
+ + Update copyright years.
+ * debian/control:
+ + Bump Standards-Version to 3.8.1, no changes.
+
+ -- Evgeni Golov <sargentd at die-welt.net> Fri, 17 Apr 2009 08:52:58 +0200
+
+kanatest (0.4.6-2) unstable; urgency=low
+
+ [ Barry deFreese ]
+ * Update my e-mail address.
+
+ [ Evgeni Golov ]
+ * Upload to unstable again.
+ * debian/patches/004_ru_po.diff:
+ + Update russian translation.
+ * debian/patches/{003_de_po,002_kfreebsd_fix}.diff:
+ + Really drop patches, not only not apply them.
+
+ -- Evgeni Golov <sargentd at die-welt.net> Mon, 16 Feb 2009 21:16:37 +0100
+
+kanatest (0.4.6-1) experimental; urgency=low
+
+ * New upstream release, upload to experimental.
+ * debian/patches/003_de_po.diff:
+ + Applied upstream, thus droped.
+ * debian/patches/002_kfreebsd_fix.diff
+ + upstream has cleaned up the includes, patch droped.
+ * debian/kanatest.6:
+ + Set section to 1, not 6
+ + Rename to kanatest.1
+ * debian/rules:
+ + Install binary to /usr/bin, data to /usr/share.
+ + Set LDFLAGS="-Wl,-z,defs -Wl,--as-needed" to tighten deps.
+ + dh_installchangelogs only takes one argument, install the README
+ correctly with dh_installdocs and not install AUTHORS at all.
+ + Remove the comment header.
+ + Only pass --host= to configure when cross-building.
+ + Clean up the clean target.
+ * debian/copyright:
+ + Use the machine-readable format.
+ * debian/control:
+ + Add ${misc:Depends} to Depends.
+ * debian/patches/001_PATH_MAX_fix.diff:
+ + Hurd does not have PATH_MAX, fix FTBFS by defining it.
+
+ -- Evgeni Golov <sargentd at die-welt.net> Thu, 18 Dec 2008 22:32:47 +0100
+
+kanatest (0.4.4-2) unstable; urgency=low
+
+ [ Barry deFreese ]
+ * Bump Standars Version to 3.7.3 (No changes needed)
+
+ [ Ansgar Burchardt ]
+ * debian/menu:
+ + Change section to Applications/Education instead of Games
+ * debian/kanatest.desktop:
+ + Change categories to Education, Languages instead of Game
+ * debian/control:
+ + Change section to text instead of games
+
+ [ Evgeni Golov ]
+ * debian/rules:
+ + let config.stamp depend on $(QUILT_STAMPFN) instead of patch
+ so configure isn't run twice
+ + wrap the configure options for better reading
+ + don't set CFLAGS, let dpkg handle them
+ * debian/patches/003_de_po.diff:
+ + Add German translation, thanks Mathias Brodala <info at noctus.net>!
+ Closes: #500064
+ * debian/control:
+ + Bump Standars-Version to 3.8.0
+ + Add myself to Uploaders
+ * debian/README.source:
+ + Add README.source with information about quilt-usage, as
+ recommended by Policy
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 25 Sep 2008 11:58:15 +0000
+
+kanatest (0.4.4-1) unstable; urgency=low
+
+ [ Eddy Petrișor ]
+ * Gtk should be written as GTK in the desktop file
+ * added a Romanian translation of the comment in the desktop file
+
+ [ Cyril Brulebois ]
+ * Adjusted XS-Vcs-Svn and XS-Vcs-Browser fields in the control file.
+
+ [ Barry deFreese ]
+ * New upstream release (Closes: #451414)
+ * Add watch file (Closes: #451416)
+ * Add Homepage field in control
+ * Make distclean not ignore errors
+ * Remove XS- from VCS fields in control
+ * Fix up clean target
+ * Revert 000_config_sub_guess.diff - Improved upstream build system
+ * 002_kfreebsd_fix.diff (Closes: #416873)
+ + Conditionally include limits.h on linux - Fixes FTBFS on kfreebsd
+ + Thanks to Cyril Brulebois for the patch
+ * Add myself to uploaders
+ * Remove deprecated Encoding field from desktop and fix categories
+ * Include quilt.make and fix rules to patch/unpatch
+
+ [ Mike O'Connor ]
+ * make sure docs/*.pmo are built (Closes: #441711)
+ * add missing build-depends on gettext
+
+ [ Paul Wise ]
+ * Move non-free ttf-mikachan from Recommends to Suggests
+ * Add a descriptive longtitle to the menu file
+ * Support noopt and nostrip properly
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 19 Nov 2007 14:12:32 +0930
+
+kanatest (0.4.2-2) unstable; urgency=low
+
+ * debian/control:
+ + Build-depend against libxml2-dev.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sat, 07 Apr 2007 14:21:36 +0200
+
+kanatest (0.4.2-1) unstable; urgency=low
+
+ [ Gonéri Le Bouder ]
+ * add French comment in desktop file
+ * remove the Applications category from the desktop file since
+ it's not an official category
+ http://standards.freedesktop.org/menu-spec/latest/apa.html
+ * call dh_desktop to run update-desktop-database
+
+ [ Sam Hocevar ]
+ * New upstream release (Closes: #416493).
+ * debian/control:
+ + Added Vcs fields.
+ + Recommend ttf-kochi-mincho | ttf-mikachan | ttf-kochi-gothic because
+ the software now uses the system fonts to display kanas.
+ * debian/compat:
+ + Set level to 5.
+ * debian/kanatest.6:
+ + Upstream's manpage disappeared. Readded mine.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 30 Mar 2007 12:39:45 +0200
+
+kanatest (0.3.6-3) unstable; urgency=low
+
+ * Moved packaging to the Debian Games Team.
+ * Use quilt for patch management.
+ * debian/control:
+ + Set policy to 3.7.2.
+ + Build-depend on quilt.
+ * debian/copyright:
+ + Fixed the FSF address.
+ * debian/kanatest.6:
+ + Removed this file, upstream's manpage is all right.
+
+ * debian/patches/000_config_sub_guess.diff:
+ + New patch from old diff.gz -- update config.sub and config.guess files.
+
+ * debian/patches/020_data_path.diff:
+ + New patch from old diff.gz -- disable data path overriding.
+
+ * debian/patches/030_de_po.diff:
+ + New patch by Jens Seidel: fix the de.po file's charset (Closes: #314023).
+
+ * debian/patches/030_manpage.diff:
+ + New patch -- substitute ${prefix} (Closes: #282528) and fix the
+ project's webpage.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 17 May 2006 03:28:01 +0200
+
+kanatest (0.3.6-2) unstable; urgency=low
+
+ * debian/copyright:
+ + Converted this file to UTF-8.
+ * debian/control:
+ + Set policy to 3.6.1.1.
+ * debian/menu debian/kanatest.desktop:
+ + Added a GNOME menu entry and pixmap thanks to Dan Korostelev.
+ + Added a pixmap for the Debian menu entry thanks to Dan Korostelev.
+ (Closes: #257433).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 10 Aug 2004 12:01:34 +0200
+
+kanatest (0.3.6-1) unstable; urgency=low
+
+ * New upstream release (Closes: #245780).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 25 Apr 2004 20:35:59 +0200
+
+kanatest (0.3.4-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 15 Sep 2003 12:58:49 +0200
+
+kanatest (0.3.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ + Set policy to 3.6.1.0.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sat, 30 Aug 2003 22:53:41 +0200
+
+kanatest (0.3.1-2) unstable; urgency=low
+
+ * Fixed a bug on fresh installs that prevented kanatest to load its
+ graphic files (Closes: #198835).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 26 Jun 2003 10:39:13 +0200
+
+kanatest (0.3.1-1) unstable; urgency=low
+
+ * Initial Release (Closes: #197466).
+ * Wrote a manpage for kanatest(6).
+ * Disabled the data path overriding in src/prefs.c.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 16 Jun 2003 02:38:18 +0200
+
Deleted: packages/tags/kanatest/0.4.8-2/debian/control
===================================================================
--- packages/trunk/kanatest/debian/control 2011-03-18 10:42:55 UTC (rev 11970)
+++ packages/tags/kanatest/0.4.8-2/debian/control 2011-03-28 11:39:04 UTC (rev 12039)
@@ -1,25 +0,0 @@
-Source: kanatest
-Section: text
-Priority: optional
-Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Sam Hocevar <sho at debian.org>, Barry deFreese <bdefreese at debian.org>,
- Evgeni Golov <evgeni at debian.org>
-Build-Depends: debhelper (>= 5.0), quilt, libgtk2.0-dev (>= 2.0), libxml2-dev, gettext, autotools-dev
-Standards-Version: 3.8.1
-Homepage: http://clayo.org/kanatest/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/kanatest/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/kanatest/?op=log
-
-Package: kanatest
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: ttf-kochi-mincho | ttf-kochi-gothic
-Suggests: ttf-mikachan
-Description: beginner's drill game to learn Japanese kana characters
- Kanatest is a simple hiragana and katakana drill game. It checks your
- knowledge of Japanese kana characters.
- .
- There are three drill modes: hiragana mode (hiragana charset only), katakana
- mode (katakana charset only) and mixed mode (both charsets). The tester shows
- random kana characters and waits until you enter the romaji equivalent in an
- entry field. At the end, statistics are provided.
Copied: packages/tags/kanatest/0.4.8-2/debian/control (from rev 12037, packages/trunk/kanatest/debian/control)
===================================================================
--- packages/tags/kanatest/0.4.8-2/debian/control (rev 0)
+++ packages/tags/kanatest/0.4.8-2/debian/control 2011-03-28 11:39:04 UTC (rev 12039)
@@ -0,0 +1,25 @@
+Source: kanatest
+Section: text
+Priority: optional
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Uploaders: Sam Hocevar <sho at debian.org>, Barry deFreese <bdefreese at debian.org>,
+ Evgeni Golov <evgeni at debian.org>
+Build-Depends: debhelper (>= 5.0), quilt, libgtk2.0-dev (>= 2.0), libxml2-dev, gettext, autotools-dev
+Standards-Version: 3.9.1
+Homepage: http://clayo.org/kanatest/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/kanatest/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/kanatest/?op=log
+
+Package: kanatest
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: ttf-kochi-mincho | ttf-kochi-gothic
+Suggests: ttf-mikachan
+Description: beginner's drill game to learn Japanese kana characters
+ Kanatest is a simple hiragana and katakana drill game. It checks your
+ knowledge of Japanese kana characters.
+ .
+ There are three drill modes: hiragana mode (hiragana charset only), katakana
+ mode (katakana charset only) and mixed mode (both charsets). The tester shows
+ random kana characters and waits until you enter the romaji equivalent in an
+ entry field. At the end, statistics are provided.
Copied: packages/tags/kanatest/0.4.8-2/debian/patches/002_updated_emails_and_links.patch (from rev 12032, packages/trunk/kanatest/debian/patches/002_updated_emails_and_links.patch)
===================================================================
--- packages/tags/kanatest/0.4.8-2/debian/patches/002_updated_emails_and_links.patch (rev 0)
+++ packages/tags/kanatest/0.4.8-2/debian/patches/002_updated_emails_and_links.patch 2011-03-28 11:39:04 UTC (rev 12039)
@@ -0,0 +1,88 @@
+From: Tomasz Maka <pasp at users.sourceforge.net>
+Subject: Updated emails and links
+Origin: upstream, http://svn.gna.org/viewcvs/kanatest?view=rev&revision=51
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/kanatest/+bug/462599
+
+Index: AUTHORS
+===================================================================
+--- kanatest/AUTHORS (revision 50)
++++ kanatest/AUTHORS (revision 51)
+@@ -4,8 +4,8 @@
+
+ Tomasz Maka <pasp at users.sourceforge.net>
+
+-Maja Kocon <ironya at ll.pl>
+-Piotr Maka <sill at ll.pl>
++Maja Kocon <ironya at pinky-babble.org>
++Piotr Maka <silloz at users.sourceforge.net>
+
+
+ Contributors
+Index: src/about.c
+===================================================================
+--- kanatest/src/about.c (revision 50)
++++ kanatest/src/about.c (revision 51)
+@@ -148,7 +148,7 @@
+ "fr", "Adrian Courrèges", "a.courreges at gmail.com",
+ "hu", "Szigetvári Csaba", "csaba.szigetvari at informedia.hu",
+ "it", "Jacopo Farina", "jacopo.farina at email.it",
+- "pl", "Piotr Mąka", "sill at ll.pl",
++ "pl", "Piotr Mąka", "silloz at users.sourceforge.net",
+ "pt", "Bruno Ramos", "ladrilho at gmail.com",
+ "ru", "Taci Taclipoka", "taclipoka at gmail.com"
+ };
+@@ -235,7 +235,7 @@
+
+ gtk_text_buffer_insert (entry_buffer, &iter, "\n", -1);
+ gui_url_insert_link(&appGUI->about_links_list, &appGUI->about_link_index, appGUI->about_textview,
+- &iter, NULL, 0, "http://clay.ll.pl/kanatest", TRUE, appGUI);
++ &iter, NULL, 0, "http://clayo.org/kanatest", TRUE, appGUI);
+ gtk_text_buffer_insert (entry_buffer, &iter, "\n", -1);
+ g_snprintf (buffer, BUFFER_SIZE, "\n(%s %s, %s)\n\n", _("compiled on"), __DATE__, __TIME__);
+ gtk_text_buffer_insert_with_tags_by_name (entry_buffer, &iter, buffer, -1, "center", "italic", NULL);
+@@ -244,18 +244,18 @@
+ gtk_text_buffer_insert_with_tags_by_name (entry_buffer, &iter, buffer, -1, "bold", NULL);
+ gtk_text_buffer_insert (entry_buffer, &iter, " Tomasz Mąka <", -1);
+ gui_url_insert_link (&appGUI->about_links_list, &appGUI->about_link_index, appGUI->about_textview,
+- &iter, NULL, 0, "pasp at ll.pl", TRUE, appGUI);
++ &iter, NULL, 0, "pasp at users.sourceforge.net", TRUE, appGUI);
+ gtk_text_buffer_insert (entry_buffer, &iter, ">\n", -1);
+
+ g_snprintf (buffer, BUFFER_SIZE, "\n%s:\n", _("Graphics"));
+ gtk_text_buffer_insert_with_tags_by_name (entry_buffer, &iter, buffer, -1, "bold", NULL);
+ gtk_text_buffer_insert (entry_buffer, &iter, " Maja Kocoń (", -1);
+ gui_url_insert_link (&appGUI->about_links_list, &appGUI->about_link_index, appGUI->about_textview,
+- &iter, NULL, 0, "http://ironya.ll.pl", TRUE, appGUI);
++ &iter, NULL, 0, "http://pinky-babble.org", TRUE, appGUI);
+ gtk_text_buffer_insert (entry_buffer, &iter, ")\n", -1);
+ gtk_text_buffer_insert (entry_buffer, &iter, " Piotr Mąka <", -1);
+ gui_url_insert_link (&appGUI->about_links_list, &appGUI->about_link_index, appGUI->about_textview,
+- &iter, NULL, 0, "sill at ll.pl", TRUE, appGUI);
++ &iter, NULL, 0, "silloz at users.sourceforge.net", TRUE, appGUI);
+ gtk_text_buffer_insert (entry_buffer, &iter, ">\n", -1);
+
+ g_snprintf (buffer, BUFFER_SIZE, "\n%s:\n", _("Translators"));
+Index: README
+===================================================================
+--- kanatest/README (revision 50)
++++ kanatest/README (revision 51)
+@@ -61,7 +61,7 @@
+
+ -----> WHERE ?
+
+-Homepage: http://clay.ll.pl/kanatest
++Homepage: http://clayo.org/kanatest
+
+
+ -----> WHO ?
+@@ -70,8 +70,8 @@
+ Tomasz Maka <pasp at users.sourceforge.net>
+
+ Graphics:
+- Maja Kocon (http://ironya.ll.pl) - current logo, icons
+- Piotr Maka <sill at ll.pl> - logo used in previous versions
++ Maja Kocon (http://pinky-babble.org) - current logo, icons
++ Piotr Maka <silloz at users.sourceforge.net> - logo used in previous versions
+
+ Any suggestions, patches, criticism are kindly welcome.
+
Copied: packages/tags/kanatest/0.4.8-2/debian/patches/003_gtk_ftbfs_fix.patch (from rev 12034, packages/trunk/kanatest/debian/patches/003_gtk_ftbfs_fix.patch)
===================================================================
--- packages/tags/kanatest/0.4.8-2/debian/patches/003_gtk_ftbfs_fix.patch (rev 0)
+++ packages/tags/kanatest/0.4.8-2/debian/patches/003_gtk_ftbfs_fix.patch 2011-03-28 11:39:04 UTC (rev 12039)
@@ -0,0 +1,450 @@
+From: Tomasz Maka <pasp at users.sourceforge.net>
+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
+@@ -430,7 +430,12 @@
+ g_signal_connect (G_OBJECT (close_button), "clicked",
+ G_CALLBACK (about_close_button_cb), appGUI);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), close_button);
++
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_default (close_button, TRUE);
++#else
+ GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
++#endif
+
+ 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
+@@ -260,7 +260,12 @@
+ g_signal_connect (G_OBJECT (close_button), "clicked",
+ G_CALLBACK (chart_close_button_cb), appGUI);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), close_button);
++
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_default (close_button, TRUE);
++#else
+ GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
++#endif
+
+ 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
+@@ -121,7 +121,7 @@
+ GUI *appGUI = (GUI *)user_data;
+
+ appGUI->tst->test_state = TRUE;
+- g_timeout_add (1000, (GtkFunction) time_handler, appGUI);
++ g_timeout_add (1000, time_handler, appGUI);
+
+ gtk_widget_show (appGUI->char_label);
+ gtk_widget_hide (appGUI->logo_area);
+@@ -561,7 +561,11 @@
+ gtk_box_pack_start (GTK_BOX (hbox2), appGUI->timer_label, TRUE, TRUE, 0);
+
+ appGUI->stat_button = gui_stock_label_button(NULL, KANATEST_STOCK_BUTTON_STATISTICS);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->stat_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->stat_button, GTK_CAN_FOCUS);
++#endif
+ g_signal_connect (G_OBJECT (appGUI->stat_button), "clicked",
+ G_CALLBACK (show_statistics_window_cb), appGUI);
+ gtk_widget_show (appGUI->stat_button);
+@@ -570,7 +574,11 @@
+ gtk_widget_set_tooltip_text (appGUI->stat_button, _("Statistics"));
+
+ appGUI->chart_button = gui_stock_label_button(NULL, KANATEST_STOCK_BUTTON_CHART);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->chart_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->chart_button, GTK_CAN_FOCUS);
++#endif
+ g_signal_connect (G_OBJECT (appGUI->chart_button), "clicked",
+ G_CALLBACK (show_chart_window_cb), appGUI);
+ gtk_widget_show (appGUI->chart_button);
+@@ -579,7 +587,11 @@
+ gtk_widget_set_tooltip_text (appGUI->chart_button, _("Kana chart"));
+
+ appGUI->prefs_button = gui_stock_label_button(NULL, KANATEST_STOCK_BUTTON_OPTIONS);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->prefs_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->prefs_button, GTK_CAN_FOCUS);
++#endif
+ g_signal_connect (G_OBJECT (appGUI->prefs_button), "clicked",
+ G_CALLBACK (show_options_window_cb), appGUI);
+ gtk_widget_show (appGUI->prefs_button);
+@@ -588,7 +600,11 @@
+ gtk_widget_set_tooltip_text (appGUI->prefs_button, _("Options"));
+
+ appGUI->about_button = gui_stock_label_button(NULL, KANATEST_STOCK_BUTTON_ABOUT);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->about_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->about_button, GTK_CAN_FOCUS);
++#endif
+ g_signal_connect (G_OBJECT (appGUI->about_button), "clicked",
+ G_CALLBACK (show_about_window_cb), appGUI);
+ gtk_widget_show (appGUI->about_button);
+@@ -660,33 +676,57 @@
+ gtk_box_set_spacing (GTK_BOX (hbuttonbox), 5);
+
+ appGUI->start_button = gui_stock_label_button(_("Start"), GTK_STOCK_EXECUTE);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->start_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->start_button, GTK_CAN_FOCUS);
++#endif
+ g_signal_connect (G_OBJECT (appGUI->start_button), "clicked",
+ G_CALLBACK (start_test_cb), appGUI);
+ gtk_widget_show (appGUI->start_button);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), appGUI->start_button);
+ gtk_container_set_border_width (GTK_CONTAINER (appGUI->start_button), 4);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_default (appGUI->start_button, TRUE);
++#else
+ GTK_WIDGET_SET_FLAGS (appGUI->start_button, GTK_CAN_DEFAULT);
++#endif
+ gtk_widget_set_tooltip_text (appGUI->start_button, _("Press to begin testing..."));
+
+ appGUI->stop_button = gui_stock_label_button(_("Stop"), GTK_STOCK_STOP);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->stop_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->stop_button, GTK_CAN_FOCUS);
++#endif
+ g_signal_connect (G_OBJECT (appGUI->stop_button), "clicked",
+ G_CALLBACK (stop_test_cb), appGUI);
+ gtk_widget_show (appGUI->stop_button);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), appGUI->stop_button);
+ gtk_container_set_border_width (GTK_CONTAINER (appGUI->stop_button), 4);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_default (appGUI->stop_button, TRUE);
++#else
+ GTK_WIDGET_SET_FLAGS (appGUI->stop_button, GTK_CAN_DEFAULT);
++#endif
+ gtk_widget_set_tooltip_text (appGUI->stop_button, _("Press to stop testing..."));
+
+ appGUI->quit_button = gui_stock_label_button(_("Quit"), GTK_STOCK_QUIT);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->quit_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->quit_button, GTK_CAN_FOCUS);
++#endif
+ g_signal_connect (G_OBJECT (appGUI->quit_button), "clicked",
+ G_CALLBACK (gui_close_window_cb), appGUI);
+ gtk_widget_show (appGUI->quit_button);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), appGUI->quit_button);
+ gtk_container_set_border_width (GTK_CONTAINER (appGUI->quit_button), 4);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_default (appGUI->quit_button, TRUE);
++#else
+ GTK_WIDGET_SET_FLAGS (appGUI->quit_button, GTK_CAN_DEFAULT);
++#endif
+ 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
+@@ -294,7 +294,7 @@
+ GSList *tags = NULL, *tagp = NULL;
+ GtkTextTag *tag;
+ gchar *link;
+-gint slink;
++size_t slink;
+
+ if (ev->type != GDK_BUTTON_RELEASE) {
+ return FALSE;
+@@ -322,7 +322,7 @@
+ for (tagp = tags; tagp != NULL; tagp = tagp->next) {
+
+ tag = tagp->data;
+- slink = (gint) g_object_get_data (G_OBJECT (tag), "link");
++ slink = (size_t)g_object_get_data (G_OBJECT (tag), "link");
+
+ 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
+@@ -105,13 +105,13 @@
+ void
+ kana_selected_cb (GtkToggleButton *button, gpointer user_data) {
+
+-gint pos;
++size_t pos;
+
+ MESSAGE *msg = (MESSAGE *)user_data;
+
+ if (msg->appGUI->opt->disable_toggles == FALSE) {
+
+- pos = (int) msg->data;
++ pos = (size_t) msg->data;
+
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(button)) == TRUE) {
+ config.user_defined_lesson[pos] = '+';
+@@ -315,7 +315,7 @@
+ row_button_select_cb (GtkWidget *widget, gpointer user_data) {
+
+ MESSAGE *msg = (MESSAGE *)user_data;
+- select_deselect_row ((gint) msg->data, TRUE, msg->appGUI);
++ select_deselect_row ((size_t) msg->data, TRUE, msg->appGUI);
+ }
+
+ /*--------------------------------------------------------------------*/
+@@ -324,7 +324,7 @@
+ row_button_deselect_cb (GtkWidget *widget, gpointer user_data) {
+
+ MESSAGE *msg = (MESSAGE *)user_data;
+- select_deselect_row ((gint) msg->data, FALSE, msg->appGUI);
++ select_deselect_row ((size_t) msg->data, FALSE, msg->appGUI);
+ }
+
+ /*--------------------------------------------------------------------*/
+@@ -521,7 +521,11 @@
+
+ appGUI->opt->hiragana_radiobutton = gtk_radio_button_new_with_mnemonic (NULL, _("Hiragana"));
+ gtk_widget_show (appGUI->opt->hiragana_radiobutton);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->opt->hiragana_radiobutton, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->opt->hiragana_radiobutton, GTK_CAN_FOCUS);
++#endif
+ gtk_box_pack_start (GTK_BOX (hbox1), appGUI->opt->hiragana_radiobutton, FALSE, FALSE, 0);
+ gtk_radio_button_set_group (GTK_RADIO_BUTTON (appGUI->opt->hiragana_radiobutton), radiobutton_group);
+ radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (appGUI->opt->hiragana_radiobutton));
+@@ -530,7 +534,11 @@
+
+ katakana_radiobutton = gtk_radio_button_new_with_mnemonic (NULL, _("Katakana"));
+ gtk_widget_show (katakana_radiobutton);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (katakana_radiobutton, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (katakana_radiobutton, GTK_CAN_FOCUS);
++#endif
+ gtk_box_pack_start (GTK_BOX (hbox1), katakana_radiobutton, FALSE, FALSE, 0);
+ gtk_radio_button_set_group (GTK_RADIO_BUTTON (katakana_radiobutton), radiobutton_group);
+ radiobutton_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (katakana_radiobutton));
+@@ -669,14 +677,22 @@
+ g_signal_connect (G_OBJECT (cancel_button), "clicked",
+ G_CALLBACK (auto_select_close_button_cb), appGUI);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), cancel_button);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_default (cancel_button, TRUE);
++#else
+ GTK_WIDGET_SET_FLAGS (cancel_button, GTK_CAN_DEFAULT);
++#endif
+
+ appGUI->opt->select_button = gui_stock_label_button(_("Select"), GTK_STOCK_INDEX);
+ gtk_widget_show (appGUI->opt->select_button);
+ g_signal_connect (G_OBJECT (appGUI->opt->select_button), "clicked",
+ G_CALLBACK (auto_select_select_button_cb), appGUI);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), appGUI->opt->select_button);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_default(appGUI->opt->select_button, TRUE);
++#else
+ GTK_WIDGET_SET_FLAGS (appGUI->opt->select_button, GTK_CAN_DEFAULT);
++#endif
+
+ if (config.hiragana_mode == TRUE) {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(appGUI->opt->hiragana_radiobutton), TRUE);
+@@ -746,7 +762,11 @@
+ gtk_container_add (GTK_CONTAINER (appGUI->opt->options_window), vbox1);
+
+ appGUI->opt->notebook = gtk_notebook_new();
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->opt->notebook, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->opt->notebook, GTK_CAN_FOCUS);
++#endif
+ gtk_widget_show (appGUI->opt->notebook);
+ gtk_notebook_set_tab_pos (GTK_NOTEBOOK(appGUI->opt->notebook), GTK_POS_TOP);
+ gtk_box_pack_start (GTK_BOX (vbox1), appGUI->opt->notebook, TRUE, TRUE, 0);
+@@ -823,7 +843,11 @@
+ (GtkAttachOptions) (0), 0, 0);
+
+ combobox_ca_timeout = gtk_combo_box_new_text ();
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (combobox_ca_timeout, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (combobox_ca_timeout, GTK_CAN_FOCUS);
++#endif
+ gtk_widget_show (combobox_ca_timeout);
+ g_signal_connect (G_OBJECT (combobox_ca_timeout), "changed",
+ G_CALLBACK (options_combobox_ca_timeout_handler_cb), NULL);
+@@ -959,12 +983,16 @@
+
+ gtk_widget_show (appGUI->opt->check_buttons[pos]);
+
+- msg[pos].data = (gpointer) pos;
++ msg[pos].data = (gpointer)((size_t)pos);
+ msg[pos].appGUI = appGUI;
+ g_signal_connect (G_OBJECT (appGUI->opt->check_buttons[pos]), "toggled",
+ G_CALLBACK (kana_selected_cb), &msg[pos]);
+
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->opt->check_buttons[pos], FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->opt->check_buttons[pos], GTK_CAN_FOCUS);
++#endif
+ gtk_container_add (GTK_CONTAINER (frames[pos]), appGUI->opt->check_buttons[pos]);
+
+ if(config.user_defined_lesson[pos] == '+') {
+@@ -980,14 +1008,18 @@
+
+ appGUI->opt->row_button_s[j] = gui_stock_label_button (NULL, GTK_STOCK_APPLY);
+ gtk_button_set_relief (GTK_BUTTON (appGUI->opt->row_button_s[j]), GTK_RELIEF_NONE);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->opt->row_button_s[j], FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->opt->row_button_s[j], GTK_CAN_FOCUS);
++#endif
+ gtk_widget_set_tooltip_text (appGUI->opt->row_button_s[j], _("Select all kanas in row"));
+ gtk_widget_show (appGUI->opt->row_button_s[j]);
+ gtk_table_attach (GTK_TABLE (table), appGUI->opt->row_button_s[j], i, i+1, j, j+1,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
+
+- msg2[j].data = (gpointer) j;
++ msg2[j].data = (gpointer)((size_t)j);
+ msg2[j].appGUI = appGUI;
+ g_signal_connect (G_OBJECT (appGUI->opt->row_button_s[j]), "clicked",
+ G_CALLBACK (row_button_select_cb), &msg2[j]);
+@@ -996,7 +1028,11 @@
+
+ appGUI->opt->row_button_c[j] = gui_stock_label_button (NULL, GTK_STOCK_CLEAR);
+ gtk_button_set_relief (GTK_BUTTON (appGUI->opt->row_button_c[j]), GTK_RELIEF_NONE);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (appGUI->opt->row_button_c[j], FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (appGUI->opt->row_button_c[j], GTK_CAN_FOCUS);
++#endif
+ gtk_widget_set_tooltip_text (appGUI->opt->row_button_c[j], _("Deselect all kanas in row"));
+ gtk_widget_show (appGUI->opt->row_button_c[j]);
+ gtk_table_attach (GTK_TABLE (table), appGUI->opt->row_button_c[j], i, i+1, j, j+1,
+@@ -1026,7 +1062,11 @@
+ gtk_misc_set_padding (GTK_MISC (appGUI->opt->number_of_kanas_label), 4, 0);
+
+ auto_select_button = gtk_button_new_with_label (_("Statistics based selection"));
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (auto_select_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (auto_select_button, GTK_CAN_FOCUS);
++#endif
+ gtk_widget_show (auto_select_button);
+ gtk_box_pack_end (GTK_BOX (hbox), auto_select_button, FALSE, FALSE, 0);
+ g_signal_connect (G_OBJECT (auto_select_button), "clicked",
+@@ -1044,7 +1084,11 @@
+ gtk_misc_set_padding (GTK_MISC (label), 4, 0);
+
+ combobox_dtf = gtk_combo_box_new_text ();
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (combobox_dtf, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (combobox_dtf, GTK_CAN_FOCUS);
++#endif
+ gtk_widget_show (combobox_dtf);
+ gtk_box_pack_start (GTK_BOX (hbox), combobox_dtf, FALSE, FALSE, 0);
+ g_signal_connect (G_OBJECT (combobox_dtf), "changed",
+@@ -1068,21 +1112,33 @@
+ gtk_misc_set_padding (GTK_MISC (label), 4, 0);
+
+ select_all_button = gtk_button_new_with_label (_("All"));
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (select_all_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (select_all_button, GTK_CAN_FOCUS);
++#endif
+ gtk_widget_show (select_all_button);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox_s), select_all_button);
+ g_signal_connect (G_OBJECT (select_all_button), "clicked",
+ G_CALLBACK (select_all_action_cb), appGUI);
+
+ select_none_button = gtk_button_new_with_label (_("None"));
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (select_none_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (select_none_button, GTK_CAN_FOCUS);
++#endif
+ gtk_widget_show (select_none_button);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox_s), select_none_button);
+ g_signal_connect (G_OBJECT (select_none_button), "clicked",
+ G_CALLBACK (select_none_action_cb), appGUI);
+
+ invert_selection_button = gtk_button_new_with_label (_("Invert"));
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus (invert_selection_button, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS (invert_selection_button, GTK_CAN_FOCUS);
++#endif
+ gtk_widget_show (select_none_button);
+ gtk_widget_show (invert_selection_button);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox_s), invert_selection_button);
+@@ -1103,7 +1159,11 @@
+ g_signal_connect (G_OBJECT (close_button), "clicked",
+ G_CALLBACK (options_close_button_cb), appGUI);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), close_button);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_default (close_button, TRUE);
++#else
+ GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
++#endif
+
+ 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
+@@ -148,7 +148,7 @@
+ MESSAGE *msg = (MESSAGE *)user_data;
+
+ msg->appGUI->sts->old_column = config.stats_sort_column;
+- config.stats_sort_column = (gint) msg->data;
++ config.stats_sort_column = (size_t) msg->data;
+
+ if (msg->appGUI->sts->disable_dir == FALSE) {
+
+@@ -405,7 +405,11 @@
+ gtk_container_add (GTK_CONTAINER (appGUI->sts->stat_window), vbox1);
+
+ appGUI->sts->notebook = gtk_notebook_new ();
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_focus(appGUI->sts->notebook, FALSE);
++#else
+ GTK_WIDGET_UNSET_FLAGS(appGUI->sts->notebook, GTK_CAN_FOCUS);
++#endif
+ gtk_widget_show (appGUI->sts->notebook);
+ gtk_box_pack_start (GTK_BOX (vbox1), appGUI->sts->notebook, TRUE, TRUE, 4);
+
+@@ -449,7 +453,7 @@
+ stats_renderer, "text", i, NULL);
+ gtk_tree_view_column_set_sort_column_id (stats_column[i], i);
+ gtk_tree_view_append_column (GTK_TREE_VIEW(stats_treeview), stats_column[i]);
+- msg[i].data = (gpointer)i;
++ msg[i].data = (gpointer)((size_t)i);
+ msg[i].appGUI = appGUI;
+ g_signal_connect (G_OBJECT(stats_column[i]), "clicked",
+ G_CALLBACK(stats_column_clicked_cb), &msg[i]);
+@@ -638,8 +642,11 @@
+ g_signal_connect (G_OBJECT (close_button), "clicked",
+ G_CALLBACK (stats_window_close_cb), appGUI);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox), close_button);
++#if (GTK_MINOR_VERSION >= 22)
++ gtk_widget_set_can_default (close_button, TRUE);
++#else
+ GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
+-
++#endif
+ if (appGUI->sts->active_tab != -1) {
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (appGUI->sts->notebook), appGUI->sts->active_tab);
+ }
Deleted: packages/tags/kanatest/0.4.8-2/debian/patches/series
===================================================================
--- packages/trunk/kanatest/debian/patches/series 2011-03-18 10:42:55 UTC (rev 11970)
+++ packages/tags/kanatest/0.4.8-2/debian/patches/series 2011-03-28 11:39:04 UTC (rev 12039)
@@ -1 +0,0 @@
-001_PATH_MAX_fix.diff
Copied: packages/tags/kanatest/0.4.8-2/debian/patches/series (from rev 12033, packages/trunk/kanatest/debian/patches/series)
===================================================================
--- packages/tags/kanatest/0.4.8-2/debian/patches/series (rev 0)
+++ packages/tags/kanatest/0.4.8-2/debian/patches/series 2011-03-28 11:39:04 UTC (rev 12039)
@@ -0,0 +1,3 @@
+001_PATH_MAX_fix.diff
+002_updated_emails_and_links.patch
+003_gtk_ftbfs_fix.patch
More information about the Pkg-games-commits
mailing list