r15176 - in packages/trunk/powermanga/debian: . patches source
Markus Koschany
apo-guest at moszumanska.debian.org
Tue Sep 2 14:20:19 UTC 2014
Author: apo-guest
Date: 2014-09-02 14:20:19 +0000 (Tue, 02 Sep 2014)
New Revision: 15176
Added:
packages/trunk/powermanga/debian/patches/desktop-file.patch
packages/trunk/powermanga/debian/patches/manpage.patch
packages/trunk/powermanga/debian/patches/segmentation-fault-about_en.patch
packages/trunk/powermanga/debian/patches/support-custom-CFLAGS.patch
packages/trunk/powermanga/debian/powermanga-data.doc-base
packages/trunk/powermanga/debian/powermanga-data.docs
packages/trunk/powermanga/debian/powermanga-data.install
packages/trunk/powermanga/debian/powermanga.install
packages/trunk/powermanga/debian/powermanga.links
packages/trunk/powermanga/debian/source/
packages/trunk/powermanga/debian/source/format
Removed:
packages/trunk/powermanga/debian/README.source
packages/trunk/powermanga/debian/patches/005_link_libm.diff
packages/trunk/powermanga/debian/patches/010_scoredir_path.diff
packages/trunk/powermanga/debian/patches/020_copyright.diff
packages/trunk/powermanga/debian/patches/030_manpage_typo.diff
packages/trunk/powermanga/debian/powermanga-data.dirs
packages/trunk/powermanga/debian/powermanga-data.preinst
packages/trunk/powermanga/debian/powermanga.desktop
packages/trunk/powermanga/debian/powermanga.dirs
packages/trunk/powermanga/debian/powermanga.xpm
Modified:
packages/trunk/powermanga/debian/changelog
packages/trunk/powermanga/debian/compat
packages/trunk/powermanga/debian/control
packages/trunk/powermanga/debian/copyright
packages/trunk/powermanga/debian/patches/series
packages/trunk/powermanga/debian/powermanga.menu
packages/trunk/powermanga/debian/powermanga.postinst
packages/trunk/powermanga/debian/powermanga.postrm
packages/trunk/powermanga/debian/rules
packages/trunk/powermanga/debian/watch
Log:
Debian release 0.92-1
Deleted: packages/trunk/powermanga/debian/README.source
===================================================================
--- packages/trunk/powermanga/debian/README.source 2014-09-01 21:03:49 UTC (rev 15175)
+++ packages/trunk/powermanga/debian/README.source 2014-09-02 14:20:19 UTC (rev 15176)
@@ -1,58 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
- for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
- if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
- export QUILT_PATCHES=debian/patches
- break
- fi
- done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
- quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
- quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches. Then, for every file that will be modified by this patch,
-run:
-
- quilt add <file>
-
-before editing those files. You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly. After editing the files, run:
-
- quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
- quilt import -P <patch> /path/to/patch
- quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches. The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
- quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
Modified: packages/trunk/powermanga/debian/changelog
===================================================================
--- packages/trunk/powermanga/debian/changelog 2014-09-01 21:03:49 UTC (rev 15175)
+++ packages/trunk/powermanga/debian/changelog 2014-09-02 14:20:19 UTC (rev 15176)
@@ -1,9 +1,59 @@
-powermanga (0.90-dfsg-3) UNRELEASED; urgency=low
+powermanga (0.92-1) unstable; urgency=medium
- * Correct Vcs-* URLs to point to anonscm.debian.org
+ * Imported Upstream version 0.92. (Closes: #734438)
+ - Fixes random segfaults in powermanga.
+ (Closes: #478213) (LP: #1264677)
+ * Add myself to Uploaders.
+ * Switch to source format 3.0 (quilt).
+ * Use compat level 9 and require debhelper >= 9
+ * wrap-and-sort -sa.
+ * Switch to dh sequencer and simplify debian/rules.
+ * Build with parallel and dh-autoreconf. (Closes: #727946)
+ * debian/patches:
+ - Drop 005_link_libm.diff.
+ The new upstream version links explicitly against libm.
+ Thanks to Julian Taylor for the patch. (Closes: #632945)
+ - Drop 020_copyright.diff. Fixed upstream.
+ - Drop 030_manpage_typo.diff. Fixed upstream.
+ - Drop 010_scoredir_path.diff. Fixed upstream
+ - Add desktop-file.patch. Add keywords and a comment in German.
+ - Add manpage.patch. Fullscreen mode can be enabled by using the
+ --fullscreen option not --full.
+ - Add support-custom-CFLAGS.patch. Pass all hardening options from
+ dpkg-buildflags to the build.
+ - Add segmentation-fault-about_en.patch: (Closes: #760146)
+ Fix a segfault in the English About menu. Thanks to Bruno Ethvignot.
+ * debian/control:
+ - Remove versioned dependency for libsdl1.2-dev. It is trivially satisfied.
+ - Remove build-dependency on quilt. Source format 3.0 uses quilt by
+ default.
+ - Declare compliance with Debian Policy 3.9.5.
+ - Remove Conflicts field for suidmanager. Obsolete.
+ - Add dh-autoreconf to Build-Depends.
+ * Drop *.dirs files. Not needed anymore.
+ * Drop powermanga-data.preinst. Obsolete.
+ * Delete debian/powermanaga.desktop. Use the one provided by upstream
+ instead.
+ * Drop README.source. We use source format 3.0 now.
+ * Delete debian/powermanga.xpm. Use the icon from upstream instead.
+ * Use install files instead of dh_install commands in debian/rules.
+ * Add longtitle to powermanga.menu.
+ * Add powermanga.links and link powermanga-data's doc directory to powermanga.
+ * Update debian/copyright to copyright format 1.0.
+ * debian/watch: Make the extension regex more flexible.
+ * Install html documentation to /usr/share/doc/powermanga-data.
+ (Closes: #525602)
+ * Register documentation with doc-base.
+ * Remove duplicate images from documentation. Use rdfind and symlinks to
+ reduce the duplication.
+ * Clean up postinst and postrm script and remove obsolete code. Remove
+ hi-score files only when purging the package.
- -- Evgeni Golov <evgeni at debian.org> Mon, 15 Jul 2013 22:21:58 +0200
+ [Evgeni Golov ]
+ * Correct Vcs-* URLs to point to anonscm.debian.org.
+ -- Markus Koschany <apo at gambaru.de> Tue, 02 Sep 2014 16:02:25 +0200
+
powermanga (0.90-dfsg-2) unstable; urgency=low
[ Cyril Brulebois ]
Modified: packages/trunk/powermanga/debian/compat
===================================================================
--- packages/trunk/powermanga/debian/compat 2014-09-01 21:03:49 UTC (rev 15175)
+++ packages/trunk/powermanga/debian/compat 2014-09-02 14:20:19 UTC (rev 15176)
@@ -1 +1 @@
-5
+9
Modified: packages/trunk/powermanga/debian/control
===================================================================
--- packages/trunk/powermanga/debian/control 2014-09-01 21:03:49 UTC (rev 15175)
+++ packages/trunk/powermanga/debian/control 2014-09-02 14:20:19 UTC (rev 15176)
@@ -2,17 +2,33 @@
Section: games
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>
-Build-Depends: debhelper (>= 5.0), quilt, libx11-dev, libxext-dev, libxxf86dga-dev, libxxf86vm-dev, libsdl1.2-dev (>= 1.2.2-3.1), libsdl-mixer1.2-dev, zlib1g-dev
-Standards-Version: 3.8.3
+Uploaders:
+ Sam Hocevar <sho at debian.org>,
+ Barry deFreese <bdefreese at debian.org>,
+ Markus Koschany <apo at gambaru.de>
+Build-Depends:
+ debhelper (>= 9),
+ dh-autoreconf,
+ libsdl-mixer1.2-dev,
+ libsdl1.2-dev,
+ libx11-dev,
+ libxext-dev,
+ libxxf86dga-dev,
+ libxxf86vm-dev,
+ rdfind,
+ symlinks,
+ zlib1g-dev
+Standards-Version: 3.9.5
Homepage: http://linux.tlk.fr/games/Powermanga/
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/powermanga/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/powermanga/
Package: powermanga
Architecture: any
-Depends: powermanga-data (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: suidmanager (<< 0.50)
+Depends:
+ powermanga-data (>= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: vertical shoot 'em up with colourful 3D graphics
Powermanga is a shoot 'em up with 60 different enemies, 40 meteors, numerous
weapons, many end of level baddies, spaceship power-ups and lots of other
@@ -20,7 +36,8 @@
Package: powermanga-data
Architecture: all
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends}
Description: graphics and audio data for powermanga
Powermanga is a shoot 'em up with 60 different enemies, 40 meteors, numerous
weapons, many end of level baddies, spaceship power-ups and lots of other
Modified: packages/trunk/powermanga/debian/copyright
===================================================================
--- packages/trunk/powermanga/debian/copyright 2014-09-01 21:03:49 UTC (rev 15175)
+++ packages/trunk/powermanga/debian/copyright 2014-09-02 14:20:19 UTC (rev 15176)
@@ -1,20 +1,32 @@
-This package was debianized by Sam Hocevar <sho at debian.org> on
-Wed, 29 Nov 2000 04:36:47 +0100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Powermanga
+Source: http://linux.tlk.fr/games/Powermanga/download/
-It was downloaded from http://www.tlk.fr/jeu.php?ref=powli
+Files: *
+Copyright: 1998-2014, TLK Games
+ Jean-Michel Martin <jmm at tlk.fr>
+ Bruno Ethvignot <bruno at tlk.fr>
+ André Majorel <amajorel at teaser.fr>
+ David Igreja <david at tlk.fr>
+ Michel Dogniaux <ldream at caramail.com>
+ Emmanuel Founaud
+ Sam Hocevar <sam at hocevar.net>
+License: GPL-3+
-Upstream Authors: Jean-Michel Martin <jmm at tlk.fr>
- Bruno Ethvignot <bruno at tlk.fr>
- André Majorel <amajorel at teaser.fr>
- David Igreja <david at tlk.fr>
- Michel Dogniaux <ldream at caramail.com>
- Emmanuel Founaud
- Sam Hocevar <sam at hocevar.net>
+Files: src/scale*
+Copyright: 2001, 2002, 2003, 2004, Andrea Mazzoleni
+License: GPL-2+
-Copyright: (c) 1999-2002 TLK Games <info at tlk.fr>
+Files: debian/*
+Copyright: 2000-2006, Sam Hocevar <sam at zoy.org>
+ 2008-2009, Barry deFreese <bdefreese at debian.org>
+ 2014, Markus Koschany <apo at gambaru.de>
+License: GPL-3+
-powermanga is released under the GNU GPL license as free, open source
-software. Hopefully it will seem useful to someone. NO WARRANTY.
+License: GPL-2+
+ On Debian systems, the complete text of the GNU General Public License version
+ 2 can be found in "/usr/share/common-licenses/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.
+License: GPL-3+
+ On Debian systems, the complete text of the GNU General Public License version
+ 3 can be found in "/usr/share/common-licenses/GPL-3".
Deleted: packages/trunk/powermanga/debian/patches/005_link_libm.diff
===================================================================
--- packages/trunk/powermanga/debian/patches/005_link_libm.diff 2014-09-01 21:03:49 UTC (rev 15175)
+++ packages/trunk/powermanga/debian/patches/005_link_libm.diff 2014-09-02 14:20:19 UTC (rev 15176)
@@ -1,25 +0,0 @@
-Index: powermanga-0.90-dfsg/configure.ac
-===================================================================
---- powermanga-0.90-dfsg.orig/configure.ac 2009-11-13 14:46:56.000000000 -0500
-+++ powermanga-0.90-dfsg/configure.ac 2009-11-13 14:48:55.000000000 -0500
-@@ -14,6 +14,7 @@
- dnl Default flags
- #CXXFLAGS="-O3 -Wall -g"
- CFLAGS="-O3 -Wall -std=c99"
-+LDFLAGS="-lm"
-
- dnl Check for X
- AC_PATH_X
-Index: powermanga-0.90-dfsg/configure
-===================================================================
---- powermanga-0.90-dfsg.orig/configure 2009-11-13 14:48:58.000000000 -0500
-+++ powermanga-0.90-dfsg/configure 2009-11-13 14:49:34.000000000 -0500
-@@ -3413,7 +3413,7 @@
-
- #CXXFLAGS="-O3 -Wall -g"
- CFLAGS="-O3 -Wall -std=c99"
--
-+LDFLAGS="-lm"
-
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
Deleted: packages/trunk/powermanga/debian/patches/010_scoredir_path.diff
===================================================================
--- packages/trunk/powermanga/debian/patches/010_scoredir_path.diff 2014-09-01 21:03:49 UTC (rev 15175)
+++ packages/trunk/powermanga/debian/patches/010_scoredir_path.diff 2014-09-02 14:20:19 UTC (rev 15176)
@@ -1,12 +0,0 @@
-diff -urN powermanga-0.90.orig/src/Makefile.in powermanga-0.90/src/Makefile.in
---- powermanga-0.90.orig/src/Makefile.in 2007-09-04 04:41:04.000000000 -0400
-+++ powermanga-0.90/src/Makefile.in 2007-11-30 14:00:20.000000000 -0500
-@@ -221,7 +221,7 @@
- target_os = @target_os@
- target_vendor = @target_vendor@
- gamesdir = $(prefix)/games
--scoredir = /var/games
-+scoredir = /var/games/powermanga
- score = powermanga.hi
- powermanga_SOURCES = $(SOURCES_MAIN) $(SOURCES_EXTRA)
- #powermanga_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DSCOREFILE=\"$(scoredir)/$(score)\" @XLIB_CFLAGS@ @SDL_CFLAGS@
Deleted: packages/trunk/powermanga/debian/patches/020_copyright.diff
===================================================================
--- packages/trunk/powermanga/debian/patches/020_copyright.diff 2014-09-01 21:03:49 UTC (rev 15175)
+++ packages/trunk/powermanga/debian/patches/020_copyright.diff 2014-09-02 14:20:19 UTC (rev 15176)
@@ -1,11 +0,0 @@
---- a/powermanga.6
-+++ b/powermanga.6
-@@ -143,7 +143,7 @@
- .I /usr/share/doc/powermanga/copyright
- for details.
- .br
--This manual page was written by Jeronimo Pellegrini <pellegrini at mpcnet.com.br>, based on the previous one by Samuel Hocevar <sam at zoy.org>, for the Debian GNU/Linux system (but may be used by others).
-+This manual page was written by Jeronimo Pellegrini <pellegrini at mpcnet.com.br>, based on the previous one by Sam Hocevar <sam at zoy.org>, for the Debian GNU/Linux system (but may be used by others).
-
-
-
Deleted: packages/trunk/powermanga/debian/patches/030_manpage_typo.diff
===================================================================
--- packages/trunk/powermanga/debian/patches/030_manpage_typo.diff 2014-09-01 21:03:49 UTC (rev 15175)
+++ packages/trunk/powermanga/debian/patches/030_manpage_typo.diff 2014-09-02 14:20:19 UTC (rev 15176)
@@ -1,13 +0,0 @@
-Index: powermanga-0.90-dfsg/powermanga.6
-===================================================================
---- powermanga-0.90-dfsg.orig/powermanga.6 2009-11-13 14:57:17.000000000 -0500
-+++ powermanga-0.90-dfsg/powermanga.6 2009-11-13 14:57:28.000000000 -0500
-@@ -74,7 +74,7 @@
- .B \--version
- prints version information and exit
- .TP
--.B \---window
-+.B \--window
- windowed mode (full screen by default)
- .TP
- .B \--2x
Added: packages/trunk/powermanga/debian/patches/desktop-file.patch
===================================================================
--- packages/trunk/powermanga/debian/patches/desktop-file.patch (rev 0)
+++ packages/trunk/powermanga/debian/patches/desktop-file.patch 2014-09-02 14:20:19 UTC (rev 15176)
@@ -0,0 +1,23 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Sun, 31 Aug 2014 23:23:52 +0200
+Subject: desktop file
+
+Forwarded: https://lists.alioth.debian.org/pipermail/pkg-games-devel/2014-September/031898.html
+---
+ powermanga.desktop | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/powermanga.desktop b/powermanga.desktop
+index ecbc702..7df3ecf 100644
+--- a/powermanga.desktop
++++ b/powermanga.desktop
+@@ -3,7 +3,9 @@ Type=Application
+ Name=Powermanga
+ GenericName=PowerManga
+ Comment=Play a vertical shoot 'em up game
++Comment[de]=Spiele ein vertikales "Shoot 'em up"-Spiel
+ Icon=powermanga
+ Exec=powermanga
+ Terminal=false
+ Categories=Game;ArcadeGame;
++Keywords=shmup;arcade;shooter;colourful;weapons;spaceship;
Added: packages/trunk/powermanga/debian/patches/manpage.patch
===================================================================
--- packages/trunk/powermanga/debian/patches/manpage.patch (rev 0)
+++ packages/trunk/powermanga/debian/patches/manpage.patch 2014-09-02 14:20:19 UTC (rev 15176)
@@ -0,0 +1,22 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Mon, 1 Sep 2014 01:17:28 +0200
+Subject: manpage
+
+Forwarded: https://lists.alioth.debian.org/pipermail/pkg-games-devel/2014-September/031898.html
+---
+ powermanga.6 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/powermanga.6 b/powermanga.6
+index 5911c4b..264c42f 100644
+--- a/powermanga.6
++++ b/powermanga.6
+@@ -89,7 +89,7 @@ scale4x effects which scale the image of 4x
+ .B \--320
+ the game will run in a 320*200 window
+ .TP
+-.B \--full
++.B \--fullscreen
+ the game will run in full screen
+ .TP
+ .B \-v
Added: packages/trunk/powermanga/debian/patches/segmentation-fault-about_en.patch
===================================================================
--- packages/trunk/powermanga/debian/patches/segmentation-fault-about_en.patch (rev 0)
+++ packages/trunk/powermanga/debian/patches/segmentation-fault-about_en.patch 2014-09-02 14:20:19 UTC (rev 15176)
@@ -0,0 +1,23 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Mon, 1 Sep 2014 22:01:43 +0200
+Subject: segmentation fault about_en
+
+Bug: https://bugs.debian.org/760146
+Forwarded: https://lists.alioth.debian.org/pipermail/pkg-games-devel/2014-September/031898.html
+---
+ texts/about_en.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/texts/about_en.txt b/texts/about_en.txt
+index 8fa5f47..ad162a6 100644
+--- a/texts/about_en.txt
++++ b/texts/about_en.txt
+@@ -5,7 +5,7 @@
+ 0,ADDITIONAL, 0,GRAPHICS, 1,JEAN MICHEL, 1,MARTIN
+ 0,ADDITIONAL, 0,PROGRAMMING, 1,BRUNO, 1,ETHVIGNOT
+ 0,ADDITIONAL, 0,PROGRAMMING, 1,EMMANUEL, 1,FOUNAUD
+-0,ADDITIONAL, 0,PROGRAMMING 1,ANDRE, 1,MAJOREL
++0,ADDITIONAL, 0,PROGRAMMING, 1,ANDRE, 1,MAJOREL
+ 0,ADDITIONAL, 0,PROGRAMMING, 1,SAM, 1,HOCEVAR
+ 0,ADDITIONAL, 0,PROGRAMMING, 1,LAURENT, 1,DUPERVAL
+ 0,ADDITIONAL, 0,PROGRAMMING, 1,GUILLAUME, 1,COTTENCEAU
Modified: packages/trunk/powermanga/debian/patches/series
===================================================================
--- packages/trunk/powermanga/debian/patches/series 2014-09-01 21:03:49 UTC (rev 15175)
+++ packages/trunk/powermanga/debian/patches/series 2014-09-02 14:20:19 UTC (rev 15176)
@@ -1,4 +1,4 @@
-005_link_libm.diff
-010_scoredir_path.diff
-020_copyright.diff
-030_manpage_typo.diff
+desktop-file.patch
+support-custom-CFLAGS.patch
+manpage.patch
+segmentation-fault-about_en.patch
Added: packages/trunk/powermanga/debian/patches/support-custom-CFLAGS.patch
===================================================================
--- packages/trunk/powermanga/debian/patches/support-custom-CFLAGS.patch (rev 0)
+++ packages/trunk/powermanga/debian/patches/support-custom-CFLAGS.patch 2014-09-02 14:20:19 UTC (rev 15176)
@@ -0,0 +1,22 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Mon, 1 Sep 2014 01:04:16 +0200
+Subject: support custom CFLAGS
+
+Forwarded: https://lists.alioth.debian.org/pipermail/pkg-games-devel/2014-September/031898.html
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5b55de3..a6065c3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,7 +54,7 @@ if test "x${enable_devel}" = "xyes"; then
+ AC_DEFINE(USE_MALLOC_WRAPPER, 1, Define to use a malloc wrapper)
+ CFLAGS="-Wall -Werror -pedantic -Wextra -std=gnu99 -g"
+ else
+- CFLAGS="-O3 -Werror -Wall -pedantic -Wextra -std=gnu99"
++ CFLAGS="-O3 -Werror -Wall -pedantic -Wextra -std=gnu99 $CFLAGS"
+ fi
+
+ dnl Check for SDL_mixer
Deleted: packages/trunk/powermanga/debian/powermanga-data.dirs
===================================================================
--- packages/trunk/powermanga/debian/powermanga-data.dirs 2014-09-01 21:03:49 UTC (rev 15175)
+++ packages/trunk/powermanga/debian/powermanga-data.dirs 2014-09-02 14:20:19 UTC (rev 15176)
@@ -1,2 +0,0 @@
-usr/share/doc
-usr/share/games/powermanga/texts
Added: packages/trunk/powermanga/debian/powermanga-data.doc-base
===================================================================
--- packages/trunk/powermanga/debian/powermanga-data.doc-base (rev 0)
+++ packages/trunk/powermanga/debian/powermanga-data.doc-base 2014-09-02 14:20:19 UTC (rev 15176)
@@ -0,0 +1,9 @@
+Document: powermanga
+Title: Debian Powermanga Manual
+Author: TLK Games
+Abstract: This manual describes gameplay and controls of Powermanga.
+Section: Games/Action
+
+Format: HTML
+Index: /usr/share/doc/powermanga-data/html/powermanga_en/index.html
+Files: /usr/share/doc/powermanga-data/html/powermanga_en/*.html
Added: packages/trunk/powermanga/debian/powermanga-data.docs
===================================================================
--- packages/trunk/powermanga/debian/powermanga-data.docs (rev 0)
+++ packages/trunk/powermanga/debian/powermanga-data.docs 2014-09-02 14:20:19 UTC (rev 15176)
@@ -0,0 +1 @@
+html
Added: packages/trunk/powermanga/debian/powermanga-data.install
===================================================================
--- packages/trunk/powermanga/debian/powermanga-data.install (rev 0)
+++ packages/trunk/powermanga/debian/powermanga-data.install 2014-09-02 14:20:19 UTC (rev 15176)
@@ -0,0 +1 @@
+usr/share/games
Deleted: packages/trunk/powermanga/debian/powermanga-data.preinst
===================================================================
--- packages/trunk/powermanga/debian/powermanga-data.preinst 2014-09-01 21:03:49 UTC (rev 15175)
+++ packages/trunk/powermanga/debian/powermanga-data.preinst 2014-09-02 14:20:19 UTC (rev 15176)
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-DOCDIR=/usr/share/doc/powermanga-data
-
-# Transition for foo/foo-data dependency swap
-if [ -L $DOCDIR ]; then
- rm -f $DOCDIR
-fi
-
-#DEBHELPER#
-
Deleted: packages/trunk/powermanga/debian/powermanga.desktop
===================================================================
--- packages/trunk/powermanga/debian/powermanga.desktop 2014-09-01 21:03:49 UTC (rev 15175)
+++ packages/trunk/powermanga/debian/powermanga.desktop 2014-09-02 14:20:19 UTC (rev 15176)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Powermanga
-GenericName=PowerManga
-Comment=Play a vertical shoot 'em up game
-Icon=powermanga
-Exec=powermanga
-Terminal=false
-Categories=Game;ArcadeGame;
Deleted: packages/trunk/powermanga/debian/powermanga.dirs
===================================================================
--- packages/trunk/powermanga/debian/powermanga.dirs 2014-09-01 21:03:49 UTC (rev 15175)
+++ packages/trunk/powermanga/debian/powermanga.dirs 2014-09-02 14:20:19 UTC (rev 15176)
@@ -1,3 +0,0 @@
-usr/games
-usr/share/doc
-var/games/powermanga
Added: packages/trunk/powermanga/debian/powermanga.install
===================================================================
--- packages/trunk/powermanga/debian/powermanga.install (rev 0)
+++ packages/trunk/powermanga/debian/powermanga.install 2014-09-02 14:20:19 UTC (rev 15176)
@@ -0,0 +1,4 @@
+powermanga.desktop usr/share/applications
+powermanga.xpm usr/share/pixmaps
+usr/games
+usr/share/man
Added: packages/trunk/powermanga/debian/powermanga.links
===================================================================
--- packages/trunk/powermanga/debian/powermanga.links (rev 0)
+++ packages/trunk/powermanga/debian/powermanga.links 2014-09-02 14:20:19 UTC (rev 15176)
@@ -0,0 +1 @@
+usr/share/doc/powermanga-data usr/share/doc/powermanga
Modified: packages/trunk/powermanga/debian/powermanga.menu
===================================================================
--- packages/trunk/powermanga/debian/powermanga.menu 2014-09-01 21:03:49 UTC (rev 15175)
+++ packages/trunk/powermanga/debian/powermanga.menu 2014-09-02 14:20:19 UTC (rev 15176)
@@ -1,3 +1,6 @@
-?package(powermanga):needs="X11" section="Games/Action" \
- title="Powermanga" command="/usr/games/powermanga" \
- icon="/usr/share/pixmaps/powermanga.xpm"
+?package(powermanga):needs="X11" \
+ section="Games/Action" \
+ title="Powermanga" \
+ longtitle="Powermanga - vertical shoot 'em up with colourful 3D graphics" \
+ command="/usr/games/powermanga" \
+ icon="/usr/share/pixmaps/powermanga.xpm"
Modified: packages/trunk/powermanga/debian/powermanga.postinst
===================================================================
--- packages/trunk/powermanga/debian/powermanga.postinst 2014-09-01 21:03:49 UTC (rev 15175)
+++ packages/trunk/powermanga/debian/powermanga.postinst 2014-09-02 14:20:19 UTC (rev 15176)
@@ -3,25 +3,16 @@
set -e
SCOREDIR=/var/games/powermanga
-DOCDIR=/usr/share/doc/powermanga
case "$1" in
configure)
- # Cancel my old stupid use of dpkg-statoverride
- if [ "$1" = "configure" ] && [ "$2" != "" ] &&
- dpkg --compare-versions "$2" le "0.79-5" &&
- [ -x /usr/sbin/dpkg-statoverride ] &&
- dpkg-statoverride --list "/usr/games/powermanga" >/dev/null
- then
- dpkg-statoverride --remove "/usr/games/powermanga"
- fi
if ! dpkg-statoverride --list /usr/games/powermanga > /dev/null; then
chown root:games /usr/games/powermanga
chmod 2755 /usr/games/powermanga
fi
-
if ! dpkg-statoverride --list $SCOREDIR > /dev/null; then
# Fix permissions
+ mkdir -p $SCOREDIR
chown root:games $SCOREDIR
chmod 2755 $SCOREDIR
fi
@@ -30,13 +21,6 @@
chown root:games $SCOREDIR/powermanga.$x
chmod 0664 $SCOREDIR/powermanga.$x
done
- # Transition for foo/foo-data dependency swap
- if [ -d $DOCDIR -a ! -L $DOCDIR ]; then
- rmdir --ignore-fail-on-non-empty $DOCDIR
- if [ ! -d $DOCDIR ]; then
- ln -s powermanga-data $DOCDIR
- fi
- fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
Modified: packages/trunk/powermanga/debian/powermanga.postrm
===================================================================
--- packages/trunk/powermanga/debian/powermanga.postrm 2014-09-01 21:03:49 UTC (rev 15175)
+++ packages/trunk/powermanga/debian/powermanga.postrm 2014-09-02 14:20:19 UTC (rev 15176)
@@ -1,30 +1,10 @@
#! /bin/sh
+
set -e
-# These ones are not needed anymore. Make sure they disappear forever
-if dpkg-statoverride --list /var/games/powermanga >/dev/null; then
- dpkg-statoverride --remove /var/games/powermanga >/dev/null
+if [ "$1" = "purge" ]; then
+ rm -r /var/games/powermanga
+ rmdir --ignore-fail-on-non-empty /var/games
fi
-if dpkg-statoverride --list /var/games/powermanga/ >/dev/null 2>&1; then
- dpkg-statoverride --remove /var/games/powermanga/ >/dev/null 2>&1
-fi
-case "$1" in
- purge|remove)
- if dpkg-statoverride --list /usr/games/powermanga >/dev/null; then
- dpkg-statoverride --remove /usr/games/powermanga
- fi
- for x in hi-easy hi hi-hard; do
- rm -f /var/games/powermanga/powermanga.$x
- done
- ;;
- upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
#DEBHELPER#
-
Deleted: packages/trunk/powermanga/debian/powermanga.xpm
===================================================================
--- packages/trunk/powermanga/debian/powermanga.xpm 2014-09-01 21:03:49 UTC (rev 15175)
+++ packages/trunk/powermanga/debian/powermanga.xpm 2014-09-02 14:20:19 UTC (rev 15176)
@@ -1,56 +0,0 @@
-/* XPM */
-static char * powermanga_xpm[] = {
-"32 32 21 1",
-" c None",
-". c #000000",
-"+ c #7F7F00",
-"@ c #FFFF00",
-"# c #FF0000",
-"$ c #333333",
-"% c #191919",
-"& c #7F0000",
-"* c #007F00",
-"= c #00FF00",
-"- c #00007F",
-"; c #7F007F",
-"> c #0000FF",
-", c #B2B2B2",
-"' c #00FFFF",
-") c #007F7F",
-"! c #4C4C4C",
-"~ c #CCCCCC",
-"{ c #E5E5E5",
-"] c #7F7F7F",
-"^ c #999999",
-" ",
-" ",
-" ... ",
-" .+@#. ",
-" .@@@. ... ",
-" .+ at +. .+@#. ",
-" ... .@@@. ",
-" .+ at +. ",
-" ... ",
-" ",
-" $....$ ",
-" ...... $...%$##&&$ ",
-" .%******$&&#######&. ... ",
-" .$======###########&% .+@#. ",
-" .$=====###&&&######&&. .@@@. ",
-" .*====##&----;&####&. .+ at +. ",
-" .*===##&--->--;###&%. ... ",
-" $*==###;-,'---;&#&&. ",
-" %**##&-')----&&#&& ",
-" %&##;-)----!&#&&. ",
-" $&#&-----;&&&&&. ",
-" !,##;---$&&&&&*. ",
-" !~{##&&&&&&&&=*. ",
-" %]^^###&&&&&==*. ",
-" .!]^]&&&&&&===*. ",
-" ..$$$&&&====*$ ",
-" ....*======*. ",
-" .*====*$ ",
-" .****% ",
-" .... ",
-" ",
-" "};
Modified: packages/trunk/powermanga/debian/rules
===================================================================
--- packages/trunk/powermanga/debian/rules 2014-09-01 21:03:49 UTC (rev 15175)
+++ packages/trunk/powermanga/debian/rules 2014-09-02 14:20:19 UTC (rev 15176)
@@ -1,99 +1,14 @@
#!/usr/bin/make -f
-#export DH_VERBOSE=1
-export DH_OPTIONS
+%:
+ dh $@ --parallel --with autoreconf
-export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+override_dh_link:
+ $(RM) -r debian/powermanga/usr/share/doc/powermanga
+ dh_link
-confflags = --prefix=/usr --mandir=/usr/share/man/man6
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build $(DEB_HOST_GNU_TYPE)
-else
- confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
- touch configure.ac
- touch aclocal.m4
- touch configure
- touch config.h.in
- touch `find . -name Makefile.in`
- ./configure $(confflags)
- touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
- dh_testdir
- $(MAKE) PREFIX=$(CURDIR)/debian/powermanga
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- [ ! -f Makefile ] || [ ! -f config.status ] || $(MAKE) distclean
- QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
- rm -f config.log config.status
- rm -rf .pc
- dh_clean
-
-install: DH_OPTIONS=
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- # Install package
- DESTDIR=$(CURDIR)/debian/powermanga/ $(MAKE) install
- # Remove the score files
- rm -f debian/powermanga/var/games/powermanga/powermanga.hi-easy
- rm -f debian/powermanga/var/games/powermanga/powermanga.hi
- rm -f debian/powermanga/var/games/powermanga/powermanga.hi-hard
- # Move files
- mv debian/powermanga/usr/share/games/powermanga/* debian/powermanga-data/usr/share/games/powermanga
- dh_install debian/powermanga.xpm /usr/share/pixmaps
- dh_install debian/powermanga.desktop /usr/share/applications/
- dh_install -p powermanga-data texts/*.txt texts/*.ini /usr/share/games/powermanga/texts
- ln -s powermanga-data debian/powermanga/usr/share/doc/powermanga
-
- #Remove empty dir
- rm -rf debian/powermanga/usr/share/games
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdocs -i
- dh_installexamples -i
- dh_installchangelogs -i
- dh_link -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installmenu -a
- dh_installcron -a
- dh_installinfo -a
- dh_strip -a
- dh_link -a
- dh_compress -a
- dh_fixperms -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-arch binary install configure
-
+override_dh_installdocs:
+ dh_installdocs
+ # De-duplication (http://wiki.debian.org/dedup.debian.net):
+ rdfind -outputname /dev/null -makesymlinks true debian/powermanga-data/usr/share/doc
+ symlinks -rsc debian/powermanga-data/usr/share/doc
Added: packages/trunk/powermanga/debian/source/format
===================================================================
--- packages/trunk/powermanga/debian/source/format (rev 0)
+++ packages/trunk/powermanga/debian/source/format 2014-09-02 14:20:19 UTC (rev 15176)
@@ -0,0 +1 @@
+3.0 (quilt)
Modified: packages/trunk/powermanga/debian/watch
===================================================================
--- packages/trunk/powermanga/debian/watch 2014-09-01 21:03:49 UTC (rev 15175)
+++ packages/trunk/powermanga/debian/watch 2014-09-02 14:20:19 UTC (rev 15176)
@@ -1,4 +1,2 @@
version=3
-
-opts="dversionmangle=s/\-dfsg//" \
-http://linux.tlk.fr/games/Powermanga/download/powermanga-([\d.]+)\.tgz
+http://linux.tlk.fr/games/Powermanga/download/powermanga-([\d.]+)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz)
More information about the Pkg-games-commits
mailing list