Hi all, I plan to NMU this package. The debdiff is as attachment.
I'll wait to 20th Dec and then upload to delay/10 queue. Yours, Paul
diff -Nru gramophone2-0.8.13a/debian/changelog gramophone2-0.8.13a/debian/changelog --- gramophone2-0.8.13a/debian/changelog 2020-03-28 08:24:28.000000000 +0800 +++ gramophone2-0.8.13a/debian/changelog 2022-12-13 05:48:33.000000000 +0800 @@ -1,3 +1,17 @@ +gramophone2 (0.8.13a-3.2) unstable; urgency=low + + [ Ying-Chun Liu (PaulLiu) <paul...@debian.org> ] + * Non-maintainer upload. + * Bump debhelper compat to 10. (Closes: #965567) + [ Lukas Märdian <sl...@ubuntu.com> ] + * Fix FTBFS by gcc-10 (Closes: #966862) + [ Nicolas Sévelin-Radiguet <nic...@free.fr> ] + * Fix FTBFS by clang (Closes: #760662) + [ Andreas Moog <am...@ubuntu.com> ] + * Include patches from Ubuntu (Closes: #738279) + + -- Ying-Chun Liu (PaulLiu) <paul...@debian.org> Tue, 13 Dec 2022 05:48:33 +0800 + gramophone2 (0.8.13a-3.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru gramophone2-0.8.13a/debian/compat gramophone2-0.8.13a/debian/compat --- gramophone2-0.8.13a/debian/compat 2020-03-28 07:55:12.000000000 +0800 +++ gramophone2-0.8.13a/debian/compat 2022-12-13 05:48:23.000000000 +0800 @@ -1 +1 @@ -5 +10 diff -Nru gramophone2-0.8.13a/debian/control gramophone2-0.8.13a/debian/control --- gramophone2-0.8.13a/debian/control 2020-03-28 07:55:12.000000000 +0800 +++ gramophone2-0.8.13a/debian/control 2022-12-13 05:48:30.000000000 +0800 @@ -2,7 +2,7 @@ Section: sound Priority: optional Maintainer: Francesco Namuri <fra...@debian.org> -Build-Depends: debhelper (>= 5), cdbs, bison, flex, dpkg-dev (>= 1.16.1~), quilt +Build-Depends: debhelper (>= 10), cdbs, bison, flex, dpkg-dev (>= 1.16.1~), quilt Standards-Version: 3.9.5 Homepage: http://gramophone2.sourceforge.net/ diff -Nru gramophone2-0.8.13a/debian/patches/clang_FTBFS.patch gramophone2-0.8.13a/debian/patches/clang_FTBFS.patch --- gramophone2-0.8.13a/debian/patches/clang_FTBFS.patch 1970-01-01 08:00:00.000000000 +0800 +++ gramophone2-0.8.13a/debian/patches/clang_FTBFS.patch 2022-12-13 05:48:33.000000000 +0800 @@ -0,0 +1,14 @@ +Description: fix FTBFS with clang [-Wreturn-type] +Author: Nicolas Sévelin-Radiguet <nic...@free.fr> +Last-Update: 2014-09-06 +--- a/midifile.c ++++ b/midifile.c +@@ -156,7 +156,7 @@ + int format, ntrks, division; + + if ( readmt("MThd") == EOF ) +- return; ++ return -1; + + Mf_toberead = read32bit(); + format = read16bit(); diff -Nru gramophone2-0.8.13a/debian/patches/fix_gcc.patch gramophone2-0.8.13a/debian/patches/fix_gcc.patch --- gramophone2-0.8.13a/debian/patches/fix_gcc.patch 2020-03-28 08:23:54.000000000 +0800 +++ gramophone2-0.8.13a/debian/patches/fix_gcc.patch 1970-01-01 08:00:00.000000000 +0800 @@ -1,27 +0,0 @@ -Description: Fix FTBFS with GCC - -Author: Sudip Mukherjee <sudipm.mukher...@gmail.com> - ---- - ---- gramophone2-0.8.13a.orig/Makefile -+++ gramophone2-0.8.13a/Makefile -@@ -1,7 +1,8 @@ - CC=gcc - #CFLAGS+=-O2 - #Decomment this line if you use Linux: --CFLAGS+=-O2 -lm -+CFLAGS+=-O2 -+LIBS+=-lm - - DESTDIR=/usr/local - -@@ -9,7 +10,7 @@ default: GRAMophone.tab.c - $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o gramophone2 GRAMophone.c\ - grammyVM.c init.c midicode.c\ - midifile.c expcode.c debug.c errors.c\ -- hash.c GRAMophone.tab.c -+ hash.c GRAMophone.tab.c $(LIBS) - - GRAMophone.tab.c: lex.yy.c - bison -d GRAMophone.y diff -Nru gramophone2-0.8.13a/debian/patches/Makefile.diff gramophone2-0.8.13a/debian/patches/Makefile.diff --- gramophone2-0.8.13a/debian/patches/Makefile.diff 2020-03-28 07:55:12.000000000 +0800 +++ gramophone2-0.8.13a/debian/patches/Makefile.diff 2022-12-13 05:48:33.000000000 +0800 @@ -1,6 +1,26 @@ ---- a/Makefile -+++ b/Makefile -@@ -6,7 +6,7 @@ +Description: The included Makefile for unix has some problems: + It adds -lm to the CFLAGS. -lm is a linker option and as such + has no place in CFLAGS (which are used for compiler flags). + Due to this, -lm appears on the command line way before any + object files. This leads to it being discarded when the linker + flag --as-needed is set. An example failure can be observed under + Ubuntu: /«PKGBUILDDIR»/grammyVM.c:1498: undefined reference to `log10' +Forwarded: yes, https://sourceforge.net/p/gramophone2/bugs/3/attachment/Makefile +Bug: https://sourceforge.net/p/gramophone2/bugs/3/ +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1277954 + +Index: gramophone2-0.8.13a/Makefile +=================================================================== +--- gramophone2-0.8.13a.orig/Makefile 2014-02-08 21:45:36.087812116 +0100 ++++ gramophone2-0.8.13a/Makefile 2014-02-08 21:46:00.875811707 +0100 +@@ -1,15 +1,16 @@ + CC=gcc + #CFLAGS+=-O2 + #Decomment this line if you use Linux: +-CFLAGS+=-O2 -lm ++CFLAGS+=-O2 ++LDLIBS+=-lm + DESTDIR=/usr/local default: GRAMophone.tab.c @@ -8,4 +28,8 @@ + $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o gramophone2 GRAMophone.c\ grammyVM.c init.c midicode.c\ midifile.c expcode.c debug.c errors.c\ - hash.c GRAMophone.tab.c +- hash.c GRAMophone.tab.c ++ hash.c GRAMophone.tab.c $(LDLIBS) + + GRAMophone.tab.c: lex.yy.c + bison -d GRAMophone.y diff -Nru gramophone2-0.8.13a/debian/patches/series gramophone2-0.8.13a/debian/patches/series --- gramophone2-0.8.13a/debian/patches/series 2020-03-28 08:24:24.000000000 +0800 +++ gramophone2-0.8.13a/debian/patches/series 2022-12-13 05:48:33.000000000 +0800 @@ -1,4 +1,4 @@ Makefile.diff GRAMophone.y.diff grammyVM.c.diff -fix_gcc.patch +clang_FTBFS.patch diff -Nru gramophone2-0.8.13a/debian/rules gramophone2-0.8.13a/debian/rules --- gramophone2-0.8.13a/debian/rules 2020-03-28 08:18:35.000000000 +0800 +++ gramophone2-0.8.13a/debian/rules 2022-12-13 05:48:11.000000000 +0800 @@ -1,5 +1,6 @@ #!/usr/bin/make -f +export DEB_CFLAGS_MAINT_APPEND = -fcommon include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk
OpenPGP_0x44173FA13D058888.asc
Description: OpenPGP public key
OpenPGP_signature
Description: OpenPGP digital signature
