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

[Martin Wimpress]

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

The following commit has been merged in the master branch:
commit 95a555ed5f79a74c2e011c7921f32855e62b2a71
Author: Martin Wimpress <code at flexion.org>
Date:   Wed Jul 2 14:23:39 2014 +0100

    Patch should now conform to Debian Patch Tagging guidelines.
---
 ...001_avoid_conflicts_with_indicator_applet.patch | 39 +++-------------------
 1 file changed, 4 insertions(+), 35 deletions(-)

diff --git a/debian/patches/0001_avoid_conflicts_with_indicator_applet.patch b/debian/patches/0001_avoid_conflicts_with_indicator_applet.patch
index d67ebda..2a45e1e 100644
--- a/debian/patches/0001_avoid_conflicts_with_indicator_applet.patch
+++ b/debian/patches/0001_avoid_conflicts_with_indicator_applet.patch
@@ -1,20 +1,7 @@
-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
+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
 --- 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 @@
@@ -24,9 +11,6 @@ index b6db5b4..1f67e56 100644
 +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 @@
@@ -36,9 +20,6 @@ index ccce1ee..9147727 100644
 +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 @@
@@ -48,9 +29,6 @@ index eb53fa3..9a34be6 100644
 +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 @@
@@ -58,8 +36,6 @@ index fd32342..6985354 100644
  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 @@
@@ -67,8 +43,6 @@ index 27575a3..24f1f83 100644
  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 @@
@@ -76,8 +50,6 @@ index 97d81cb..0339d51 100644
  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 @@
@@ -161,6 +133,3 @@ index a1428b2..1b66f5e 100644
 -	$(INDICATOR3_LIBS) $(INDICATOR4_LIBS)
 +	$(INDICATOR3_LIBS) $(INDICATOR4_LIBS) \
 +	-lX11
--- 
-1.9.3
-

-- 
mate-indicator-applet Debian package