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

[Martin Wimpress]

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

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

    Repaired broken patch.
---
 ...0001_avoid_conflicts_with_indicator_applet.patch | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/debian/patches/0001_avoid_conflicts_with_indicator_applet.patch b/debian/patches/0001_avoid_conflicts_with_indicator_applet.patch
index 2a45e1e..ba5aea6 100644
--- a/debian/patches/0001_avoid_conflicts_with_indicator_applet.patch
+++ b/debian/patches/0001_avoid_conflicts_with_indicator_applet.patch
@@ -2,6 +2,10 @@ 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 @@
@@ -11,6 +15,9 @@ Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752626
 +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 @@
@@ -20,6 +27,9 @@ Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752626
 +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 @@
@@ -29,6 +39,9 @@ Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752626
 +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 @@
@@ -36,6 +49,8 @@ Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752626
  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 @@
@@ -43,6 +58,8 @@ Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752626
  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 @@
@@ -50,6 +67,8 @@ Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752626
  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 @@
@@ -133,3 +152,5 @@ Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752626
 -	$(INDICATOR3_LIBS) $(INDICATOR4_LIBS)
 +	$(INDICATOR3_LIBS) $(INDICATOR4_LIBS) \
 +	-lX11
+--
+cgit 

-- 
mate-indicator-applet Debian package