r8501 - in packages/trunk/kanatest/debian: . patches

Evgeni Golov sargentd-guest at alioth.debian.org
Sat Dec 13 16:36:19 UTC 2008 

Author: sargentd-guest
Date: 2008-12-13 16:36:19 +0000 (Sat, 13 Dec 2008)
New Revision: 8501

Added:
   packages/trunk/kanatest/debian/kanatest.1
Removed:
   packages/trunk/kanatest/debian/kanatest.6
Modified:
   packages/trunk/kanatest/debian/
   packages/trunk/kanatest/debian/changelog
   packages/trunk/kanatest/debian/copyright
   packages/trunk/kanatest/debian/menu
   packages/trunk/kanatest/debian/patches/series
   packages/trunk/kanatest/debian/rules
Log:
  * New upstream release.
  * 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.




Property changes on: packages/trunk/kanatest/debian
___________________________________________________________________
Name: svn-bp:origUrl
   - http://pkg-games.alioth.debian.org/tarballs/kanatest_0.4.4.orig.tar.gz
   + http://pkg-games.alioth.debian.org/tarballs/kanatest_0.4.6.orig.tar.gz

Modified: packages/trunk/kanatest/debian/changelog
===================================================================
--- packages/trunk/kanatest/debian/changelog	2008-12-13 12:42:02 UTC (rev 8500)
+++ packages/trunk/kanatest/debian/changelog	2008-12-13 16:36:19 UTC (rev 8501)
@@ -1,3 +1,26 @@
+kanatest (0.4.6-1) unstable; urgency=low
+
+  * New upstream release.
+  * 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.
+
+ -- Evgeni Golov <sargentd at die-welt.net>  Sat, 13 Dec 2008 16:36:57 +0100
+
 kanatest (0.4.4-2) unstable; urgency=low
 
   [ Barry deFreese ]

Modified: packages/trunk/kanatest/debian/copyright
===================================================================
--- packages/trunk/kanatest/debian/copyright	2008-12-13 12:42:02 UTC (rev 8500)
+++ packages/trunk/kanatest/debian/copyright	2008-12-13 16:36:19 UTC (rev 8501)
@@ -1,27 +1,20 @@
-This package was debianized by Sam Hocevar <sam at zoy.org> on
-Mon, 16 Jun 2003 02:38:18 +0200.
+Format-Specification:
+ http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=420
+Upstream-Name: kanatest
+Upstream-Maintainer: Tomasz Mąka <pasp at ll.pl>
+Upstream-Source: http://clay.ll.pl/kanatest/
 
-It was downloaded from http://clay.ll.pl/projects.html
+Files: *
+Copyright: © 2001-2008 Tomasz Mąka <pasp at ll.pl>
+Copyright: © 2001-2008 Maja Kocoń <ironya at poczta.fm>
+Copyright: © 2001-2008 Piotr Mąka <sill at members.com.pl>
+License: GPL-2+
 
