Control: tags -1 pending On Tue, 19 Jan 2016 18:21:45 -0800 Martin Michlmayr <t...@hpe.com> wrote: > Package: enigma > Version: 1.20-dfsg.1-2 > Severity: important > User: debian-...@lists.debian.org > Usertags: ftbfs-gcc-6 gcc-6-no-match > > This package fails to build with GCC 6. GCC 6 has not been released > yet, but it's expected that GCC 6 will become the default compiler for > stretch.
[...] Dear maintainer, I've prepared an NMU for enigma (versioned as 1.20-dfsg.1-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Please find attached the debdiff. Regards, Markus
diff -Nru enigma-1.20-dfsg.1/debian/changelog enigma-1.20-dfsg.1/debian/changelog --- enigma-1.20-dfsg.1/debian/changelog 2014-01-23 19:02:55.000000000 +0100 +++ enigma-1.20-dfsg.1/debian/changelog 2016-09-26 00:21:41.000000000 +0200 @@ -1,3 +1,16 @@ +enigma (1.20-dfsg.1-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add gcc6.patch and fix FTBFS with GCC-6. (Closes: #811826) + * Add desktop-file.patch and create a valid desktop file. Add keywords and a + comment in German. Thanks to Ronny Standtke for the report. + (Closes: #667656) + * enigma-doc.links: + Symlink index.html to /usr/share/doc/enigma-doc/manual/enigma.html. + Thanks to Ronny Standtke for the report. (Closes: #791690) + + -- Markus Koschany <a...@debian.org> Mon, 26 Sep 2016 00:21:41 +0200 + enigma (1.20-dfsg.1-2) unstable; urgency=low * Fixes uninitialized floors (patch r2382, Closes: #652983) diff -Nru enigma-1.20-dfsg.1/debian/enigma-doc.links enigma-1.20-dfsg.1/debian/enigma-doc.links --- enigma-1.20-dfsg.1/debian/enigma-doc.links 1970-01-01 01:00:00.000000000 +0100 +++ enigma-1.20-dfsg.1/debian/enigma-doc.links 2016-09-26 00:21:41.000000000 +0200 @@ -0,0 +1 @@ +usr/share/doc/enigma-doc/manual/enigma.html usr/share/doc/enigma-doc/index.html diff -Nru enigma-1.20-dfsg.1/debian/patches/desktop-file.patch enigma-1.20-dfsg.1/debian/patches/desktop-file.patch --- enigma-1.20-dfsg.1/debian/patches/desktop-file.patch 1970-01-01 01:00:00.000000000 +0100 +++ enigma-1.20-dfsg.1/debian/patches/desktop-file.patch 2016-09-26 00:21:41.000000000 +0200 @@ -0,0 +1,31 @@ +From: Markus Koschany <a...@debian.org> +Date: Sun, 25 Sep 2016 23:32:43 +0200 +Subject: desktop file + +Create a valid desktop file. Add keywords and a comment in German. + +Debian-Bug: https://bugs.debian.org/667656 +Forwarded: no +--- + etc/enigma.desktop | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/etc/enigma.desktop b/etc/enigma.desktop +index c33613c..95942fd 100644 +--- a/etc/enigma.desktop ++++ b/etc/enigma.desktop +@@ -4,6 +4,7 @@ Version=1.0 + Name=Enigma + + Comment=Uncover pairs of stones while navigating obstacles using a marble ++Comment[de]=Decke Steinpaare mit einer Kugel in einer Welt voller Hindernisse auf + + TryExec=enigma + Exec=enigma +@@ -13,4 +14,5 @@ Icon=enigma + StartupNotify=false + + Type=Application +-Categories=Application;Game;LogicGame; ++Categories=Game;LogicGame; ++Keywords=marble;puzzle;logic;level; diff -Nru enigma-1.20-dfsg.1/debian/patches/gcc6.patch enigma-1.20-dfsg.1/debian/patches/gcc6.patch --- enigma-1.20-dfsg.1/debian/patches/gcc6.patch 1970-01-01 01:00:00.000000000 +0100 +++ enigma-1.20-dfsg.1/debian/patches/gcc6.patch 2016-09-26 00:21:41.000000000 +0200 @@ -0,0 +1,25 @@ +From: Markus Koschany <a...@debian.org> +Date: Sun, 25 Sep 2016 23:21:20 +0200 +Subject: gcc6 + +Fix FTBFS with GCC-6. + +Debian-Bug: https://bugs.debian.org/811826 +Forwarded: no +--- + src/lev/Proxy.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lev/Proxy.cc b/src/lev/Proxy.cc +index 0003820..c069247 100644 +--- a/src/lev/Proxy.cc ++++ b/src/lev/Proxy.cc +@@ -933,7 +933,7 @@ namespace enigma { namespace lev { + } else if (haveLocalCopy) { + // plain file + basic_ifstream<char> ifs(absExtPath.c_str(), ios::binary | ios::in); +- if (ifs != NULL) ++ if (ifs) + Readfile(ifs, extCode); + else + haveLocalCopy = false; diff -Nru enigma-1.20-dfsg.1/debian/patches/series enigma-1.20-dfsg.1/debian/patches/series --- enigma-1.20-dfsg.1/debian/patches/series 2014-01-22 21:34:32.000000000 +0100 +++ enigma-1.20-dfsg.1/debian/patches/series 2016-09-26 00:21:41.000000000 +0200 @@ -3,3 +3,5 @@ enigma.desktop.patch bugfix-oldapi-r2382.patch localedir.patch +gcc6.patch +desktop-file.patch
signature.asc
Description: OpenPGP digital signature
