r15572 - in packages/trunk/dd2/debian: . images patches

Markus Koschany apo-guest at moszumanska.debian.org
Mon Nov 2 00:26:41 UTC 2015


Author: apo-guest
Date: 2015-11-02 00:26:40 +0000 (Mon, 02 Nov 2015)
New Revision: 15572

Added:
   packages/trunk/dd2/debian/patches/array-out-of-bounds.patch
Modified:
   packages/trunk/dd2/debian/changelog
   packages/trunk/dd2/debian/control
   packages/trunk/dd2/debian/copyright
   packages/trunk/dd2/debian/images/dodgindiamond2.png
   packages/trunk/dd2/debian/install
   packages/trunk/dd2/debian/patches/001_configure.patch
   packages/trunk/dd2/debian/patches/01_update_readme.patch
   packages/trunk/dd2/debian/patches/02_makefile_scores.patch
   packages/trunk/dd2/debian/patches/03_hiscore_file.patch
   packages/trunk/dd2/debian/patches/04_hiscore_patches.patch
   packages/trunk/dd2/debian/patches/series
Log:
Release 0.2.2-3. Fix #748418


Modified: packages/trunk/dd2/debian/changelog
===================================================================
--- packages/trunk/dd2/debian/changelog	2015-11-01 20:44:32 UTC (rev 15571)
+++ packages/trunk/dd2/debian/changelog	2015-11-02 00:26:40 UTC (rev 15572)
@@ -1,3 +1,17 @@
+dd2 (0.2.2-3) unstable; urgency=medium
+
+  * Team upload.
+  * Add array-out-of-bounds.patch.
+    Fix conflicting array sizes for variable "efx".
+    Thanks to Michael Tautschnig for the report. (Closes: #748418)
+  * Vcs-Browser: Use https.
+  * Declare compliance with Debian Policy 3.9.6.
+  * Update copyright years.
+  * Resize dodgindiamond2.png to 128x128 pixel and install the image to the
+    hicolor icon directory.
+
+ -- Markus Koschany <apo at debian.org>  Mon, 02 Nov 2015 01:05:14 +0100
+
 dd2 (0.2.2-2) unstable; urgency=low
 
   * Team upload.

Modified: packages/trunk/dd2/debian/control
===================================================================
--- packages/trunk/dd2/debian/control	2015-11-01 20:44:32 UTC (rev 15571)
+++ packages/trunk/dd2/debian/control	2015-11-02 00:26:40 UTC (rev 15572)
@@ -10,10 +10,10 @@
  libsdl-image1.2-dev,
  libsdl-mixer1.2-dev,
  libsdl1.2-dev
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
 Homepage: http://www.usebox.net/jjm/dd2/
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/dd2/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/dd2/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/dd2/
 
 Package: dodgindiamond2
 Architecture: any

Modified: packages/trunk/dd2/debian/copyright
===================================================================
--- packages/trunk/dd2/debian/copyright	2015-11-01 20:44:32 UTC (rev 15571)
+++ packages/trunk/dd2/debian/copyright	2015-11-02 00:26:40 UTC (rev 15572)
@@ -7,9 +7,9 @@
 License: GPL-2+
 
 Files: debian/*
-Copyright: 2006, Gürkan Sengün <gurkan at linuks.mine.nu>
-           2007, Barry deFreese <bddebian at comcast.net>
-           2013, Markus Koschany <apo at gambaru.de>
+Copyright: 2006,      Gürkan Sengün <gurkan at linuks.mine.nu>
+           2007,      Barry deFreese <bddebian at comcast.net>
+           2013-2015, Markus Koschany <apo at debian.org>
 License: GPL-2+
 
 License: GPL-2+

Modified: packages/trunk/dd2/debian/images/dodgindiamond2.png
===================================================================
(Binary files differ)

Modified: packages/trunk/dd2/debian/install
===================================================================
--- packages/trunk/dd2/debian/install	2015-11-01 20:44:32 UTC (rev 15571)
+++ packages/trunk/dd2/debian/install	2015-11-02 00:26:40 UTC (rev 15572)
@@ -1,2 +1,3 @@
-debian/dodgindiamond2.desktop   usr/share/applications
-debian/images/*                 usr/share/pixmaps
+debian/dodgindiamond2.desktop       usr/share/applications
+debian/images/dodgindiamond2.xpm    usr/share/pixmaps
+debian/images/dodgindiamond2.png    usr/share/icons/hicolor/128x128/apps

Modified: packages/trunk/dd2/debian/patches/001_configure.patch
===================================================================
--- packages/trunk/dd2/debian/patches/001_configure.patch	2015-11-01 20:44:32 UTC (rev 15571)
+++ packages/trunk/dd2/debian/patches/001_configure.patch	2015-11-02 00:26:40 UTC (rev 15572)
@@ -3,7 +3,7 @@
 Subject: 001_configure
 
 ---
- configure.in |    4 +++-
+ configure.in | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/configure.in b/configure.in

Modified: packages/trunk/dd2/debian/patches/01_update_readme.patch
===================================================================
--- packages/trunk/dd2/debian/patches/01_update_readme.patch	2015-11-01 20:44:32 UTC (rev 15571)
+++ packages/trunk/dd2/debian/patches/01_update_readme.patch	2015-11-02 00:26:40 UTC (rev 15572)
@@ -3,7 +3,7 @@
 Subject: 01_update_readme
 
 ---
- README |   46 ++++------------------------------------------
+ README | 46 ++++------------------------------------------
  1 file changed, 4 insertions(+), 42 deletions(-)
 
 diff --git a/README b/README

Modified: packages/trunk/dd2/debian/patches/02_makefile_scores.patch
===================================================================
--- packages/trunk/dd2/debian/patches/02_makefile_scores.patch	2015-11-01 20:44:32 UTC (rev 15571)
+++ packages/trunk/dd2/debian/patches/02_makefile_scores.patch	2015-11-02 00:26:40 UTC (rev 15572)
@@ -3,7 +3,7 @@
 Subject: 02_makefile_scores
 
 ---
- src/data/Makefile.am |    2 +-
+ src/data/Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/data/Makefile.am b/src/data/Makefile.am

Modified: packages/trunk/dd2/debian/patches/03_hiscore_file.patch
===================================================================
--- packages/trunk/dd2/debian/patches/03_hiscore_file.patch	2015-11-01 20:44:32 UTC (rev 15571)
+++ packages/trunk/dd2/debian/patches/03_hiscore_file.patch	2015-11-02 00:26:40 UTC (rev 15572)
@@ -3,7 +3,7 @@
 Subject: 03_hiscore_file
 
 ---
- src/data/dd2-hiscore |    4 ++--
+ src/data/dd2-hiscore | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/data/dd2-hiscore b/src/data/dd2-hiscore

Modified: packages/trunk/dd2/debian/patches/04_hiscore_patches.patch
===================================================================
--- packages/trunk/dd2/debian/patches/04_hiscore_patches.patch	2015-11-01 20:44:32 UTC (rev 15571)
+++ packages/trunk/dd2/debian/patches/04_hiscore_patches.patch	2015-11-02 00:26:40 UTC (rev 15572)
@@ -3,8 +3,8 @@
 Subject: 04_hiscore_patches
 
 ---
- src/engine.h |    4 ++++
- src/main.c   |    4 ++--
+ src/engine.h | 4 ++++
+ src/main.c   | 4 ++--
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/src/engine.h b/src/engine.h

Added: packages/trunk/dd2/debian/patches/array-out-of-bounds.patch
===================================================================
--- packages/trunk/dd2/debian/patches/array-out-of-bounds.patch	                        (rev 0)
+++ packages/trunk/dd2/debian/patches/array-out-of-bounds.patch	2015-11-02 00:26:40 UTC (rev 15572)
@@ -0,0 +1,21 @@
+From: Markus Koschany <apo at debian.org>
+Date: Mon, 2 Nov 2015 01:01:38 +0100
+Subject: array out of bounds
+
+---
+ src/engine.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/engine.c b/src/engine.c
+index a756293..bcc622f 100644
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -30,7 +30,7 @@
+ 
+ extern SDL_Surface *screen, *gfx;
+ 
+-extern Mix_Chunk *efx[2];
++extern Mix_Chunk *efx[8];
+ extern Mix_Music *bgm, *bgm_boss;
+ extern int sound;
+ 

Modified: packages/trunk/dd2/debian/patches/series
===================================================================
--- packages/trunk/dd2/debian/patches/series	2015-11-01 20:44:32 UTC (rev 15571)
+++ packages/trunk/dd2/debian/patches/series	2015-11-02 00:26:40 UTC (rev 15572)
@@ -3,3 +3,4 @@
 02_makefile_scores.patch
 03_hiscore_file.patch
 04_hiscore_patches.patch
+array-out-of-bounds.patch




More information about the Pkg-games-commits mailing list