[powermanga] 30/41: Debian release 0.93-1

Markus Koschany apo-guest at moszumanska.debian.org
Thu Jun 25 18:55:10 UTC 2015


This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository powermanga.

commit 795df0a52ff8c91c881065829345a27464fa0e29
Author: Markus Koschany <apo at gambaru.de>
Date:   Thu Sep 25 12:03:19 2014 +0000

    Debian release 0.93-1
---
 debian/changelog                                 | 12 ++++++++++++
 debian/control                                   |  2 +-
 debian/patches/desktop-file.patch                | 23 -----------------------
 debian/patches/joystick.patch                    | 22 ----------------------
 debian/patches/manpage.patch                     | 22 ----------------------
 debian/patches/segmentation-fault-about_en.patch | 23 -----------------------
 debian/patches/series                            |  5 -----
 debian/patches/support-custom-CFLAGS.patch       | 22 ----------------------
 debian/powermanga.manpages                       |  1 +
 debian/rules                                     |  1 +
 10 files changed, 15 insertions(+), 118 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 02f7835..7c39b96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+powermanga (0.93-1) unstable; urgency=medium
+
+  * Imported Upstream version 0.93.
+  * Drop all existing patches. Merged upstream.
+  * Declare compliance with Debian Policy 3.9.6.
+  * Install new french man page with manpages file.
+  * debian/rules: Disable hardening option stackprotectorstrong because it
+    causes a segmentation fault on i386 and makes the game unusable. However
+    stackprotector seems to work fine, so keep it for the time being.
+
+ -- Markus Koschany <apo at gambaru.de>  Thu, 25 Sep 2014 13:52:52 +0200
+
 powermanga (0.92-2) unstable; urgency=medium
 
   * Add joystick.patch:
diff --git a/debian/control b/debian/control
index f57a9a7..371e4b1 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
  rdfind,
  symlinks,
  zlib1g-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 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/
diff --git a/debian/patches/desktop-file.patch b/debian/patches/desktop-file.patch
deleted file mode 100644
index 4ec9b80..0000000
--- a/debian/patches/desktop-file.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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;
diff --git a/debian/patches/joystick.patch b/debian/patches/joystick.patch
deleted file mode 100644
index 1e6d386..0000000
--- a/debian/patches/joystick.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Bruno Ethvignot <bruno at tlk.biz>
-Date: Sun, 7 Sep 2014 23:44:53 +0200
-Subject: joystick
-
-Bug: https://bugs.debian.org/561670
----
- src/display_sdl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/display_sdl.c b/src/display_sdl.c
-index 954902f..971ffcd 100644
---- a/src/display_sdl.c
-+++ b/src/display_sdl.c
-@@ -991,7 +991,7 @@ display_handle_events (void)
-           else if (event.jhat.value == SDL_HAT_LEFT)
-             {
-               joy_top = 0;
--              joy_right = 1;
-+              joy_right = 0;
-               joy_down = 0;
-               joy_left = 1;
-             }
diff --git a/debian/patches/manpage.patch b/debian/patches/manpage.patch
deleted file mode 100644
index 0be1eed..0000000
--- a/debian/patches/manpage.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
diff --git a/debian/patches/segmentation-fault-about_en.patch b/debian/patches/segmentation-fault-about_en.patch
deleted file mode 100644
index 0d436ae..0000000
--- a/debian/patches/segmentation-fault-about_en.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8ddd434..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-desktop-file.patch
-support-custom-CFLAGS.patch
-manpage.patch
-segmentation-fault-about_en.patch
-joystick.patch
diff --git a/debian/patches/support-custom-CFLAGS.patch b/debian/patches/support-custom-CFLAGS.patch
deleted file mode 100644
index 03d5673..0000000
--- a/debian/patches/support-custom-CFLAGS.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
diff --git a/debian/powermanga.manpages b/debian/powermanga.manpages
new file mode 100644
index 0000000..1039c46
--- /dev/null
+++ b/debian/powermanga.manpages
@@ -0,0 +1 @@
+man/powermanga.fr.6
diff --git a/debian/rules b/debian/rules
index c0c6be5..eed07a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
+export DEB_BUILD_MAINT_OPTIONS=hardening=-stackprotectorstrong
 
 %:
 	dh $@ --parallel --with autoreconf

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/powermanga.git



More information about the Pkg-games-commits mailing list