diff -Nru gngb-20060309/debian/changelog gngb-20060309/debian/changelog --- gngb-20060309/debian/changelog 2017-08-17 07:00:20.000000000 +0000 +++ gngb-20060309/debian/changelog 2017-08-16 21:37:46.000000000 +0000 @@ -1,3 +1,29 @@ +gngb (20060309-4) unstable; urgency=medium + + * Team upload. + * Switch to source format 3.0 (quilt). + * Switch to compat level 10. + * wrap-and-sort -sa. + * Declare compliance with Debian Policy 4.0.1. + * Switch from cdbs to dh sequencer. + * Update debian/copyright to copyright format 1.0. + * Drop dirs file. + * Move the package to Git. + * Run patches through gbp. + * Remove Nick Ellery from Uploaders because he is not active anymore. + * Fix FTBFS with GCC 7. Add gcc7.patch. (Closes: #853425) + * Make the build reproducible. Add reproducible-build.patch. Thanks to Chris + Lamb for the report and patch. (Closes: #831773) + * Fix FTBFS with clang instead of gcc. Thanks to Arthur Marble for the + report. (Closes: #757486) + * Fix issues with joystick axis. Add joystick-axis.patch. (Closes: #592777) + * Add manpage-spelling.patch and fix a minor spelling mistake in gngb.1. + * Add qwerty example in sample_gngbrc and clarify the location of + sample_gngbrc in gngb.1. Thanks to Yves Rutschle for the report. + (Closes: #597910) + + -- Markus Koschany Wed, 16 Aug 2017 23:37:46 +0200 + gngb (20060309-3.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru gngb-20060309/debian/compat gngb-20060309/debian/compat --- gngb-20060309/debian/compat 2017-08-17 07:00:20.000000000 +0000 +++ gngb-20060309/debian/compat 2017-08-16 21:37:46.000000000 +0000 @@ -1 +1 @@ -5 +10 diff -Nru gngb-20060309/debian/control gngb-20060309/debian/control --- gngb-20060309/debian/control 2017-08-17 07:00:20.000000000 +0000 +++ gngb-20060309/debian/control 2017-08-16 21:37:46.000000000 +0000 @@ -2,15 +2,24 @@ Section: x11 Priority: optional Maintainer: Debian Games Team -Uploaders: Ola Lundqvist , Nick Ellery -Build-Depends: debhelper (>= 5.0.0), libsdl1.2-dev, zlib1g-dev, libglu1-mesa-dev, cdbs, autotools-dev -Standards-Version: 3.8.2 +Uploaders: + Ola Lundqvist +Build-Depends: + debhelper (>= 10), + libglu1-mesa-dev, + libsdl1.2-dev, + zlib1g-dev +Standards-Version: 4.0.1 Homepage: http://m.peponas.free.fr/gngb/ +Vcs-Git: https://anonscm.debian.org/git/pkg-games/gngb.git +Vcs-Browser: https://anonscm.debian.org/git/pkg-games/gngb.git Package: gngb Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: a Color Gameboy emulator +Depends: + ${misc:Depends}, + ${shlibs:Depends} +Description: Color Gameboy emulator Gngb is an emulator for GameBoy Classic, Color and others. . It uses the SDL library and OpenGL. This software supports joystick diff -Nru gngb-20060309/debian/copyright gngb-20060309/debian/copyright --- gngb-20060309/debian/copyright 2017-08-17 07:00:20.000000000 +0000 +++ gngb-20060309/debian/copyright 2017-08-16 21:37:46.000000000 +0000 @@ -1,35 +1,24 @@ -This package was debianized by Julien Delange on -Mon, 11 Aug 2003 19:31:27 +0200. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: gngb +Source: http://m.peponas.free.fr/gngb/ + + +Files: * +Copyright: Peponas Thomas "Frogus" tpeponas@altern.org + Peponas Mathieu "Pepone" pepone@altern.org +License: GPL-2+ + +Files: debian/* +Copyright: 2003-2005, Julien Delange + 2007, Matej Vela + 2007-2008, Jose Carlos Medeiros + 2009, Nick Ellery + 2015, gregor herrmann + 2017, Markus Koschany +License: GPL-2+ + +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". -It was downloaded from http://m.peponas.free.fr/gngb/download.html -Upstream Authors: - - Peponas Thomas "Frogus" tpeponas@altern.org - Peponas Mathieu "Pepone" pepone@altern.org - -Copyright: - - Copyright © 2001 Peponas Thomas & Peponas Mathieu - -License: - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. - -The Debian packaging is © 2003, Julien Delange and -is licensed under the GPL, see above. diff -Nru gngb-20060309/debian/dirs gngb-20060309/debian/dirs --- gngb-20060309/debian/dirs 2017-08-17 07:00:20.000000000 +0000 +++ gngb-20060309/debian/dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/bin diff -Nru gngb-20060309/debian/patches/clang-ftbfs.patch gngb-20060309/debian/patches/clang-ftbfs.patch --- gngb-20060309/debian/patches/clang-ftbfs.patch 1970-01-01 00:00:00.000000000 +0000 +++ gngb-20060309/debian/patches/clang-ftbfs.patch 2017-08-16 21:37:46.000000000 +0000 @@ -0,0 +1,24 @@ +From: Arthur Marble +Date: Wed, 16 Aug 2017 23:49:59 +0200 +Subject: clang-ftbfs + +Bug-Debian: https://bugs.debian.org/757486 +--- + src/global.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/global.h b/src/global.h +index bb46387..6a6d2b3 100644 +--- a/src/global.h ++++ b/src/global.h +@@ -22,5 +22,10 @@ + #include + #include + ++#ifdef __clang__ ++#define __inline__ ++#else ++#define __inline__ inline ++#endif + + #endif diff -Nru gngb-20060309/debian/patches/fix_gngb.1_manpage.patch gngb-20060309/debian/patches/fix_gngb.1_manpage.patch --- gngb-20060309/debian/patches/fix_gngb.1_manpage.patch 2017-08-17 07:00:20.000000000 +0000 +++ gngb-20060309/debian/patches/fix_gngb.1_manpage.patch 2017-08-16 21:37:46.000000000 +0000 @@ -1,7 +1,16 @@ -Index: gngb-20060309/gngb.1 +From: Debian Games Team +Date: Thu, 10 Aug 2017 19:06:35 +0000 +Subject: fix_gngb.1_manpage + =================================================================== ---- gngb-20060309.orig/gngb.1 2008-01-31 11:23:22.000000000 -0200 -+++ gngb-20060309/gngb.1 2008-01-31 11:24:03.000000000 -0200 +--- + gngb.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gngb.1 b/gngb.1 +index c1a6b1e..dbd8e91 100644 +--- a/gngb.1 ++++ b/gngb.1 @@ -1,7 +1,7 @@ .TH GNGB 1 .\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection diff -Nru gngb-20060309/debian/patches/FTBFS_with_gcc-3.4_conflicting_types.patch gngb-20060309/debian/patches/FTBFS_with_gcc-3.4_conflicting_types.patch --- gngb-20060309/debian/patches/FTBFS_with_gcc-3.4_conflicting_types.patch 2017-08-17 07:00:20.000000000 +0000 +++ gngb-20060309/debian/patches/FTBFS_with_gcc-3.4_conflicting_types.patch 2017-08-16 21:37:46.000000000 +0000 @@ -1,8 +1,17 @@ -Index: gngb-20060309/src/save.c +From: Debian Games Team +Date: Thu, 10 Aug 2017 19:06:35 +0000 +Subject: FTBFS_with_gcc-3.4_conflicting_types + =================================================================== ---- gngb-20060309.orig/src/save.c 2008-01-31 11:17:17.000000000 -0200 -+++ gngb-20060309/src/save.c 2008-01-31 11:18:37.000000000 -0200 -@@ -404,6 +404,8 @@ +--- + src/save.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/save.c b/src/save.c +index c7e4395..bf50bdf 100644 +--- a/src/save.c ++++ b/src/save.c +@@ -404,6 +404,8 @@ int save_load_rt_info(GNGB_FILE * stream,char op) { return 0; } diff -Nru gngb-20060309/debian/patches/gcc7.patch gngb-20060309/debian/patches/gcc7.patch --- gngb-20060309/debian/patches/gcc7.patch 1970-01-01 00:00:00.000000000 +0000 +++ gngb-20060309/debian/patches/gcc7.patch 2017-08-16 21:37:46.000000000 +0000 @@ -0,0 +1,73 @@ +From: Markus Koschany +Date: Thu, 10 Aug 2017 19:39:05 +0000 +Subject: gcc7 + +Bug-Debian: https://bugs.debian.org/853425 +Forwarded: no +--- + src/cpu.c | 10 +++++----- + src/memory.c | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/cpu.c b/src/cpu.c +index 57bc209..5209548 100644 +--- a/src/cpu.c ++++ b/src/cpu.c +@@ -61,7 +61,7 @@ static Uint8 a; + #define H (gbcpu->hl.b.h) + #define L (gbcpu->hl.b.l) + +-__inline__ Uint16 get_word(void) ++extern __inline__ Uint16 get_word(void) + { + //Uint16 v=((Uint16)(mem_read(PC))); + Uint16 v1,v2; +@@ -74,7 +74,7 @@ __inline__ Uint16 get_word(void) + //return v; + } + +-__inline__ Uint8 get_byte(void) ++extern __inline__ Uint8 get_byte(void) + { + //Uint8 t=mem_read(PC); + Uint8 t; +@@ -83,7 +83,7 @@ __inline__ Uint8 get_byte(void) + return t; + } + +-__inline__ void push_r(REG *r) ++extern __inline__ void push_r(REG *r) + { + //mem_write(--SP,(r)->b.h); + //mem_write(--SP,(r)->b.l); +@@ -93,7 +93,7 @@ __inline__ void push_r(REG *r) + mem_write_fast(SP,(r)->b.l); + } + +-__inline__ void pop_r(REG *r) ++extern __inline__ void pop_r(REG *r) + { + //(r)->b.l=mem_read(SP); + mem_read_fast(SP,(r)->b.l); +@@ -176,7 +176,7 @@ __inline__ Uint8 unknown(void){ + + + +-__inline__ Uint8 gbcpu_exec_one(void) ++extern __inline__ Uint8 gbcpu_exec_one(void) + { + static Uint8 opcode; + if (gbcpu->ei_flag==1) { +diff --git a/src/memory.c b/src/memory.c +index 26e42d9..fd06738 100644 +--- a/src/memory.c ++++ b/src/memory.c +@@ -737,7 +737,7 @@ Uint8 mem_read_default(Uint16 adr) + return 0xFF; + } + +-__inline__ void update_gb_pad(void) { ++extern __inline__ void update_gb_pad(void) { + gb_pad=0; + if (!conf.play_movie) { + diff -Nru gngb-20060309/debian/patches/gngb_fcc5_fix.patch gngb-20060309/debian/patches/gngb_fcc5_fix.patch --- gngb-20060309/debian/patches/gngb_fcc5_fix.patch 2017-08-17 07:00:20.000000000 +0000 +++ gngb-20060309/debian/patches/gngb_fcc5_fix.patch 2017-08-16 21:37:46.000000000 +0000 @@ -1,6 +1,17 @@ ---- a/src/cpu.c 2015-07-07 17:13:40.761787869 +0000 -+++ b/src/cpu.c 2015-07-07 17:19:41.433800469 +0000 -@@ -2826,7 +2826,7 @@ +From: Debian Games Team +Date: Thu, 10 Aug 2017 19:06:36 +0000 +Subject: gngb_fcc5_fix + +--- + src/cpu.c | 2 +- + src/vram.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/cpu.c b/src/cpu.c +index f03a811..57bc209 100644 +--- a/src/cpu.c ++++ b/src/cpu.c +@@ -2826,7 +2826,7 @@ __inline__ void rom_timer_inc(void) { } } @@ -9,10 +20,11 @@ static Uint32 divid_cycle; int v=0; Uint8 a; -diff -urN a/src/vram.c b/src/vram.c ---- a/src/vram.c 2015-07-07 17:15:13.713791116 +0000 -+++ b/src/vram.c 2015-07-07 17:19:36.793800306 +0000 -@@ -242,7 +242,7 @@ +diff --git a/src/vram.c b/src/vram.c +index 206b625..7213b4e 100644 +--- a/src/vram.c ++++ b/src/vram.c +@@ -242,7 +242,7 @@ void switch_fullscreen(void) { conf.fs^=1; } diff -Nru gngb-20060309/debian/patches/joystick-axis.patch gngb-20060309/debian/patches/joystick-axis.patch --- gngb-20060309/debian/patches/joystick-axis.patch 1970-01-01 00:00:00.000000000 +0000 +++ gngb-20060309/debian/patches/joystick-axis.patch 2017-08-16 21:37:46.000000000 +0000 @@ -0,0 +1,56 @@ +From: Markus Koschany +Date: Wed, 16 Aug 2017 23:25:30 +0200 +Subject: joystick axis + +Bug-Debian: https://bugs.debian.org/592777 +Forwarded: http://m.peponas.free.fr/gngb/news.html +Origin: http://m.peponas.free.fr/gngb/download/memory.c.diff +--- + src/memory.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/src/memory.c b/src/memory.c +index fd06738..9eaef1f 100644 +--- a/src/memory.c ++++ b/src/memory.c +@@ -67,7 +67,11 @@ Uint8 ram_mask; + MEM_READ_ENTRY mem_read_tab[0x10]; + MEM_WRITE_ENTRY mem_write_tab[0x10]; + ++/* doesn't work for negative joy_?_min */ ++/* + Sint16 joy_x_min=0;joy_x_max=0;joy_y_min=0;joy_y_max=0; ++*/ ++Sint16 joy_x_min=-32767;joy_x_max=32767;joy_y_min=-32767;joy_y_max=32767; + + void (*select_rom_page)(Uint16 adr,Uint8 v); + void (*select_ram_page)(Uint16 adr,Uint8 v); +@@ -755,15 +759,28 @@ extern __inline__ void update_gb_pad(void) { + Sint16 joy_x_pos=joy_axis[jmap[PAD_LEFT]]; + Sint16 joy_y_pos=joy_axis[jmap[PAD_UP]]; + ++ /* unnecessary if joy_?_min and joy_?_max are minimum and maximum ++ * values of Sint16 + if (joy_x_pos>joy_x_max) joy_x_max=joy_x_pos; + if (joy_x_posjoy_y_max) joy_y_max=joy_y_pos; + if (joy_y_pos> 1; ++ Sint16 joy_y_mid=(joy_y_max+joy_y_min) >> 1; ++ /* this doesn't work as joy_x_mid or joy_y_mid approaches 0 + Sint16 joy_x_qua=joy_x_mid / 2; + Sint16 joy_y_qua=joy_y_mid / 2; ++ */ ++ /* (difference) / 100 = 1% of possible values */ ++ Sint16 joy_x_qua=(joy_x_max - joy_x_min) / 100; ++ Sint16 joy_y_qua=(joy_y_max - joy_y_min) / 100; + + if ((joy_x_pos<(joy_x_mid-joy_x_qua)) || (key[kmap[PAD_LEFT]])) gb_pad|=0x20; + if ((joy_x_pos>(joy_x_mid+joy_x_qua)) || (key[kmap[PAD_RIGHT]])) gb_pad|=0x10; diff -Nru gngb-20060309/debian/patches/manpage-spelling.patch gngb-20060309/debian/patches/manpage-spelling.patch --- gngb-20060309/debian/patches/manpage-spelling.patch 1970-01-01 00:00:00.000000000 +0000 +++ gngb-20060309/debian/patches/manpage-spelling.patch 2017-08-16 21:37:46.000000000 +0000 @@ -0,0 +1,48 @@ +From: Markus Koschany +Date: Wed, 16 Aug 2017 23:52:53 +0200 +Subject: manpage spelling + +Fix two minor spelling mistakes and clarify where users can find more +information about the gngbrc file. (partial fix for #597910) + +Forwarded: no +--- + gngb.1 | 4 ++-- + src/emu.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gngb.1 b/gngb.1 +index dbd8e91..c358ec8 100644 +--- a/gngb.1 ++++ b/gngb.1 +@@ -99,7 +99,7 @@ Leave it off unless you are working around problems in a certain program. + .B \-v, \-\-version + Show version of program. + .PP +-Most options can be disabled whith --no-OPTION (Ex: --no-sound turn sound off) ++Most options can be disabled with --no-OPTION (Ex: --no-sound turn sound off) + .PP + .SH "DEFAULT BINDINGS" + These are the default keys in the emulator. These, along with the joystick +@@ -133,7 +133,7 @@ KeyPad 6 : Toggle color filter + + .SH "SEE ALSO" + There is some good info in the README included in the doc directory. +-The gngbrc file is documented in manual section 5. ++The gngbrc file is documented in /usr/share/doc/gngb/examples/sample_gngbrc. + .SH AUTHOR + This manual page was written by RCU , + for the Debian GNU/Linux system (but may be used by others). +diff --git a/src/emu.c b/src/emu.c +index 91d4b88..b636da3 100644 +--- a/src/emu.c ++++ b/src/emu.c +@@ -172,7 +172,7 @@ void print_help(void) { + printf(" -g, --gdma_cycle cpu stop during gdma transfer (experimental)\n"); + printf(" -v, --version printf gngb number version\n"); + printf("\n"); +- printf("Most options can be disabled whith --no-OPTION (Ex: --no-sound turn sound off)\n\n"); ++ printf("Most options can be disabled with --no-OPTION (Ex: --no-sound turn sound off)\n\n"); + exit(0); + } + diff -Nru gngb-20060309/debian/patches/reproducible-build.patch gngb-20060309/debian/patches/reproducible-build.patch --- gngb-20060309/debian/patches/reproducible-build.patch 1970-01-01 00:00:00.000000000 +0000 +++ gngb-20060309/debian/patches/reproducible-build.patch 2017-08-16 21:37:46.000000000 +0000 @@ -0,0 +1,30 @@ +From: Chris Lamb +Date: Wed, 16 Aug 2017 22:53:10 +0200 +Subject: reproducible build + +Bug-Debian: https://bugs.debian.org/831773 +--- + configure.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 9b8aeec..145bd73 100644 +--- a/configure.in ++++ b/configure.in +@@ -90,6 +90,7 @@ fi + dnl Arch + + case `uname -m` in ++*x86_64) arch_info=x86_64 ;; + *686) arch_info=i686 ;; + *i586) arch_info=i586 ;; + *i486) arch_info=i486 ;; +@@ -107,7 +108,7 @@ sys_info=`uname -s` + AC_MSG_RESULT(System: $sys_info) + + case $arch_info in +-i686|i586|i486|i386) OPT="-O3 -Wno-unused -funroll-loops -fstrength-reduce \ ++x86_64|i686|i586|i486|i386) OPT="-O3 -Wno-unused -funroll-loops -fstrength-reduce \ + -ffast-math -falign-functions=2 -falign-jumps=2 \ + -falign-loops=2 -fomit-frame-pointer -Wall " ;; + sun4u) OPT="-O3 -Wno-unused -funroll-loops -fstrength-reduce \ diff -Nru gngb-20060309/debian/patches/sample_gngbrc.patch gngb-20060309/debian/patches/sample_gngbrc.patch --- gngb-20060309/debian/patches/sample_gngbrc.patch 1970-01-01 00:00:00.000000000 +0000 +++ gngb-20060309/debian/patches/sample_gngbrc.patch 2017-08-16 21:37:46.000000000 +0000 @@ -0,0 +1,24 @@ +From: Markus Koschany +Date: Thu, 17 Aug 2017 00:15:26 +0200 +Subject: sample_gngbrc + +Bug-Debian: https://bugs.debian.org/597910 +Forwarded: no +--- + sample_gngbrc | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/sample_gngbrc b/sample_gngbrc +index a76b465..d0fdd3f 100644 +--- a/sample_gngbrc ++++ b/sample_gngbrc +@@ -65,6 +65,9 @@ map_joy 1,1,0,0,3,2,0,1 + + map_key 273,274,276,275,120,119,13,303 + ++# Key configuration qwerty example ++# map_key 273,274,276,275,122,120,13,303 ++ + + # Normal GB palette (bright to dark) + pal_1 0xB8A68D,0x917D5E,0x635030,0x211A10 diff -Nru gngb-20060309/debian/patches/series gngb-20060309/debian/patches/series --- gngb-20060309/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ gngb-20060309/debian/patches/series 2017-08-16 21:37:46.000000000 +0000 @@ -0,0 +1,9 @@ +fix_gngb.1_manpage.patch +FTBFS_with_gcc-3.4_conflicting_types.patch +gngb_fcc5_fix.patch +gcc7.patch +reproducible-build.patch +joystick-axis.patch +clang-ftbfs.patch +manpage-spelling.patch +sample_gngbrc.patch diff -Nru gngb-20060309/debian/rules gngb-20060309/debian/rules --- gngb-20060309/debian/rules 2017-08-17 07:00:20.000000000 +0000 +++ gngb-20060309/debian/rules 2017-08-16 21:37:46.000000000 +0000 @@ -1,7 +1,5 @@ #!/usr/bin/make -f - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk -# Add here any variable or target overrides you need. +%: + dh $@ + diff -Nru gngb-20060309/debian/source/format gngb-20060309/debian/source/format --- gngb-20060309/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ gngb-20060309/debian/source/format 2017-08-16 21:37:46.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt)