Control: tags -1 pending Dear maintainer,
I've uploaded an NMU for glob2 versioned as 0.9.4.4-2.5. Please find attached the debdiff. Regards, Markus
diff -u glob2-0.9.4.4/debian/changelog glob2-0.9.4.4/debian/changelog
--- glob2-0.9.4.4/debian/changelog
+++ glob2-0.9.4.4/debian/changelog
@@ -1,3 +1,14 @@
+glob2 (0.9.4.4-2.5) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add missing build-arch and build-indep targets to debian/rules.
+ Thanks to Santiago Vila for the patch. (Closes: #821987)
+ * Add glob2-gcc6.patch and fix FTBFS with GCC-6. Thanks to Graham Inggs and
+ Leo Wandersleb for the patch. (Closes: #812167)
+ * debian/rules: Replace deprecated dh_clean -k with dh_prep.
+
+ -- Markus Koschany <a...@debian.org> Wed, 28 Sep 2016 22:26:07 +0200
+
glob2 (0.9.4.4-2.4) unstable; urgency=medium
* Non-maintainer upload.
diff -u glob2-0.9.4.4/debian/patches/series glob2-0.9.4.4/debian/patches/series
--- glob2-0.9.4.4/debian/patches/series
+++ glob2-0.9.4.4/debian/patches/series
@@ -7,0 +8 @@
+glob2-gcc6.patch
diff -u glob2-0.9.4.4/debian/rules glob2-0.9.4.4/debian/rules
--- glob2-0.9.4.4/debian/rules
+++ glob2-0.9.4.4/debian/rules
@@ -25,6 +25,10 @@
#
#export CXXFLAGS
+build-arch: build
+
+build-indep: build
+
build: build-stamp
build-stamp: patch
@@ -49,7 +53,7 @@
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# scons install INSTALLDIR=$(CURDIR)/debian/tmp/usr/share/games/
BINDIR=$(CURDIR)/debian/tmp/usr/games/
@@ -129 +133 @@
-#.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install build build-arch
build-indep
only in patch2:
unchanged:
--- glob2-0.9.4.4.orig/debian/patches/glob2-gcc6.patch
+++ glob2-0.9.4.4/debian/patches/glob2-gcc6.patch
@@ -0,0 +1,28 @@
+Description: Fix some compiler warnings
+ This fixes a FTBFS with GCC 6 where the warnings are now errors.
+Bug-Debian: https://bugs.debian.org/812167
+Origin: upstream,
https://bitbucket.org/giszmo/glob2/commits/a9a16d8631db0176267b4f4aefd8e93767f8d247
+Author: Leo Wandersleb <leo.wanders...@gmx.de>
+Last-Update: 2011-11-03
+--- a/src/ChooseMapScreen.cpp
++++ b/src/ChooseMapScreen.cpp
+@@ -31,7 +31,7 @@
+
+ #include "Game.h"
+
+-ChooseMapScreen::ChooseMapScreen(const char *directory, const char
*extension, bool recurse, const char* alternateDirectory, const char*
alternateExtension, const char* alternateRecurse)
++ChooseMapScreen::ChooseMapScreen(const char *directory, const char
*extension, bool recurse, const char* alternateDirectory, const char*
alternateExtension, const bool alternateRecurse)
+ {
+ ok = new TextButton(440, 360, 180, 40, ALIGN_SCREEN_CENTERED,
ALIGN_SCREEN_CENTERED, "menu", Toolkit::getStringTable()->getString("[ok]"),
OK, 13);
+ addWidget(ok);
+--- a/src/ChooseMapScreen.h
++++ b/src/ChooseMapScreen.h
+@@ -43,7 +43,7 @@
+ /// Constructor. Directory is the source of the listed files.
+ /// extension is the file extension to show. If recurse is true,
+ /// subdirectoried are shown and can be opened.
+- ChooseMapScreen(const char *directory, const char *extension, bool
recurse, const char* alternateDirectory=NULL, const char*
alternateExtension=NULL, const char* alternateRecurse=NULL);
++ ChooseMapScreen(const char *directory, const char *extension, bool
recurse, const char* alternateDirectory=NULL, const char*
alternateExtension=NULL, const bool alternateRecurse=NULL);
+ //! Destructor
+ virtual ~ChooseMapScreen();
+ virtual void onAction(Widget *source, Action action, int par1, int
par2);
signature.asc
Description: OpenPGP digital signature
