tags 643471 + patch
tags 643471 + pending
thanks

Dear maintainer,

I've prepared an NMU for lbreakout2 (versioned as 2.6.1-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
 .''`.   Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06
 : :' :  Debian GNU/Linux user, admin, & developer - http://www.debian.org/
 `. `'   Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe
   `-    NP: The Who: Substitute
diff -u lbreakout2-2.6.1/debian/rules lbreakout2-2.6.1/debian/rules
--- lbreakout2-2.6.1/debian/rules
+++ lbreakout2-2.6.1/debian/rules
@@ -13,7 +13,7 @@
 DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch-stamp
 	dh_testdir
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -31,18 +31,19 @@
 
 	touch configure-stamp
 
-build: configure-stamp build-stamp patch-stamp
-build-stamp:
+build: build-stamp
+build-stamp: configure-stamp
 	dh_testdir
 
 	$(MAKE)
 
 	touch build-stamp
 
-clean:	unpatch
+clean: clean-patched unpatch
+clean-patched:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -f build-stamp configure-stamp install-stamp
 
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f lbreakout2.desktop
@@ -57,7 +58,8 @@
 
 	dh_clean
 
-install: build
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
@@ -82,6 +84,8 @@
 	rm -fr debian/lbreakout2/usr/share/games/applications
 	rm -fr debian/lbreakout2/usr/share/games/icons
 
+	touch install-stamp
+
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
diff -u lbreakout2-2.6.1/debian/changelog lbreakout2-2.6.1/debian/changelog
--- lbreakout2-2.6.1/debian/changelog
+++ lbreakout2-2.6.1/debian/changelog
@@ -1,3 +1,14 @@
+lbreakout2 (2.6.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: server.c:1093:16: error: 'LC_ALL' undeclared (first use
+    in this function)": add patch 50-locale.h.dpatch: include locale.h in
+    common/gettext.h.
+  * Adjust targets in debian/rules.
+    Closes: #643471
+
+ -- gregor herrmann <gre...@debian.org>  Thu, 29 Dec 2011 17:50:55 +0100
+
 lbreakout2 (2.6.1-1) unstable; urgency=low
 
   * New upstream release (Closes: #342869).
diff -u lbreakout2-2.6.1/debian/patches/00list lbreakout2-2.6.1/debian/patches/00list
--- lbreakout2-2.6.1/debian/patches/00list
+++ lbreakout2-2.6.1/debian/patches/00list
@@ -2,0 +3 @@
+50-locale.h.dpatch
only in patch2:
unchanged:
--- lbreakout2-2.6.1.orig/debian/patches/50-locale.h.dpatch
+++ lbreakout2-2.6.1/debian/patches/50-locale.h.dpatch
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50-locale.h.dpatch by gregor herrmann <gre...@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Include locale.h in common/gettext.h
+## DP: http://bugs.debian.org/643471
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lbreakout2-2.6.1~/common/gettext.h lbreakout2-2.6.1/common/gettext.h
+--- lbreakout2-2.6.1~/common/gettext.h	2005-10-19 22:07:57.000000000 +0200
++++ lbreakout2-2.6.1/common/gettext.h	2011-12-29 17:24:02.000000000 +0100
+@@ -25,6 +25,11 @@
+ /* Get declarations of GNU message catalog functions.  */
+ # include <libintl.h>
+ 
++/* We need locale.h too, otherwise setlocale() bails out; cf. #643471 */
++#if HAVE_LOCALE_H
++# include <locale.h>
++#endif
++
+ #else
+ 
+ /* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which

Attachment: signature.asc
Description: Digital signature

Reply via email to