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

[Felix Geyer]

The following commit has been merged in the master branch:
commit 88c9655c49c788321f19432183142277a60cf8a9
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sat Feb 12 20:35:13 2011 +0100

    Refresh patches.

diff --git a/debian/changelog b/debian/changelog
index b58c032..c8f1eb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ warmux (1:11.01-1) UNRELEASED; urgency=low
 
   * New upstream release.
     - Changed name to WarMUX.
+  * Refresh patches.
 
- -- Felix Geyer <debfx-pkg at fobos.de>  Sat, 12 Feb 2011 19:14:04 +0100
+ -- Felix Geyer <debfx-pkg at fobos.de>  Sat, 12 Feb 2011 20:34:50 +0100
 
 wormux (1:0.9.2.1-1) experimental; urgency=low
 
diff --git a/debian/patches/02_desktop_file.patch b/debian/patches/02_desktop_file.patch
index 716781d..381642e 100644
--- a/debian/patches/02_desktop_file.patch
+++ b/debian/patches/02_desktop_file.patch
@@ -1,18 +1,16 @@
 Description: Remove deprecated entries and fix icon name.
 Author: Felix Geyer <debfx-pkg at fobos.de>
 
-Index: wormux-0.9.2.1/data/wormux.desktop
-===================================================================
---- wormux-0.9.2.1.orig/data/wormux.desktop	2010-04-25 11:29:03.000000000 +0200
-+++ wormux-0.9.2.1/data/wormux.desktop	2010-04-25 11:29:17.000000000 +0200
+--- warmux-11.01.orig/data/warmux.desktop
++++ warmux-11.01/data/warmux.desktop
 @@ -1,9 +1,7 @@
  [Desktop Entry]
 -Version=1.0
 -Encoding=UTF-8
- Name=Wormux
+ Name=Warmux
  Type=Application
--Icon=wormux_128x128.png
-+Icon=wormux
- Exec=wormux
+-Icon=warmux_128x128.png
++Icon=warmux
+ Exec=warmux
  Terminal=false
  StartupNotify=false
diff --git a/debian/patches/03_respect_build_flags_from_env.patch b/debian/patches/03_respect_build_flags_from_env.patch
index b869250..66a76a8 100644
--- a/debian/patches/03_respect_build_flags_from_env.patch
+++ b/debian/patches/03_respect_build_flags_from_env.patch
@@ -1,17 +1,17 @@
 Description: Don't reset CFLAGS/CXXFLAGS but use the environment variables.
 Author: Felix Geyer <debfx-pkg at fobos.de>
 
---- wormux-0.9.2.1.orig/configure.ac
-+++ wormux-0.9.2.1/configure.ac
-@@ -51,7 +51,6 @@ dnl ====================================
- dnl === Options for users                                                   =
- dnl =========================================================================
+--- warmux-11.01.orig/configure.ac
++++ warmux-11.01/configure.ac
+@@ -43,7 +43,6 @@
+   AC_MSG_ERROR([*** No C++ compiler can be found!])
+ fi
  
 -AX_CFLAGS_WARN_ALL([CXXFLAGS])
  
- AC_ARG_ENABLE([servers],
-               [AS_HELP_STRING([--enable-servers],
-@@ -195,12 +195,6 @@ if test "x$GCC" = "xyes"; then
+ # ========================================================================
+ # == Set flags for various environments                                  =
+@@ -193,12 +193,6 @@
      GCC_FLAGS="$GCC_FLAGS -DWMX_LOG"
    fi
  
diff --git a/debian/patches/04_fix_build_kfreebsd.patch b/debian/patches/04_fix_build_kfreebsd.patch
index eb320b9..ecf4650 100644
--- a/debian/patches/04_fix_build_kfreebsd.patch
+++ b/debian/patches/04_fix_build_kfreebsd.patch
@@ -1,14 +1,14 @@
 Description: Fix FTBFS on kfreebsd.
 Author: Gonéri Le Bouder <goneri at rulezlan.org>
 
---- wormux-0.9.2.1.orig/configure.ac
-+++ wormux-0.9.2.1/configure.ac
-@@ -7522,7 +7522,7 @@ case "${host}" in
-      WIN32="yes"
-      ;;
+--- warmux-11.01.orig/configure.ac
++++ warmux-11.01/configure.ac
+@@ -54,7 +54,7 @@ case "${host}" in
+ case "${host}" in
+   i[[3456789]]86-*-mingw32*) WIN32="yes" ;;
    *freebsd*)
--     LIBS="$LIBS -lintl" # a temporary hackish workaround
-+     LIBS="$LIBS" # a temporary hackish workaround
-      ;;
+-    LIBS="$LIBS -lintl" # a temporary hackish workaround
++    LIBS="$LIBS" # a temporary hackish workaround
+     ;;
    *cygwin*) WIN32="yes" ;;
    *-apple-darwin*)

-- 
WarMUX PKG