Commit 2f0bec9b authored by gregor herrmann's avatar gregor herrmann Committed by Andreas Tille

Import Debian changes 2.6.1-1.1

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
parent 82c9d557
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 <gregoa@debian.org> Thu, 29 Dec 2011 17:50:55 +0100
lbreakout2 (2.6.1-1) unstable; urgency=low
* New upstream release (Closes: #342869).
......
10-ball-turbo-key-pref.dpatch
40-cflags-Wall.dpatch
50-locale.h.dpatch
#! /bin/sh /usr/share/dpatch/dpatch-run
## 50-locale.h.dpatch by gregor herrmann <gregoa@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
......@@ -13,7 +13,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
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 @@ endif
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 @@ endif
dh_clean
install: build
install: install-stamp
install-stamp: build-stamp
dh_testdir
dh_testroot
dh_clean -k
......@@ -82,6 +84,8 @@ install: build
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment