[SCM] Packaging for lierolibre branch, master, updated. upstream/0.4-47-gff75bfe

[Martin Erik Werner]

The following commit has been merged in the master branch:
commit 0ec0767cca82347f87011b9821ed6f7d30218179
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Sat Jun 23 16:39:08 2012 +0200

    Workaround creation of "you" file in d/rules instead
    
    Remove debian/patches/fix-configure-creating-files-from-messages.patch

diff --git a/debian/patches/fix-configure-creating-files-from-messages.patch b/debian/patches/fix-configure-creating-files-from-messages.patch
deleted file mode 100644
index b225fa9..0000000
--- a/debian/patches/fix-configure-creating-files-from-messages.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 7e9180a936d497e5bd2f8b5d11bebd90f33f793d Mon Sep 17 00:00:00 2001
-From: Martin Erik Werner <martinerikwerner at gmail.com>
-Date: Sat, 23 Jun 2012 14:15:41 +0200
-Subject: [PATCH] Fix configure creating files from messages
-
-Add [] quoting to all messages in order to avoid "," being
-interpreted as a separator and causing creation of files
----
- configure.ac |   10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-Origin: upstream, https://gitorious.org/lierolibre/lierolibre/commit/7e9180a936d497e5bd2f8b5d11bebd90f33f793d
-
-diff --git a/configure.ac b/configure.ac
-index 975557a..09faded 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,7 +23,7 @@ AC_PROG_MAKE_SET
- 
- AC_CHECK_PROG(HAS_SOX, sox, yes)
- if test x"$HAS_SOX" != x"yes" ; then
--	AC_MSG_WARN(SoX not found, you will need this to build the sound data!)
-+	AC_MSG_WARN([SoX not found, you will need this to build the sound data!])
- fi
- 
- AC_CHECK_PROG(HAS_IM, convert, yes)
-@@ -36,7 +36,7 @@ BOOST_PO_LIBS=""
- AC_LANG_PUSH([C++])
- 	AC_CHECK_HEADER([boost/program_options.hpp],
- 	[BOOST_PO_LIBS="-lboost_program_options"],
--	[AC_MSG_WARN(boost_program_options header not found, you will need this to compile lierolibre!)])
-+	[AC_MSG_WARN([boost_program_options header not found, you will need this to compile lierolibre!])])
- AC_LANG_POP([C++])
- AC_SUBST(BOOST_PO_LIBS)
- 
-@@ -60,10 +60,10 @@ PKG_CHECK_MODULES([SDL_MIXER], [SDL_mixer],
- AS_IF([test "x$pkgcSDLM" = "xno"], [
- 	AC_CHECK_HEADERS([SDL/SDL_mixer.h],
- 		[SDL_MIXER_CFLAGS="-D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL"],
--		[AC_MSG_WARN(SDL_mixer headers not found, you will need this to compile lierolibre!)])
-+		[AC_MSG_WARN([SDL_mixer headers not found, you will need this to compile lierolibre!])])
- 	AC_CHECK_LIB(SDL_mixer, Mix_OpenAudio,
- 		[SDL_MIXER_LIBS="-lSDL_mixer -lSDL"],
--		[AC_MSG_WARN(SDL_mixer library not found, you will need this to link lierolibre!)])
-+		[AC_MSG_WARN([SDL_mixer library not found, you will need this to link lierolibre!])])
- 	])
- 
- PKG_CHECK_MODULES([ZLIB], [zlib])
-@@ -88,7 +88,7 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h fenv.h float.h limits.h malloc.h netdb.h n
- AC_LANG_PUSH([C++])
- AC_CHECK_HEADERS([tut/tut.hpp tut/tut_reporter.hpp tut/tut_restartable.hpp],
- 	[],
--	[AC_MSG_NOTICE(libtut headers not found, you will need these to compile gvltest)])
-+	[AC_MSG_NOTICE([libtut headers not found, you will need these to compile gvltest])])
- AC_LANG_POP([C++])
- 
- # Checks for typedefs, structures, and compiler characteristics.
--- 
-1.7.10
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7d07889..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-configure-creating-files-from-messages.patch
diff --git a/debian/rules b/debian/rules
index 0a35c66..f5c3864 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,10 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 %:
 	dh $@ --with autotools_dev --parallel
 
+override_dh_auto_clean:
+	dh_auto_clean
+	-rm you # Workaround bug in configure.ac
+
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		CPPFLAGS="$(CPPFLAGS)" \

-- 
Packaging for lierolibre