[Pkg-cli-apps-commits] [SCM] smuxi branch, lucid-backports, updated. debian/0.8.11-1-44-gd9255d9

[Mirco Bauer]

The following commit has been merged in the lucid-backports branch:
commit 6f1b3d553814a500660ab93edb84242a9b0a1e3a
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Jun 1 15:22:08 2013 +0200

    Revert "Fixed messagingmenu-sharp detection"
    
    This reverts commit 626caa0c22ad3757ce902ab316936fc78bbcbf63.
    
    Conflicts:
    	debian/patches/series
    	debian/patches/ubuntu.series

diff --git a/debian/patches/fix_messagingmenu-sharp_detection.patch b/debian/patches/fix_messagingmenu-sharp_detection.patch
deleted file mode 100644
index cb98840..0000000
--- a/debian/patches/fix_messagingmenu-sharp_detection.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: smuxi/configure.ac
-===================================================================
---- smuxi.orig/configure.ac	2013-05-30 13:54:28.496357280 +0200
-+++ smuxi/configure.ac	2013-05-30 13:55:10.556358174 +0200
-@@ -242,7 +242,7 @@
- )
- WITH_MESSAGINGMENU=$with_messagingmenu
- if test "x$WITH_MESSAGINGMENU" = "xauto"; then
--	PKG_CHECK_EXISTS([messagingmenu-sharp-0.1], FOUND_MESSAGINGMENU_SHARP=yes, FOUND_MESSAGINGMENU_SHARP=no)
-+	PKG_CHECK_EXISTS([messagingmenu-sharp], FOUND_MESSAGINGMENU_SHARP=yes, FOUND_MESSAGINGMENU_SHARP=no)
- 	if test "x$FOUND_MESSAGINGMENU_SHARP" = "xyes"; then
- 		WITH_MESSAGINGMENU=system
- 	else
-@@ -255,7 +255,7 @@
- 	fi
- fi
- if test "x$WITH_MESSAGINGMENU" = "xsystem"; then
--	PKG_CHECK_MODULES([MESSAGINGMENU_SHARP], [messagingmenu-sharp-0.1])
-+	PKG_CHECK_MODULES([MESSAGINGMENU_SHARP], [messagingmenu-sharp])
- fi
- if test "x$WITH_MESSAGINGMENU" = "xincluded"; then
- 	if test ! -f "$srcdir/lib/messagingmenu-sharp/configure.ac"; then
diff --git a/debian/patches/series b/debian/patches/series
index 8597182..8a5f010 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 remove_messagingmenu-sharp_from_SUBDIRS.patch
-fix_messagingmenu-sharp_detection.patch
 build_Newtonsoft.Json_with_default_compiler.patch
 build_Twitterizer2_with_default_compiler.patch
 build_db4o_with_default_compiler.patch
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
index 5f16294..df3f2d1 100644
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -1,5 +1,4 @@
 remove_messagingmenu-sharp_from_SUBDIRS.patch
-fix_messagingmenu-sharp_detection.patch
 build_Newtonsoft.Json_with_default_compiler.patch
 build_Twitterizer2_with_default_compiler.patch
 build_db4o_with_default_compiler.patch

-- 
smuxi