[Pkg-cli-apps-commits] [smuxi] 04/12: Dropped fix_messagingmenu-sharp_detection.patch and remove_messagingmenu-sharp_from_SUBDIRS.patch as already applied upstream

[Mirco Bauer]

This is an automated email from the git hooks/post-receive script.

meebey pushed a commit to branch master
in repository smuxi.

commit 2a8015bd2ec52bf15cfba472197ddee1c606fb68
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sun Aug 25 21:43:56 2013 +0200

    Dropped fix_messagingmenu-sharp_detection.patch and remove_messagingmenu-sharp_from_SUBDIRS.patch as already applied upstream
---
 .../fix_messagingmenu-sharp_detection.patch        |   22 --------------------
 .../remove_messagingmenu-sharp_from_SUBDIRS.patch  |   11 ----------
 debian/patches/series                              |    2 --
 debian/patches/ubuntu.series                       |    2 --
 4 files changed, 37 deletions(-)

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/remove_messagingmenu-sharp_from_SUBDIRS.patch b/debian/patches/remove_messagingmenu-sharp_from_SUBDIRS.patch
deleted file mode 100644
index 169b4be..0000000
--- a/debian/patches/remove_messagingmenu-sharp_from_SUBDIRS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: smuxi/lib/Makefile.am
-===================================================================
---- smuxi.orig/lib/Makefile.am	2013-05-29 21:37:47.726707987 +0200
-+++ smuxi/lib/Makefile.am	2013-05-30 14:18:29.428387909 +0200
-@@ -1,5 +1,4 @@
--SUBDIRS =	SmartIrc4net \
--			$(MESSAGINGMENU_SHARP_SUBDIR)
-+SUBDIRS =	SmartIrc4net
- 
- if WITH_MESSAGINGMENU_SHARP_INCLUDED
- MESSAGINGMENU_SHARP_SUBDIR = messagingmenu-sharp
diff --git a/debian/patches/series b/debian/patches/series
index 8597182..b127b5c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-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..21225a5 100644
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -1,5 +1,3 @@
-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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/smuxi.git