r11917 - in packages/trunk/bastet/debian: . patches po source
Nacho Barrientos Arias
nacho at alioth.debian.org
Sun Mar 13 20:38:16 UTC 2011
Author: nacho
Date: 2011-03-13 20:38:14 +0000 (Sun, 13 Mar 2011)
New Revision: 11917
Added:
packages/trunk/bastet/debian/bastet.config
packages/trunk/bastet/debian/bastet.install
packages/trunk/bastet/debian/bastet.manpages
packages/trunk/bastet/debian/bastet.templates
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/po/
packages/trunk/bastet/debian/po/POTFILES.in
packages/trunk/bastet/debian/po/templates.pot
packages/trunk/bastet/debian/source/
packages/trunk/bastet/debian/source/format
Removed:
packages/trunk/bastet/debian/install
packages/trunk/bastet/debian/manpages/
packages/trunk/bastet/debian/patches/01_Makefile.patch
packages/trunk/bastet/debian/patches/02_kFreeBSD_FTBFS_fix.patch
Modified:
packages/trunk/bastet/debian/changelog
packages/trunk/bastet/debian/compat
packages/trunk/bastet/debian/control
packages/trunk/bastet/debian/copyright
packages/trunk/bastet/debian/docs
packages/trunk/bastet/debian/patches/series
packages/trunk/bastet/debian/postinst
packages/trunk/bastet/debian/postrm
packages/trunk/bastet/debian/preinst
packages/trunk/bastet/debian/rules
Log:
Preparing Bastet 0.43-1
Added: packages/trunk/bastet/debian/bastet.config
===================================================================
--- packages/trunk/bastet/debian/bastet.config (rev 0)
+++ packages/trunk/bastet/debian/bastet.config 2011-03-13 20:38:14 UTC (rev 11917)
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+. /usr/share/debconf/confmodule
+
+oldscores=/var/games/bastet.scores
+
+if [ -e "$oldscores" ] ; then
+ db_text high bastet/score_file_compatibility || true
+ db_go
+fi
Added: packages/trunk/bastet/debian/bastet.install
===================================================================
--- packages/trunk/bastet/debian/bastet.install (rev 0)
+++ packages/trunk/bastet/debian/bastet.install 2011-03-13 20:38:14 UTC (rev 11917)
@@ -0,0 +1,2 @@
+bastet /usr/games/
+debian/*.desktop usr/share/applications/
Added: packages/trunk/bastet/debian/bastet.manpages
===================================================================
--- packages/trunk/bastet/debian/bastet.manpages (rev 0)
+++ packages/trunk/bastet/debian/bastet.manpages 2011-03-13 20:38:14 UTC (rev 11917)
@@ -0,0 +1 @@
+bastet.6
Added: packages/trunk/bastet/debian/bastet.templates
===================================================================
--- packages/trunk/bastet/debian/bastet.templates (rev 0)
+++ packages/trunk/bastet/debian/bastet.templates 2011-03-13 20:38:14 UTC (rev 11917)
@@ -0,0 +1,17 @@
+Template: bastet/score_file_compatibility
+Type: note
+_Description: Bastet score file format has changed
+ It seems that you have got an old-style score file installed on
+ your system located in '/var/games/bastet.scores'.
+ .
+ As of version 0.53 the score file format has changed.
+ As newer Bastet does not provide any compatibility layer with the
+ old format, your old score file is no longer valid.
+ .
+ To prevent data loss, the old score file has been
+ kept intact in its original location. From now on
+ it's your responsibility keep track of it, since this package
+ will no longer take care of it. If you don't mind losing your
+ old high scores, it's recommended to manually remove the file to
+ avoid cluttering your system with files not handled by the
+ package manager.
Modified: packages/trunk/bastet/debian/changelog
===================================================================
--- packages/trunk/bastet/debian/changelog 2011-03-13 13:09:31 UTC (rev 11916)
+++ packages/trunk/bastet/debian/changelog 2011-03-13 20:38:14 UTC (rev 11917)
@@ -1,9 +1,33 @@
-bastet (0.41-7) UNRELEASED; urgency=low
+bastet (0.43-1) unstable; urgency=low
[ Evgeni Golov ]
* Update watchfile.
+
+ [ Nacho Barrientos Arias ]
+ * New upstream release (closes: #563400).
+ - 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: moves a print statement to
+ only rant about the writability of the global score file if it does
+ not exist.
+ - Add 02_manpage_global_hiscore_path.patch: point to the correct
+ location of the global scores file.
+ * debian/control
+ - Add b-ds: libboost1.42-dev, libboot-program-options1.42-dev, po-debconf
+ - Bump debhelper compatibility level to 8.
+ * debian/docs
+ - No longer installing README-Petris.
+ * debian/copyright
+ - Remove information regarding Petris inheritance as it
+ no longer applies.
+ * debian/bastet.{config, templates}
+ - Add a simple Debconf note to warn about the new score file format.
- -- Nacho Barrientos Arias <nacho at debian.org> Tue, 26 May 2009 13:29:23 +0200
+ -- Nacho Barrientos Arias <nacho at debian.org> Sun, 13 Mar 2011 14:57:00 +0000
bastet (0.41-6) unstable; urgency=low
Modified: packages/trunk/bastet/debian/compat
===================================================================
--- packages/trunk/bastet/debian/compat 2011-03-13 13:09:31 UTC (rev 11916)
+++ packages/trunk/bastet/debian/compat 2011-03-13 20:38:14 UTC (rev 11917)
@@ -1 +1 @@
-5
+8
Modified: packages/trunk/bastet/debian/control
===================================================================
--- packages/trunk/bastet/debian/control 2011-03-13 13:09:31 UTC (rev 11916)
+++ packages/trunk/bastet/debian/control 2011-03-13 20:38:14 UTC (rev 11917)
@@ -3,15 +3,16 @@
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Nacho Barrientos Arias <nacho at debian.org>
-Build-Depends: debhelper (>= 5), libncurses5-dev | libncurses-dev, quilt (>= 0.40)
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 8), libncurses5-dev | libncurses-dev, libboost1.42-dev,
+ libboost-program-options1.42-dev, po-debconf
+Standards-Version: 3.9.1
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
Package: bastet
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Free clone of Tetris, featuring a bastard level
Bastet (stands for "bastard Tetris") is a free (GPL'd) clone of Tetris(r)
(built on the top of petris by Peter Seidler) which is designed to be
Modified: packages/trunk/bastet/debian/copyright
===================================================================
--- packages/trunk/bastet/debian/copyright 2011-03-13 13:09:31 UTC (rev 11916)
+++ packages/trunk/bastet/debian/copyright 2011-03-13 20:38:14 UTC (rev 11917)
@@ -3,9 +3,9 @@
It was downloaded from http://fph.altervista.org/prog/bastet.shtml
-Upstream Author: Federico Poloni <fph at ngi.it>
+Upstream Author: Federico Poloni <f.poloni at sns.it>
-Copyright (C) 2004 Federico Poloni <fph at ngi.it>
+Copyright (C) 2004-2011 Federico Poloni <f.poloni at sns.it>
License:
@@ -22,38 +22,7 @@
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'
-Bastet is built on top of Petris, a public-domain Tetris (R)
-clone by Peter Seidler <seidler at phys.au.dk> released under the
-next license terms:
-
- You can do whatever you want with the program, it's Public Domain.
- (however, it would be nice of you to credit me if you found anything
- of this useful).
- The above includes the permission to relicence the program under the
- MIT/X11 licence reproduced below:
-
----
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to
- deal in the Software without restriction, including without limitation the
- rights to use, copy, modify, merge, publish, distribute, and/or sell copies
- of the Software, and to permit persons to whom the Software is furnished to
- do so, provided that the above copyright notice(s) and this permission
- notice appear in all copies of the Software and that both the above
- copyright notice(s) and this permission notice appear in supporting
- documentation.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
- IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE
- LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR
- ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
- IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
----
-
The Debian packaging is (C)
2004-2006 David Moreno Garza <damog at damog.net>
- 2006-2007 Nacho Barrientos Arias <nacho at debian.org>
+ 2006-2011 Nacho Barrientos Arias <nacho at debian.org>
and is licensed under the GPL, see above.
Modified: packages/trunk/bastet/debian/docs
===================================================================
--- packages/trunk/bastet/debian/docs 2011-03-13 13:09:31 UTC (rev 11916)
+++ packages/trunk/bastet/debian/docs 2011-03-13 20:38:14 UTC (rev 11917)
@@ -1,2 +1,2 @@
README
-README-Petris
+NEWS
Deleted: packages/trunk/bastet/debian/install
===================================================================
--- packages/trunk/bastet/debian/install 2011-03-13 13:09:31 UTC (rev 11916)
+++ packages/trunk/bastet/debian/install 2011-03-13 20:38:14 UTC (rev 11917)
@@ -1 +0,0 @@
-debian/*.desktop usr/share/applications/
Deleted: packages/trunk/bastet/debian/patches/01_Makefile.patch
===================================================================
--- packages/trunk/bastet/debian/patches/01_Makefile.patch 2011-03-13 13:09:31 UTC (rev 11916)
+++ packages/trunk/bastet/debian/patches/01_Makefile.patch 2011-03-13 20:38:14 UTC (rev 11917)
@@ -1,40 +0,0 @@
-# 01_Makefile.patch
-# by:
-# David Moreno Garza <damog at damog.net>
-# Nacho Barrientos Arias <chipi at criptonita.com>
-#
-# Desc: Adding destdir and fixing some perms.
-
-Index: bastet-0.41/Makefile
-===================================================================
---- bastet-0.41.orig/Makefile 2004-10-19 19:54:58.000000000 +0200
-+++ bastet-0.41/Makefile 2008-01-27 15:55:35.000000000 +0100
-@@ -1,8 +1,8 @@
- #makefile for bastet (c) 2004 Federico Poloni
-
- #default paths
--BIN_PREFIX=/usr/bin/
--DATA_PREFIX=/var/games/
-+BIN_PREFIX=$(DESTDIR)/usr/games/
-+DATA_PREFIX=$(DESTDIR)/var/games/
- HISCORE=bastet.scores
-
- #in order to handle highscores properly, bastet must be setuid.
-@@ -11,7 +11,7 @@
- GAME_USER=games
-
- CC=gcc
--CFLAGS=-Wall -DHIGHSCORE_FILE=\"$(DATA_PREFIX)$(HISCORE)\"
-+CFLAGS=-Wall -DHIGHSCORE_FILE=\"$(DATA_PREFIX)$(HISCORE)\" $(DEBCFLAGS)
- LDFLAGS=-lncurses
- SOURCES=main.c game.c highscore.c bast.c
- EXNAME=bastet
-@@ -39,8 +39,3 @@
-
- install: $(EXNAME)
- cp $(EXNAME) $(BIN_PREFIX)
-- chown $(GAME_USER) $(BIN_PREFIX)$(EXNAME)
-- chmod u+s $(BIN_PREFIX)$(EXNAME)
-- touch $(DATA_PREFIX)$(HISCORE)
-- chown $(GAME_USER) $(DATA_PREFIX)$(HISCORE)
-- chmod 644 $(DATA_PREFIX)$(HISCORE)
Added: packages/trunk/bastet/debian/patches/01_local_hiscores_file_check.patch
===================================================================
--- packages/trunk/bastet/debian/patches/01_local_hiscores_file_check.patch (rev 0)
+++ packages/trunk/bastet/debian/patches/01_local_hiscores_file_check.patch 2011-03-13 20:38:14 UTC (rev 11917)
@@ -0,0 +1,13 @@
+--- a/Config.cpp
++++ b/Config.cpp
+@@ -76,9 +76,8 @@
+
+ //falls back to the user-specific file
+ string s=string(getenv("HOME"))+LocalHighScoresFileName;
+- cerr<<boost::str(boost::format("bastet: using a user-specific high scores file: %1%\nas the global high scores file %2% is not writable\n") % s % GlobalHighScoresFileName);
+-
+ if(result.empty()){
++ cerr<<boost::str(boost::format("bastet: using a user-specific high scores file: %1%\nas the global high scores file %2% is not writable\n") % s % GlobalHighScoresFileName);
+ fstream ofs2(s.c_str());
+ if(!ofs2.fail()){
+
Deleted: packages/trunk/bastet/debian/patches/02_kFreeBSD_FTBFS_fix.patch
===================================================================
--- packages/trunk/bastet/debian/patches/02_kFreeBSD_FTBFS_fix.patch 2011-03-13 13:09:31 UTC (rev 11916)
+++ packages/trunk/bastet/debian/patches/02_kFreeBSD_FTBFS_fix.patch 2011-03-13 20:38:14 UTC (rev 11917)
@@ -1,21 +0,0 @@
-# 02_kFreeBSD_FTBFS_fix.patch
-# by:
-# Robert Millan <rmh at aybabtu.com>
-# David Moreno Garza <damog at damog.net>
-# Nacho Barrientos Arias <chipi at criptonita.com>
-#
-# Desc: Fixes #316921.
-
-Index: bastet-0.41/bast.c
-===================================================================
---- bastet-0.41.orig/bast.c 2007-07-09 21:13:21.000000000 +0200
-+++ bastet-0.41/bast.c 2007-07-09 21:13:33.000000000 +0200
-@@ -1,7 +1,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <ncurses.h>
--#include <termio.h>
-+#include <termios.h>
- #include <assert.h>
- #include <unistd.h>
- #include <string.h>
Added: packages/trunk/bastet/debian/patches/02_manpage_global_hiscore_path.patch
===================================================================
--- packages/trunk/bastet/debian/patches/02_manpage_global_hiscore_path.patch (rev 0)
+++ packages/trunk/bastet/debian/patches/02_manpage_global_hiscore_path.patch 2011-03-13 20:38:14 UTC (rev 11917)
@@ -0,0 +1,11 @@
+--- a/bastet.6
++++ b/bastet.6
+@@ -39,7 +39,7 @@
+ .I $(HOME)/.bastetscores
+ User-specific high scores file (used only if the system high scores file is unavailable)
+
+-.I /var/games/bastet.scores
++.I /var/games/bastet.scores2
+ System-wide high scores for bastet.
+
+ .SH OPTIONS
Modified: packages/trunk/bastet/debian/patches/series
===================================================================
--- packages/trunk/bastet/debian/patches/series 2011-03-13 13:09:31 UTC (rev 11916)
+++ packages/trunk/bastet/debian/patches/series 2011-03-13 20:38:14 UTC (rev 11917)
@@ -1,2 +1,2 @@
-01_Makefile.patch -p1
-02_kFreeBSD_FTBFS_fix.patch -p1
+01_local_hiscores_file_check.patch
+02_manpage_global_hiscore_path.patch
Added: packages/trunk/bastet/debian/po/POTFILES.in
===================================================================
--- packages/trunk/bastet/debian/po/POTFILES.in (rev 0)
+++ packages/trunk/bastet/debian/po/POTFILES.in 2011-03-13 20:38:14 UTC (rev 11917)
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] bastet.templates
Added: packages/trunk/bastet/debian/po/templates.pot
===================================================================
--- packages/trunk/bastet/debian/po/templates.pot (rev 0)
+++ packages/trunk/bastet/debian/po/templates.pot 2011-03-13 20:38:14 UTC (rev 11917)
@@ -0,0 +1,52 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: bastet at packages.debian.org\n"
+"POT-Creation-Date: 2011-03-13 19:35+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: note
+#. Description
+#: ../bastet.templates:1001
+msgid "Bastet score file format has changed"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../bastet.templates:1001
+msgid ""
+"It seems that you have got an old-style score file installed on your system "
+"located in '/var/games/bastet.scores'."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../bastet.templates:1001
+msgid ""
+"As of version 0.53 the score file format has changed. As newer Bastet does "
+"not provide any compatibility layer with the old format, your old score file "
+"is no longer valid."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../bastet.templates:1001
+msgid ""
+"To prevent data loss, the old score file has been kept intact in its "
+"original location. From now on it's your responsibility keep track of it, "
+"since this package will no longer take care of it. If you don't mind losing "
+"your old high scores, it's recommended to manually remove the file to avoid "
+"cluttering your system with files not handled by the package manager."
+msgstr ""
Modified: packages/trunk/bastet/debian/postinst
===================================================================
--- packages/trunk/bastet/debian/postinst 2011-03-13 13:09:31 UTC (rev 11916)
+++ packages/trunk/bastet/debian/postinst 2011-03-13 20:38:14 UTC (rev 11917)
@@ -1,14 +1,16 @@
#! /bin/sh
# postinst script for bastet
+
set -e
-scores=/var/games/bastet.scores
+scores=/var/games/bastet.scores2
+oldscores=/var/games/bastet.scores
# old version of bastet (< 0.41-6) will remove high score file
# on upgrade, so rescue it
-if $(dpkg --compare-versions "$2" lt-nl 0.41-6) && [ -e "$scores.tmp" ] ; then
- mv "$scores.tmp" "$scores"
+if $(dpkg --compare-versions "$2" lt-nl 0.41-6) && [ -e "$oldscores.tmp" ] ; then
+ mv "$oldscores.tmp" "$oldscores"
fi
if [ ! -e "$scores" ] ; then
@@ -17,6 +19,8 @@
chmod 664 "$scores"
fi
+. /usr/share/debconf/confmodule
+
#DEBHELPER#
exit 0
Modified: packages/trunk/bastet/debian/postrm
===================================================================
--- packages/trunk/bastet/debian/postrm 2011-03-13 13:09:31 UTC (rev 11916)
+++ packages/trunk/bastet/debian/postrm 2011-03-13 20:38:14 UTC (rev 11917)
@@ -4,7 +4,7 @@
set -e
if [ "$1" = purge ] ; then
- rm -f /var/games/bastet.scores
+ rm -f /var/games/bastet.scores2
fi
#DEBHELPER#
Modified: packages/trunk/bastet/debian/preinst
===================================================================
--- packages/trunk/bastet/debian/preinst 2011-03-13 13:09:31 UTC (rev 11916)
+++ packages/trunk/bastet/debian/preinst 2011-03-13 20:38:14 UTC (rev 11917)
@@ -3,14 +3,14 @@
set -e
-scores=/var/games/bastet.scores
+oldscores=/var/games/bastet.scores
case "$1" in
install|upgrade)
# old version of bastet (< 0.41-6) will remove high score file
# on upgrade, so rescue it
- if $(dpkg --compare-versions "$2" lt-nl 0.41-6) && [ -e "$scores" ] ; then
- cp -p "$scores" "$scores.tmp"
+ if $(dpkg --compare-versions "$2" lt-nl 0.41-6) && [ -e "$oldscores" ] ; then
+ cp -p "$oldscores" "$oldscores.tmp"
fi
;;
esac
Modified: packages/trunk/bastet/debian/rules
===================================================================
--- packages/trunk/bastet/debian/rules 2011-03-13 13:09:31 UTC (rev 11916)
+++ packages/trunk/bastet/debian/rules 2011-03-13 20:38:14 UTC (rev 11917)
@@ -7,14 +7,9 @@
else
DEBCFLAGS += -O2
endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-include /usr/share/quilt/quilt.make
-
configure: configure-stamp
-configure-stamp: patch
+configure-stamp:
dh_testdir
touch configure-stamp
@@ -22,22 +17,23 @@
build-stamp: configure-stamp
dh_testdir
- $(MAKE) DEBCFLAGS="$(DEBCFLAGS)"
+ $(MAKE) CXXFLAGS="$(DEBCXXFLAGS)"
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
-$(MAKE) mrproper
+ rm -r depend
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
- dh_installdirs
- $(MAKE) install DESTDIR=$(CURDIR)/debian/bastet
+ dh_prep
+ chgrp games bastet
+ chmod g+s bastet
binary-indep: build install
@@ -47,11 +43,10 @@
dh_installchangelogs
dh_installdocs
dh_installdirs
- chown root.games debian/bastet/usr/games/bastet
- chmod 2755 debian/bastet/usr/games/bastet
dh_install
- dh_installman debian/manpages/bastet.6
+ dh_installman
dh_installmenu
+ dh_installdebconf
dh_strip
dh_compress
dh_fixperms -Xusr/games/bastet
Added: packages/trunk/bastet/debian/source/format
===================================================================
--- packages/trunk/bastet/debian/source/format (rev 0)
+++ packages/trunk/bastet/debian/source/format 2011-03-13 20:38:14 UTC (rev 11917)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-games-commits
mailing list