[mate-indicator-applet] 01/08: debian/patches/0001_avoid_conflicts_with_indicator_applet.patch. Applied upstream.

[Martin Wimpress]

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

flexiondotorg-guest pushed a commit to branch debian/experimental
in repository mate-indicator-applet.

commit 027c7d622af04ea2362c297b7da1bf5661cd4667
Author: Martin Wimpress <code at flexion.org>
Date:   Tue Jun 16 13:27:04 2015 +0100

    debian/patches/0001_avoid_conflicts_with_indicator_applet.patch. Applied upstream.
---
 ...001_avoid_conflicts_with_indicator_applet.patch | 156 ---------------------
 1 file changed, 156 deletions(-)

diff --git a/debian/patches/0001_avoid_conflicts_with_indicator_applet.patch b/debian/patches/0001_avoid_conflicts_with_indicator_applet.patch
deleted file mode 100644
index ba5aea6..0000000
--- a/debian/patches/0001_avoid_conflicts_with_indicator_applet.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-Description: Rename binaries to not conflict with indicator-applet
-Author: Stefano Karapetsas <stefano at karapetsas.com>
-Forwarded: not-needed
-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752626
-
----
-diff --git a/data/org.ayatana.panel.IndicatorApplet.mate-panel-applet.in.in b/data/org.ayatana.panel.IndicatorApplet.mate-panel-applet.in.in
-index b6db5b4..1f67e56 100644
---- a/data/org.ayatana.panel.IndicatorApplet.mate-panel-applet.in.in
-+++ b/data/org.ayatana.panel.IndicatorApplet.mate-panel-applet.in.in
-@@ -1,6 +1,6 @@
- [Applet Factory]
- Id=IndicatorAppletFactory
--Location=@LIBEXECDIR@/indicator-applet
-+Location=@LIBEXECDIR@/mate-indicator-applet
- Name=Indicator Applet Factory
- Description=Indicator Applet Factory
- 
-diff --git a/data/org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.in.in b/data/org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.in.in
-index ccce1ee..9147727 100644
---- a/data/org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.in.in
-+++ b/data/org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.in.in
-@@ -1,6 +1,6 @@
- [Applet Factory]
- Id=IndicatorAppletAppmenuFactory
--Location=@LIBEXECDIR@/indicator-applet-appmenu
-+Location=@LIBEXECDIR@/mate-indicator-applet-appmenu
- Name=Indicator Applet Appmenu Factory
- Description=Indicator Applet Appmenu Factory
- 
-diff --git a/data/org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.in.in b/data/org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.in.in
-index eb53fa3..9a34be6 100644
---- a/data/org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.in.in
-+++ b/data/org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.in.in
-@@ -1,6 +1,6 @@
- [Applet Factory]
- Id=IndicatorAppletCompleteFactory
--Location=@LIBEXECDIR@/indicator-applet-complete
-+Location=@LIBEXECDIR@/mate-indicator-applet-complete
- Name=Indicator Applet Complete Factory
- Description=Indicator Applet Complete Factory
- 
-diff --git a/data/org.mate.panel.applet.IndicatorAppletAppmenuFactory.service.in b/data/org.mate.panel.applet.IndicatorAppletAppmenuFactory.service.in
-index fd32342..6985354 100644
---- a/data/org.mate.panel.applet.IndicatorAppletAppmenuFactory.service.in
-+++ b/data/org.mate.panel.applet.IndicatorAppletAppmenuFactory.service.in
-@@ -1,3 +1,3 @@
- [D-BUS Service]
- Name=org.mate.panel.applet.IndicatorAppletAppmenuFactory
--Exec=@LIBEXECDIR@/indicator-applet-appmenu
-+Exec=@LIBEXECDIR@/mate-indicator-applet-appmenu
-diff --git a/data/org.mate.panel.applet.IndicatorAppletCompleteFactory.service.in b/data/org.mate.panel.applet.IndicatorAppletCompleteFactory.service.in
-index 27575a3..24f1f83 100644
---- a/data/org.mate.panel.applet.IndicatorAppletCompleteFactory.service.in
-+++ b/data/org.mate.panel.applet.IndicatorAppletCompleteFactory.service.in
-@@ -1,3 +1,3 @@
- [D-BUS Service]
- Name=org.mate.panel.applet.IndicatorAppletCompleteFactory
--Exec=@LIBEXECDIR@/indicator-applet-complete
-+Exec=@LIBEXECDIR@/mate-indicator-applet-complete
-diff --git a/data/org.mate.panel.applet.IndicatorAppletFactory.service.in b/data/org.mate.panel.applet.IndicatorAppletFactory.service.in
-index 97d81cb..0339d51 100644
---- a/data/org.mate.panel.applet.IndicatorAppletFactory.service.in
-+++ b/data/org.mate.panel.applet.IndicatorAppletFactory.service.in
-@@ -1,3 +1,3 @@
- [D-BUS Service]
- Name=org.mate.panel.applet.IndicatorAppletFactory
--Exec=@LIBEXECDIR@/indicator-applet
-+Exec=@LIBEXECDIR@/mate-indicator-applet
-diff --git a/src/Makefile.am b/src/Makefile.am
-index a1428b2..1b66f5e 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,10 +1,10 @@
- 
- libexec_PROGRAMS = \
--	indicator-applet \
--	indicator-applet-appmenu \
--	indicator-applet-complete
-+	mate-indicator-applet \
-+	mate-indicator-applet-appmenu \
-+	mate-indicator-applet-complete
- 
--indicator_applet_CFLAGS = \
-+mate_indicator_applet_CFLAGS = \
- 	-DG_LOG_DOMAIN=\""Indicator-Applet"\" \
- 	-DDATADIR=\""$(datadir)"\" \
- 	-DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
-@@ -14,18 +14,19 @@ indicator_applet_CFLAGS = \
- 	$(APPLET_CFLAGS) \
- 	$(INDICATOR3_CFLAGS) $(INDICATOR4_CFLAGS)
- 
--indicator_applet_SOURCES = \
-+mate_indicator_applet_SOURCES = \
- 	applet-main.c \
- 	eggaccelerators.c \
- 	eggaccelerators.h \
- 	tomboykeybinder.c \
- 	tomboykeybinder.h
- 
--indicator_applet_LDADD = \
-+mate_indicator_applet_LDADD = \
- 	$(APPLET_LIBS) \
--	$(INDICATOR3_LIBS) $(INDICATOR4_LIBS)
-+	$(INDICATOR3_LIBS) $(INDICATOR4_LIBS) \
-+	-lX11
- 
--indicator_applet_appmenu_CFLAGS = \
-+mate_indicator_applet_appmenu_CFLAGS = \
- 	-DG_LOG_DOMAIN=\""Indicator-Applet-Appmenu"\" \
- 	-DDATADIR=\""$(datadir)"\" \
- 	-DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
-@@ -35,18 +36,19 @@ indicator_applet_appmenu_CFLAGS = \
- 	$(APPLET_CFLAGS) \
- 	$(INDICATOR3_CFLAGS) $(INDICATOR4_CFLAGS)
- 
--indicator_applet_appmenu_SOURCES = \
-+mate_indicator_applet_appmenu_SOURCES = \
- 	applet-main.c \
- 	eggaccelerators.c \
- 	eggaccelerators.h \
- 	tomboykeybinder.c \
- 	tomboykeybinder.h
- 
--indicator_applet_appmenu_LDADD = \
-+mate_indicator_applet_appmenu_LDADD = \
- 	$(APPLET_LIBS) \
--	$(INDICATOR3_LIBS) $(INDICATOR4_LIBS)
-+	$(INDICATOR3_LIBS) $(INDICATOR4_LIBS) \
-+	-lX11
- 
--indicator_applet_complete_CFLAGS = \
-+mate_indicator_applet_complete_CFLAGS = \
- 	-DG_LOG_DOMAIN=\""Indicator-Applet-Complete"\" \
- 	-DDATADIR=\""$(datadir)"\" \
- 	-DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
-@@ -56,13 +58,14 @@ indicator_applet_complete_CFLAGS = \
- 	$(APPLET_CFLAGS) \
- 	$(INDICATOR3_CFLAGS) $(INDICATOR4_CFLAGS)
- 
--indicator_applet_complete_SOURCES =	\
-+mate_indicator_applet_complete_SOURCES =	\
- 	applet-main.c \
- 	eggaccelerators.c \
- 	eggaccelerators.h \
- 	tomboykeybinder.c \
- 	tomboykeybinder.h
- 
--indicator_applet_complete_LDADD = \
-+mate_indicator_applet_complete_LDADD = \
- 	$(APPLET_LIBS) \
--	$(INDICATOR3_LIBS) $(INDICATOR4_LIBS)
-+	$(INDICATOR3_LIBS) $(INDICATOR4_LIBS) \
-+	-lX11
---
-cgit 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-indicator-applet.git