[SCM] mate-indicator-applet Debian package branch, master, updated. debian/1.8.0-3-2-g415385f

Martin Wimpress flexiondotorg-guest at moszumanska.debian.org
Wed Jul 2 13:06:16 UTC 2014 

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-indicator-applet.git;a=commitdiff;h=415385f

The following commit has been merged in the master branch:
commit 415385f211699c93482dea742f6282d237882f4b
Author: Martin Wimpress <code at flexion.org>
Date:   Wed Jul 2 14:06:11 2014 +0100

    Add a patch to prevent conflicts with indicator-applet. (Closes: #752626)
---
 ...001_avoid_conflicts_with_indicator_applet.patch | 166 +++++++++++++++++++++
 debian/patches/README                              |   3 +
 debian/patches/series                              |   1 +
 3 files changed, 170 insertions(+)

diff --git a/debian/patches/0001_avoid_conflicts_with_indicator_applet.patch b/debian/patches/0001_avoid_conflicts_with_indicator_applet.patch
new file mode 100644
index 0000000..d67ebda
--- /dev/null
+++ b/debian/patches/0001_avoid_conflicts_with_indicator_applet.patch
@@ -0,0 +1,166 @@
+From 12ea8a6c3b8b1e6fd7c62624dd123ae49d92d833 Mon Sep 17 00:00:00 2001
+From: Stefano Karapetsas <stefano at karapetsas.com>
+Date: Wed, 25 Jun 2014 13:45:56 +0200
+Subject: [PATCH] Rename binaries to not conflict with indicator-applet
+
+---
+ ...a.panel.IndicatorApplet.mate-panel-applet.in.in |  2 +-
+ ....IndicatorAppletAppmenu.mate-panel-applet.in.in |  2 +-
+ ...IndicatorAppletComplete.mate-panel-applet.in.in |  2 +-
+ ...applet.IndicatorAppletAppmenuFactory.service.in |  2 +-
+ ...pplet.IndicatorAppletCompleteFactory.service.in |  2 +-
+ ....panel.applet.IndicatorAppletFactory.service.in |  2 +-
+ src/Makefile.am                                    | 33 ++++++++++++----------
+ 7 files changed, 24 insertions(+), 21 deletions(-)
+
+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
+-- 
+1.9.3
+
diff --git a/debian/patches/README b/debian/patches/README
new file mode 100644
index 0000000..80c1584
--- /dev/null
+++ b/debian/patches/README
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d7fca58
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001_avoid_conflicts_with_indicator_applet.patch

-- 
mate-indicator-applet Debian package

More information about the pkg-mate-commits mailing list