-Upstream Authors: Tomasz Mąka <pasp at ll.pl>
-                  Maja Kocoń <ironya at poczta.fm>
-                  Piotr Mąka <sill at members.com.pl>
+Files: debian/*
+Copyright: © 2003-2008 Sam Hocevar <sam at zoy.org>
+Copyright: © 2008 Evgeni Golov <sargentd at die-welt.net>
+License: GPL-2+
 
-Copyright 2003-2004 Tomasz Mąka, Maja Kocoń, Piotr Mąka
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+License: GPL-2+
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'.

Copied: packages/trunk/kanatest/debian/kanatest.1 (from rev 8500, packages/trunk/kanatest/debian/kanatest.6)
===================================================================
--- packages/trunk/kanatest/debian/kanatest.1	                        (rev 0)
+++ packages/trunk/kanatest/debian/kanatest.1	2008-12-13 16:36:19 UTC (rev 8501)
@@ -0,0 +1,26 @@
+.TH KANATEST 1
+.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
+.\" other parms are allowed: see man(7), man(1)
+.SH NAME
+kanatest \- a beginner's drill game to learn Japanese kana characters
+.SH SYNOPSIS
+.B kanatest
+.SH "DESCRIPTION"
+.B kanatest
+is a simple hiragana and katakana drill game. It checks your knowledge of
+Japanese kana characters.
+.PP
+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.
+.PP
+kanatest uses GTK 2.
+
+.SH OPTIONS
+There are no options for kanatest.
+
+.SH AUTHOR
+This manual page was written by Sam Hocevar <sam at zoy.org> for the Debian
+GNU/Linux distribution because the original program did not have a manual
+page.


Property changes on: packages/trunk/kanatest/debian/kanatest.1
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: packages/trunk/kanatest/debian/kanatest.6
===================================================================
--- packages/trunk/kanatest/debian/kanatest.6	2008-12-13 12:42:02 UTC (rev 8500)
+++ packages/trunk/kanatest/debian/kanatest.6	2008-12-13 16:36:19 UTC (rev 8501)
@@ -1,26 +0,0 @@
-.TH KANATEST 6
-.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
-.\" other parms are allowed: see man(7), man(1)
-.SH NAME
-kanatest \- a beginner's drill game to learn Japanese kana characters
-.SH SYNOPSIS
-.B kanatest
-.SH "DESCRIPTION"
-.B kanatest
-is a simple hiragana and katakana drill game. It checks your knowledge of
-Japanese kana characters.
-.PP
-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.
-.PP
-kanatest uses GTK 2.
-
-.SH OPTIONS
-There are no options for kanatest.
-
-.SH AUTHOR
-This manual page was written by Sam Hocevar <sam at zoy.org> for the Debian
-GNU/Linux distribution because the original program did not have a manual
-page.

Modified: packages/trunk/kanatest/debian/menu
===================================================================
--- packages/trunk/kanatest/debian/menu	2008-12-13 12:42:02 UTC (rev 8500)
+++ packages/trunk/kanatest/debian/menu	2008-12-13 16:36:19 UTC (rev 8501)
@@ -1,4 +1,4 @@
-?package(kanatest):command="/usr/games/kanatest" needs="X11" \
+?package(kanatest):command="/usr/bin/kanatest" needs="X11" \
     section="Applications/Education" title="Kana test" \
     icon="/usr/share/pixmaps/kanatest.xpm" \
     longtitle="Drill game to learn Japanese kana characters"

Modified: packages/trunk/kanatest/debian/patches/series
===================================================================
--- packages/trunk/kanatest/debian/patches/series	2008-12-13 12:42:02 UTC (rev 8500)
+++ packages/trunk/kanatest/debian/patches/series	2008-12-13 16:36:19 UTC (rev 8501)
@@ -1,2 +1 @@
-002_kfreebsd_fix.diff
-003_de_po.diff
+#

Modified: packages/trunk/kanatest/debian/rules
===================================================================
--- packages/trunk/kanatest/debian/rules	2008-12-13 12:42:02 UTC (rev 8500)
+++ packages/trunk/kanatest/debian/rules	2008-12-13 16:36:19 UTC (rev 8501)
@@ -1,6 +1,4 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -12,28 +10,31 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+configure_flags += --build=$(DEB_BUILD_GNU_TYPE)
 
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+        configure_flags += --host=$(DEB_HOST_GNU_TYPE)
+endif
+
 config.status: $(QUILT_STAMPFN) configure
 	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
-	            --bindir=\$${prefix}/games --mandir=\$${prefix}/share/man \
-	            --infodir=\$${prefix}/share/info --datadir=\$${prefix}/share/games
+	./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)"
+	$(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed"
 	touch build-stamp
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f po/*.gmo
 	rm -f po/*.mo
-	rm -f config.log config.h
-	dh_clean
+	dh_clean build-stamp
 
 install: build
 	dh_testdir
@@ -43,18 +44,16 @@
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/kanatest
 	dh_install debian/kanatest.xpm usr/share/pixmaps
 	dh_install debian/kanatest.desktop usr/share/applications
-	dh_link usr/share/games/pixmaps/kanatest.png \
-	        usr/share/pixmaps/kanatest.png
 
 binary-indep: build install
 
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs ChangeLog AUTHORS README
-	dh_installdocs
+	dh_installchangelogs ChangeLog
+	dh_installdocs README
 	dh_installmenu
-	dh_installman debian/kanatest.6
+	dh_installman debian/kanatest.1
 	dh_desktop
 	dh_strip
 	dh_compress

More information about the Pkg-games-commits mailing list