Author: apo-guest Date: 2014-04-29 15:45:35 +0000 (Tue, 29 Apr 2014) New Revision: 15053
Added: packages/trunk/bastet/debian/icons/ packages/trunk/bastet/debian/icons/bastet.png packages/trunk/bastet/debian/icons/bastet.xpm packages/trunk/bastet/debian/po/it.po packages/trunk/bastet/debian/po/ja.po packages/trunk/bastet/debian/source/include-binaries Modified: packages/trunk/bastet/debian/bastet.config packages/trunk/bastet/debian/bastet.desktop packages/trunk/bastet/debian/bastet.install packages/trunk/bastet/debian/changelog packages/trunk/bastet/debian/compat packages/trunk/bastet/debian/control packages/trunk/bastet/debian/copyright packages/trunk/bastet/debian/menu packages/trunk/bastet/debian/patches/01_local_hiscores_file_check.patch packages/trunk/bastet/debian/patches/02_manpage_global_hiscore_path.patch packages/trunk/bastet/debian/rules Log: Debian release 0.43-3 Modified: packages/trunk/bastet/debian/bastet.config =================================================================== --- packages/trunk/bastet/debian/bastet.config 2014-04-29 15:44:20 UTC (rev 15052) +++ packages/trunk/bastet/debian/bastet.config 2014-04-29 15:45:35 UTC (rev 15053) @@ -1,4 +1,5 @@ -#!/bin/sh -e +#!/bin/sh +set -e . /usr/share/debconf/confmodule Modified: packages/trunk/bastet/debian/bastet.desktop =================================================================== --- packages/trunk/bastet/debian/bastet.desktop 2014-04-29 15:44:20 UTC (rev 15052) +++ packages/trunk/bastet/debian/bastet.desktop 2014-04-29 15:45:35 UTC (rev 15053) @@ -4,7 +4,9 @@ Name=Bastard Tetris GenericName=bastet Comment=Go mad with this Tetris clone +Comment[de]=Ein Tetris-Klon zum Verrücktwerden Exec=bastet Icon=bastet Terminal=true Categories=Game;BlocksGame; +Keywords=tetris;console;terminal;ncurses;bastard;algorithm; Modified: packages/trunk/bastet/debian/bastet.install =================================================================== --- packages/trunk/bastet/debian/bastet.install 2014-04-29 15:44:20 UTC (rev 15052) +++ packages/trunk/bastet/debian/bastet.install 2014-04-29 15:45:35 UTC (rev 15053) @@ -1,2 +1,4 @@ bastet /usr/games/ debian/*.desktop usr/share/applications/ +debian/icons/bastet.png usr/share/icons/hicolor/96x96/apps +debian/icons/bastet.xpm usr/share/pixmaps Modified: packages/trunk/bastet/debian/changelog =================================================================== --- packages/trunk/bastet/debian/changelog 2014-04-29 15:44:20 UTC (rev 15052) +++ packages/trunk/bastet/debian/changelog 2014-04-29 15:45:35 UTC (rev 15053) @@ -1,3 +1,25 @@ +bastet (0.43-3) unstable; urgency=medium + + * Team upload. + * bastet.config: Use set -e in the script's body. + * bastet.desktop: Add keywords and a comment in German. + * Declare compliance with Debian policy 3.9.5. + * Use compat level 9 and require debhelper >= 9. + * wrap-and-sort -sa. + * Simplify debian/rules by using dh sequencer. + * menu: Add longtitle and icon entry. + * debian/copyright: Fix copyright-refers-to-symlink-license. + * Add DEP-3 headers to patches. + * [Debconf translation updates] Thanks to + - Italian (Beatrice Torracca) (Closes: #659385) + - Japanese (victory) (Closes: #692840) + * Add bastet.png and bastet.xpm icon. (Closes: #726210) + + [ Evgenis Golov ] + * Correct Vcs-* URLs to point to anonscm.debian.org. + + -- Markus Koschany <[email protected]> Tue, 29 Apr 2014 17:39:47 +0200 + bastet (0.43-2.1) unstable; urgency=low * Non-maintainer upload. @@ -30,17 +52,17 @@ [ Evgeni Golov ] * Update watchfile. - + [ Nacho Barrientos Arias ] * New upstream release (closes: #563400). - - Now it doesn't ftbfs with binutils-gold out of the box. + - Now it doesn't ftbfs with binutils-gold out of the box. (closes: #612176). * Switch to dpkg-source 3.0 (quilt) format. * debian/patches - Drop 01_Makefile (no longer necessary). - Drop 02_kFreeBSD_FTBFS_fix (no longer necessary). - Add 01_local_hiscores_file_check.patch: only print "using a - user-specific high scores file" if the global scores file is + user-specific high scores file" if the global scores file is not writable. - Add 02_manpage_global_hiscore_path.patch: point to the correct location of the global scores file. Modified: packages/trunk/bastet/debian/compat =================================================================== --- packages/trunk/bastet/debian/compat 2014-04-29 15:44:20 UTC (rev 15052) +++ packages/trunk/bastet/debian/compat 2014-04-29 15:45:35 UTC (rev 15053) @@ -1 +1 @@ -8 +9 Modified: packages/trunk/bastet/debian/control =================================================================== --- packages/trunk/bastet/debian/control 2014-04-29 15:44:20 UTC (rev 15052) +++ packages/trunk/bastet/debian/control 2014-04-29 15:45:35 UTC (rev 15053) @@ -2,17 +2,24 @@ Section: games Priority: optional Maintainer: Debian Games Team <[email protected]> -Uploaders: Nacho Barrientos Arias <[email protected]> -Build-Depends: debhelper (>= 8), libncurses5-dev | libncurses-dev, libboost-dev, - libboost-program-options-dev, po-debconf -Standards-Version: 3.9.1 +Uploaders: + Nacho Barrientos Arias <[email protected]> +Build-Depends: + debhelper (>= 9), + libboost-dev, + libboost-program-options-dev, + libncurses5-dev | libncurses-dev, + po-debconf +Standards-Version: 3.9.5 Homepage: http://fph.altervista.org/prog/bastet.shtml -Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/bastet/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/bastet/?op=log +Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/bastet/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/bastet/ Package: bastet Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: + ${misc:Depends}, + ${shlibs:Depends} Description: ncurses Tetris clone with a bastard algorithm Bastet ("bastard Tetris") is a free clone of Tetris which tries to compute how useful blocks are and gives you the worst possible brick. Modified: packages/trunk/bastet/debian/copyright =================================================================== --- packages/trunk/bastet/debian/copyright 2014-04-29 15:44:20 UTC (rev 15052) +++ packages/trunk/bastet/debian/copyright 2014-04-29 15:45:35 UTC (rev 15053) @@ -20,9 +20,12 @@ GNU General Public License for more details. On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL' +Public License can be found in `/usr/share/common-licenses/GPL-2' -The Debian packaging is (C) +The Debian packaging is copyright 2004-2006 David Moreno Garza <[email protected]> - 2006-2011 Nacho Barrientos Arias <[email protected]> -and is licensed under the GPL, see above. + 2006-2011 Nacho Barrientos Arias <[email protected]> + 2011, Bruno "Fuddl" Kleinert <[email protected]> + 2011, Christian Perrier <[email protected]> + 2014, Markus Koschany <[email protected]> +and is licensed under the GPL-2, see above. Added: packages/trunk/bastet/debian/icons/bastet.png =================================================================== (Binary files differ) Property changes on: packages/trunk/bastet/debian/icons/bastet.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: packages/trunk/bastet/debian/icons/bastet.xpm =================================================================== --- packages/trunk/bastet/debian/icons/bastet.xpm (rev 0) +++ packages/trunk/bastet/debian/icons/bastet.xpm 2014-04-29 15:45:35 UTC (rev 15053) @@ -0,0 +1,80 @@ +/* XPM */ +static char *bastet[] = { +/* columns rows colors chars-per-pixel */ +"32 32 42 1 ", +" c #27353F", +". c #28353F", +"X c #2E353F", +"o c #30353E", +"O c #37353E", +"+ c #38353E", +"@ c #3D353D", +"# c #43353D", +"$ c #47353C", +"% c #48353C", +"& c #4A353C", +"* c #4C353C", +"= c #51353B", +"- c #59343B", +"; c #5D343A", +": c #60343A", +"> c #62343A", +", c #733438", +"< c #033642", +"1 c #043440", +"2 c #073642", +"3 c #0A3642", +"4 c #0C3642", +"5 c #133641", +"6 c #163641", +"7 c #193640", +"8 c #1C3640", +"9 c #1F3640", +"0 c #213640", +"q c #456669", +"w c #813437", +"e c #903336", +"r c #913336", +"t c #943335", +"y c #AB3333", +"u c #DC322F", +"i c #DD322F", +"p c #C33231", +"a c #C73231", +"s c #CC3230", +"d c #E0322F", +"f c #E4322E", +/* pixels */ +"22222222222222222222222222222222", +"22222222222222222222222222222222", +"22222222222222222232222222222222", +"2 7X332234o4226.25@323232 622222", +"2#%%+*X .X,8<20>@6$3O$.#+@X 6022", +"<+#;>-O%%5%5220@@0$4$.=+5$;83622", +"2 7o+#8. 5OX226=#7*5o%.#+X 6822", +"22222322222322232232332333222222", +"22222222222222222222222222222222", +"22222222222222222222222222222222", +"22222222222222222222222222222222", +"22222222222222222222222222222222", +"22222222222222222222222222222222", +"222222222;trrrrrrrrw622222222222", +"222222222rfddidddiia022222222222", +"222222222rdiiiiiiiia822222222222", +"222222223rdiiiuuiuip022222222222", +"222222222tfiiiiuiiip7<<<<2222222", +"222222222:rrrryiiiia>====0222222", +"22222222222222=uiiiiuiiuu=<22222", +"2222222222222<=uuuuuuuuuu=<22222", +"2222222222222<=iuuuuuuuiu=<22222", +"2222222222222<=iiiiiiiiii=<22222", +"22222222222222&pppapppppa$<22222", +"2222222222222238 888 88885222222", +"22222222222222222<222<3222222222", +"22222222222222222222222222222222", +"22222222222222222222222222222222", +"22222222222222222222222222222222", +"22222222222222222222222222222222", +"111111111111111111111111111111<2", +"qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq" +}; Modified: packages/trunk/bastet/debian/menu =================================================================== --- packages/trunk/bastet/debian/menu 2014-04-29 15:44:20 UTC (rev 15052) +++ packages/trunk/bastet/debian/menu 2014-04-29 15:45:35 UTC (rev 15053) @@ -2,4 +2,6 @@ needs="text"\ section="Games/Blocks"\ title="Bastet"\ - command="/usr/games/bastet" + longtitle="Bastet - ncurses Tetris clone with a bastard algorithm"\ + command="/usr/games/bastet"\ + icon="/usr/share/pixmaps/bastet.xpm" Modified: packages/trunk/bastet/debian/patches/01_local_hiscores_file_check.patch =================================================================== --- packages/trunk/bastet/debian/patches/01_local_hiscores_file_check.patch 2014-04-29 15:44:20 UTC (rev 15052) +++ packages/trunk/bastet/debian/patches/01_local_hiscores_file_check.patch 2014-04-29 15:45:35 UTC (rev 15053) @@ -1,6 +1,16 @@ +From: Debian Games Team <[email protected]> +Date: Tue, 29 Apr 2014 01:45:52 +0200 +Subject: 01_local_hiscores_file_check + +--- + Config.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Config.cpp b/Config.cpp +index 1e4498a..4584721 100644 --- a/Config.cpp +++ b/Config.cpp -@@ -76,9 +76,8 @@ +@@ -76,9 +76,8 @@ namespace Bastet{ //falls back to the user-specific file string s=string(getenv("HOME"))+LocalHighScoresFileName; Modified: packages/trunk/bastet/debian/patches/02_manpage_global_hiscore_path.patch =================================================================== --- packages/trunk/bastet/debian/patches/02_manpage_global_hiscore_path.patch 2014-04-29 15:44:20 UTC (rev 15052) +++ packages/trunk/bastet/debian/patches/02_manpage_global_hiscore_path.patch 2014-04-29 15:45:35 UTC (rev 15053) @@ -1,6 +1,16 @@ +From: Debian Games Team <[email protected]> +Date: Tue, 29 Apr 2014 01:45:52 +0200 +Subject: 02_manpage_global_hiscore_path + +--- + bastet.6 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bastet.6 b/bastet.6 +index 5bbcc8f..9dcf32e 100644 --- a/bastet.6 +++ b/bastet.6 -@@ -39,7 +39,7 @@ +@@ -39,7 +39,7 @@ User options .I $(HOME)/.bastetscores User-specific high scores file (used only if the system high scores file is unavailable) Added: packages/trunk/bastet/debian/po/it.po =================================================================== --- packages/trunk/bastet/debian/po/it.po (rev 0) +++ packages/trunk/bastet/debian/po/it.po 2014-04-29 15:45:35 UTC (rev 15053) @@ -0,0 +1,46 @@ +# Italian translation of bastet debconf messages. +# Copyright (C) 2012, bastet package copyright holder. +# This file is distributed under the same license as the bastet package. +# Beatrice Torracca <[email protected]>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: bastet 0.43-2.1\n" +"Report-Msgid-Bugs-To: [email protected]\n" +"POT-Creation-Date: 2011-04-15 08:24+0200\n" +"PO-Revision-Date: 2012-02-03 14:22+0100\n" +"Last-Translator: Beatrice Torracca <[email protected]>\n" +"Language-Team: Italiano <[email protected]>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1)\n" + +#. Type: boolean +#. Description +#: ../bastet.templates:2001 +msgid "Remove old-format Bastet highscores file?" +msgstr "Rimuovere il file dei punteggi di Bastet nel vecchio formato?" + +#. Type: boolean +#. Description +#: ../bastet.templates:2001 +msgid "" +"The new version of Bastet cannot read highscores files in the old format, " +"like the one at /var/games/bastet.scores." +msgstr "" +"La nuova versione di Bastet non è in grado di leggere i file dei punteggi " +"nel vecchio formato, come quello in /var/games/bastet.scores." + +#. Type: boolean +#. Description +#: ../bastet.templates:2001 +msgid "" +"You can decide to remove the old scores file now. If you leave it on the " +"system it will be ignored by Bastet and will no longer be tracked by the " +"package management system." +msgstr "" +"Si può decidere di rimuovere il vecchio file dei punteggi adesso. Se lo si " +"lascia nel sistema, Bastet lo ignorerà e il sistema di gestione dei " +"pacchetti non ne terrà più conto." Added: packages/trunk/bastet/debian/po/ja.po =================================================================== --- packages/trunk/bastet/debian/po/ja.po (rev 0) +++ packages/trunk/bastet/debian/po/ja.po 2014-04-29 15:45:35 UTC (rev 15053) @@ -0,0 +1,44 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# victory <[email protected]>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: bastet\n" +"Report-Msgid-Bugs-To: [email protected]\n" +"POT-Creation-Date: 2012-06-16 14:41+0000\n" +"PO-Revision-Date: 2012-06-16 23:41+0900\n" +"Last-Translator: victory <[email protected]>\n" +"Language-Team: Japanese <[email protected]>\n" +"Language: ja\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../bastet.templates:2001 +msgid "Remove old-format Bastet highscores file?" +msgstr "古い形式の Bastet 最高得点ファイルを削除しますか?" + +#. Type: boolean +#. Description +#: ../bastet.templates:2001 +msgid "" +"The new version of Bastet cannot read highscores files in the old format, " +"like the one at /var/games/bastet.scores." +msgstr "" +"新しいバージョンの Bastet は /var/games/bastet.scores にあるような古い形式の" +"最高得点ファイルを読めません。" + +#. Type: boolean +#. Description +#: ../bastet.templates:2001 +msgid "" +"You can decide to remove the old scores file now. If you leave it on the " +"system it will be ignored by Bastet and will no longer be tracked by the " +"package management system." +msgstr "" +"古い得点の削除をここで決めることができます。システム上に残して置いた場合、" +"Bastet は無視し、パッケージ管理システムによる追跡も行われません。" Modified: packages/trunk/bastet/debian/rules =================================================================== --- packages/trunk/bastet/debian/rules 2014-04-29 15:44:20 UTC (rev 15052) +++ packages/trunk/bastet/debian/rules 2014-04-29 15:45:35 UTC (rev 15053) @@ -1,60 +1,13 @@ #!/usr/bin/make -f -DEBCXXFLAGS = -g +%: + dh $@ -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - DEBCXXFLAGS += -O0 -else - DEBCXXFLAGS += -O2 -endif - -configure: configure-stamp -configure-stamp: - dh_testdir - touch configure-stamp - -build: build-stamp - -build-stamp: configure-stamp - dh_testdir - $(MAKE) CXXFLAGS="$(DEBCXXFLAGS)" - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - -$(MAKE) mrproper - rm -f depend - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - chgrp games bastet - chmod g+s bastet - -binary-indep: build install - -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installdirs - dh_install - dh_installman - dh_installmenu - dh_installdebconf - dh_strip - dh_compress +override_dh_fixperms: dh_fixperms -Xusr/games/bastet - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb + chgrp games debian/bastet/usr/games/bastet + chmod g+s debian/bastet/usr/games/bastet -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +override_dh_auto_clean: + -$(MAKE) mrproper + $(RM) depend Added: packages/trunk/bastet/debian/source/include-binaries =================================================================== --- packages/trunk/bastet/debian/source/include-binaries (rev 0) +++ packages/trunk/bastet/debian/source/include-binaries 2014-04-29 15:45:35 UTC (rev 15053) @@ -0,0 +1 @@ +debian/icons/bastet.png _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
