[SCM] WarMUX PKG branch, master, updated. 66851e07400683a8c4f568dcbe5477c849ec6dbc

[Felix Geyer]

The following commit has been merged in the master branch:
commit 66851e07400683a8c4f568dcbe5477c849ec6dbc
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sun Feb 13 18:00:50 2011 +0100

    Repack orig tarball to remove embedded source code of various libraries.

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..31cb59f
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,7 @@
+Source repackaging
+==================
+
+The upstream tarball used to build this package has been repackaged to
+remove unneeded/unwanted files and directories.
+
+The "repack" target of debian/rules removes these unwanted files.
diff --git a/debian/changelog b/debian/changelog
index 839e917..ffc6cb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-warmux (1:11.01-1) UNRELEASED; urgency=low
+warmux (1:11.01+repack-1) UNRELEASED; urgency=low
 
   * New upstream release.
     - Changed name to WarMUX.
@@ -8,8 +8,10 @@ warmux (1:11.01-1) UNRELEASED; urgency=low
     and warmux.pot, not needed anymore.
   * Switch to debhelper compat level 8.
   * Don't compress pdf files.
+  * Repack orig tarball to remove embedded source code of various libraries.
+    - Add 01_fix_repack_configure.patch
 
- -- Felix Geyer <debfx-pkg at fobos.de>  Sun, 13 Feb 2011 01:22:23 +0100
+ -- Felix Geyer <debfx-pkg at fobos.de>  Sun, 13 Feb 2011 15:30:32 +0100
 
 wormux (1:0.9.2.1-1) experimental; urgency=low
 
diff --git a/debian/patches/01_fix_repack_configure.patch b/debian/patches/01_fix_repack_configure.patch
new file mode 100644
index 0000000..8d63db0
--- /dev/null
+++ b/debian/patches/01_fix_repack_configure.patch
@@ -0,0 +1,28 @@
+Description: Fix autreconf with the repacked tarball.
+Author: Felix Geyer <debfx-pkg at fobos.de>
+
+diff -Nr -u4 warmux-11.01.orig/configure.ac warmux-11.01/configure.ac
+--- warmux-11.01.orig/configure.ac	2011-02-13 15:12:25.000000000 +0100
++++ warmux-11.01/configure.ac	2011-02-13 15:28:20.974249373 +0100
+@@ -376,21 +376,16 @@
+                  lib/fixedpoint/Makefile
+                  lib/warmux/Makefile
+                  po/Makefile
+                  ], [AM_POSTPROCESS_PO_MAKEFILE])
+-if test "${WIN32}" = "yes"; then
+-AC_CONFIG_FILES([build/win32_setup/create_setup.sh],
+-                [chmod +x build/win32_setup/create_setup.sh])
+-else
+ AC_CONFIG_FILES([lib/warmux-server/Makefile
+                  doc/Makefile
+                  tools/Makefile
+                  tools/list_games/Makefile
+                  tools/servers/Makefile
+                  tools/servers/game_server/Makefile
+                  tools/servers/index_server/Makefile
+                  ])
+-fi
+ 
+ AM_CONFIG_HEADER(lib/warmux/include/config_autotools.h)
+ 
+ AC_OUTPUT
diff --git a/debian/patches/series b/debian/patches/series
index 289e14a..c7e6ee0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+01_fix_repack_configure.patch
 02_desktop_file.patch
 03_respect_build_flags_from_env.patch
 04_fix_build_kfreebsd.patch
diff --git a/debian/rules b/debian/rules
index b1c1f64..6629aca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,3 +27,6 @@ override_dh_compress:
 
 override_dh_strip:
 	dh_strip --dbg-package=warmux-dbg
+
+repack:
+	rm -rf ./build
diff --git a/debian/watch b/debian/watch
index 2968eb4..156316f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
 
-opts="uversionmangle=s/beta/~beta/" \
+opts="uversionmangle=s/beta/~beta/,dversionmangle=s/\+repack$//" \
 http://download.gna.org/warmux/warmux-(\d[\d\.a-z]+)\.tar\.(?:bz2|gz)

-- 
WarMUX PKG