diff -Nru dd2-0.2.2/debian/changelog dd2-0.2.2/debian/changelog --- dd2-0.2.2/debian/changelog 2013-03-30 23:04:36.000000000 +0000 +++ dd2-0.2.2/debian/changelog 2015-11-02 00:16:44.000000000 +0000 @@ -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 Mon, 02 Nov 2015 01:05:14 +0100 + dd2 (0.2.2-2) unstable; urgency=low * Team upload. diff -Nru dd2-0.2.2/debian/control dd2-0.2.2/debian/control --- dd2-0.2.2/debian/control 2013-03-28 22:17:55.000000000 +0000 +++ dd2-0.2.2/debian/control 2015-11-02 00:16:44.000000000 +0000 @@ -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 diff -Nru dd2-0.2.2/debian/copyright dd2-0.2.2/debian/copyright --- dd2-0.2.2/debian/copyright 2013-03-30 23:04:36.000000000 +0000 +++ dd2-0.2.2/debian/copyright 2015-11-02 00:16:44.000000000 +0000 @@ -7,9 +7,9 @@ License: GPL-2+ Files: debian/* -Copyright: 2006, Gürkan Sengün - 2007, Barry deFreese - 2013, Markus Koschany +Copyright: 2006, Gürkan Sengün + 2007, Barry deFreese + 2013-2015, Markus Koschany License: GPL-2+ License: GPL-2+ Binary files /tmp/krtDEmdv6m/dd2-0.2.2/debian/images/dodgindiamond2.png and /tmp/SY_hKG2X3Y/dd2-0.2.2/debian/images/dodgindiamond2.png differ diff -Nru dd2-0.2.2/debian/install dd2-0.2.2/debian/install --- dd2-0.2.2/debian/install 2013-03-30 23:04:36.000000000 +0000 +++ dd2-0.2.2/debian/install 2015-11-02 00:16:44.000000000 +0000 @@ -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 diff -Nru dd2-0.2.2/debian/patches/001_configure.patch dd2-0.2.2/debian/patches/001_configure.patch --- dd2-0.2.2/debian/patches/001_configure.patch 2013-03-30 23:47:16.000000000 +0000 +++ dd2-0.2.2/debian/patches/001_configure.patch 2015-11-02 00:16:44.000000000 +0000 @@ -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 diff -Nru dd2-0.2.2/debian/patches/01_update_readme.patch dd2-0.2.2/debian/patches/01_update_readme.patch --- dd2-0.2.2/debian/patches/01_update_readme.patch 2013-03-30 23:47:16.000000000 +0000 +++ dd2-0.2.2/debian/patches/01_update_readme.patch 2015-11-02 00:16:44.000000000 +0000 @@ -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 diff -Nru dd2-0.2.2/debian/patches/02_makefile_scores.patch dd2-0.2.2/debian/patches/02_makefile_scores.patch --- dd2-0.2.2/debian/patches/02_makefile_scores.patch 2013-03-30 23:47:16.000000000 +0000 +++ dd2-0.2.2/debian/patches/02_makefile_scores.patch 2015-11-02 00:16:44.000000000 +0000 @@ -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 diff -Nru dd2-0.2.2/debian/patches/03_hiscore_file.patch dd2-0.2.2/debian/patches/03_hiscore_file.patch --- dd2-0.2.2/debian/patches/03_hiscore_file.patch 2013-03-30 23:47:16.000000000 +0000 +++ dd2-0.2.2/debian/patches/03_hiscore_file.patch 2015-11-02 00:16:44.000000000 +0000 @@ -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 diff -Nru dd2-0.2.2/debian/patches/04_hiscore_patches.patch dd2-0.2.2/debian/patches/04_hiscore_patches.patch --- dd2-0.2.2/debian/patches/04_hiscore_patches.patch 2013-03-30 23:47:16.000000000 +0000 +++ dd2-0.2.2/debian/patches/04_hiscore_patches.patch 2015-11-02 00:16:44.000000000 +0000 @@ -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 diff -Nru dd2-0.2.2/debian/patches/array-out-of-bounds.patch dd2-0.2.2/debian/patches/array-out-of-bounds.patch --- dd2-0.2.2/debian/patches/array-out-of-bounds.patch 1970-01-01 00:00:00.000000000 +0000 +++ dd2-0.2.2/debian/patches/array-out-of-bounds.patch 2015-11-02 00:16:44.000000000 +0000 @@ -0,0 +1,21 @@ +From: Markus Koschany +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; + diff -Nru dd2-0.2.2/debian/patches/series dd2-0.2.2/debian/patches/series --- dd2-0.2.2/debian/patches/series 2013-03-30 23:49:48.000000000 +0000 +++ dd2-0.2.2/debian/patches/series 2015-11-02 00:16:44.000000000 +0000 @@ -3,3 +3,4 @@ 02_makefile_scores.patch 03_hiscore_file.patch 04_hiscore_patches.patch +array-out-of-bounds.patch