← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mate-indicator-applet/vivid

« back to all changes in this revision

Viewing changes to debian/patches/0001_avoid_conflicts_with_indicator_applet.patch

  • Committer: Package Import Robot
  • Author(s): Mike Gabriel, Vangelis Mouhtsis, Martin Wimpress
  • Date: 2014-07-02 15:29:18 UTC
  • Revision ID: package-import@ubuntu.com-20140702152918-ptacy4kp4vgy0pga
Tags: 1.8.0-4
http://bugs.debian.org/752626
[ Vangelis Mouhtsis ]
* debian/rules:
  + Replace on dh_install --list-missing -> --fail-missing

[ Martin Wimpress ]
* debian/patches:
  + Add a patch to prevent conflicts with indicator-applet. (Closes: #752626)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0001_avoid_conflicts_with_indicator_applet.patch
 
1
Description: Rename binaries to not conflict with indicator-applet
 
2
Author: Stefano Karapetsas <stefano@karapetsas.com>
 
3
Forwarded: not-needed
 
4
Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752626
 
5
 
 
6
---
 
7
diff --git a/data/org.ayatana.panel.IndicatorApplet.mate-panel-applet.in.in b/data/org.ayatana.panel.IndicatorApplet.mate-panel-applet.in.in
 
8
index b6db5b4..1f67e56 100644
 
9
--- a/data/org.ayatana.panel.IndicatorApplet.mate-panel-applet.in.in
 
10
+++ b/data/org.ayatana.panel.IndicatorApplet.mate-panel-applet.in.in
 
11
@@ -1,6 +1,6 @@
 
12
 [Applet Factory]
 
13
 Id=IndicatorAppletFactory
 
14
-Location=@LIBEXECDIR@/indicator-applet
 
15
+Location=@LIBEXECDIR@/mate-indicator-applet
 
16
 Name=Indicator Applet Factory
 
17
 Description=Indicator Applet Factory
 
18
 
 
19
diff --git a/data/org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.in.in b/data/org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.in.in
 
20
index ccce1ee..9147727 100644
 
21
--- a/data/org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.in.in
 
22
+++ b/data/org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet.in.in
 
23
@@ -1,6 +1,6 @@
 
24
 [Applet Factory]
 
25
 Id=IndicatorAppletAppmenuFactory
 
26
-Location=@LIBEXECDIR@/indicator-applet-appmenu
 
27
+Location=@LIBEXECDIR@/mate-indicator-applet-appmenu
 
28
 Name=Indicator Applet Appmenu Factory
 
29
 Description=Indicator Applet Appmenu Factory
 
30
 
 
31
diff --git a/data/org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.in.in b/data/org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.in.in
 
32
index eb53fa3..9a34be6 100644
 
33
--- a/data/org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.in.in
 
34
+++ b/data/org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet.in.in
 
35
@@ -1,6 +1,6 @@
 
36
 [Applet Factory]
 
37
 Id=IndicatorAppletCompleteFactory
 
38
-Location=@LIBEXECDIR@/indicator-applet-complete
 
39
+Location=@LIBEXECDIR@/mate-indicator-applet-complete
 
40
 Name=Indicator Applet Complete Factory
 
41
 Description=Indicator Applet Complete Factory
 
42
 
 
43
diff --git a/data/org.mate.panel.applet.IndicatorAppletAppmenuFactory.service.in b/data/org.mate.panel.applet.IndicatorAppletAppmenuFactory.service.in
 
44
index fd32342..6985354 100644
 
45
--- a/data/org.mate.panel.applet.IndicatorAppletAppmenuFactory.service.in
 
46
+++ b/data/org.mate.panel.applet.IndicatorAppletAppmenuFactory.service.in
 
47
@@ -1,3 +1,3 @@
 
48
 [D-BUS Service]
 
49
 Name=org.mate.panel.applet.IndicatorAppletAppmenuFactory
 
50
-Exec=@LIBEXECDIR@/indicator-applet-appmenu
 
51
+Exec=@LIBEXECDIR@/mate-indicator-applet-appmenu
 
52
diff --git a/data/org.mate.panel.applet.IndicatorAppletCompleteFactory.service.in b/data/org.mate.panel.applet.IndicatorAppletCompleteFactory.service.in
 
53
index 27575a3..24f1f83 100644
 
54
--- a/data/org.mate.panel.applet.IndicatorAppletCompleteFactory.service.in
 
55
+++ b/data/org.mate.panel.applet.IndicatorAppletCompleteFactory.service.in
 
56
@@ -1,3 +1,3 @@
 
57
 [D-BUS Service]
 
58
 Name=org.mate.panel.applet.IndicatorAppletCompleteFactory
 
59
-Exec=@LIBEXECDIR@/indicator-applet-complete
 
60
+Exec=@LIBEXECDIR@/mate-indicator-applet-complete
 
61
diff --git a/data/org.mate.panel.applet.IndicatorAppletFactory.service.in b/data/org.mate.panel.applet.IndicatorAppletFactory.service.in
 
62
index 97d81cb..0339d51 100644
 
63
--- a/data/org.mate.panel.applet.IndicatorAppletFactory.service.in
 
64
+++ b/data/org.mate.panel.applet.IndicatorAppletFactory.service.in
 
65
@@ -1,3 +1,3 @@
 
66
 [D-BUS Service]
 
67
 Name=org.mate.panel.applet.IndicatorAppletFactory
 
68
-Exec=@LIBEXECDIR@/indicator-applet
 
69
+Exec=@LIBEXECDIR@/mate-indicator-applet
 
70
diff --git a/src/Makefile.am b/src/Makefile.am
 
71
index a1428b2..1b66f5e 100644
 
72
--- a/src/Makefile.am
 
73
+++ b/src/Makefile.am
 
74
@@ -1,10 +1,10 @@
 
75
 
 
76
 libexec_PROGRAMS = \
 
77
-       indicator-applet \
 
78
-       indicator-applet-appmenu \
 
79
-       indicator-applet-complete
 
80
+       mate-indicator-applet \
 
81
+       mate-indicator-applet-appmenu \
 
82
+       mate-indicator-applet-complete
 
83
 
 
84
-indicator_applet_CFLAGS = \
 
85
+mate_indicator_applet_CFLAGS = \
 
86
        -DG_LOG_DOMAIN=\""Indicator-Applet"\" \
 
87
        -DDATADIR=\""$(datadir)"\" \
 
88
        -DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
 
89
@@ -14,18 +14,19 @@ indicator_applet_CFLAGS = \
 
90
        $(APPLET_CFLAGS) \
 
91
        $(INDICATOR3_CFLAGS) $(INDICATOR4_CFLAGS)
 
92
 
 
93
-indicator_applet_SOURCES = \
 
94
+mate_indicator_applet_SOURCES = \
 
95
        applet-main.c \
 
96
        eggaccelerators.c \
 
97
        eggaccelerators.h \
 
98
        tomboykeybinder.c \
 
99
        tomboykeybinder.h
 
100
 
 
101
-indicator_applet_LDADD = \
 
102
+mate_indicator_applet_LDADD = \
 
103
        $(APPLET_LIBS) \
 
104
-       $(INDICATOR3_LIBS) $(INDICATOR4_LIBS)
 
105
+       $(INDICATOR3_LIBS) $(INDICATOR4_LIBS) \
 
106
+       -lX11
 
107
 
 
108
-indicator_applet_appmenu_CFLAGS = \
 
109
+mate_indicator_applet_appmenu_CFLAGS = \
 
110
        -DG_LOG_DOMAIN=\""Indicator-Applet-Appmenu"\" \
 
111
        -DDATADIR=\""$(datadir)"\" \
 
112
        -DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
 
113
@@ -35,18 +36,19 @@ indicator_applet_appmenu_CFLAGS = \
 
114
        $(APPLET_CFLAGS) \
 
115
        $(INDICATOR3_CFLAGS) $(INDICATOR4_CFLAGS)
 
116
 
 
117
-indicator_applet_appmenu_SOURCES = \
 
118
+mate_indicator_applet_appmenu_SOURCES = \
 
119
        applet-main.c \
 
120
        eggaccelerators.c \
 
121
        eggaccelerators.h \
 
122
        tomboykeybinder.c \
 
123
        tomboykeybinder.h
 
124
 
 
125
-indicator_applet_appmenu_LDADD = \
 
126
+mate_indicator_applet_appmenu_LDADD = \
 
127
        $(APPLET_LIBS) \
 
128
-       $(INDICATOR3_LIBS) $(INDICATOR4_LIBS)
 
129
+       $(INDICATOR3_LIBS) $(INDICATOR4_LIBS) \
 
130
+       -lX11
 
131
 
 
132
-indicator_applet_complete_CFLAGS = \
 
133
+mate_indicator_applet_complete_CFLAGS = \
 
134
        -DG_LOG_DOMAIN=\""Indicator-Applet-Complete"\" \
 
135
        -DDATADIR=\""$(datadir)"\" \
 
136
        -DINDICATOR_DIR=\""$(INDICATORDIR)"\" \
 
137
@@ -56,13 +58,14 @@ indicator_applet_complete_CFLAGS = \
 
138
        $(APPLET_CFLAGS) \
 
139
        $(INDICATOR3_CFLAGS) $(INDICATOR4_CFLAGS)
 
140
 
 
141
-indicator_applet_complete_SOURCES =    \
 
142
+mate_indicator_applet_complete_SOURCES =       \
 
143
        applet-main.c \
 
144
        eggaccelerators.c \
 
145
        eggaccelerators.h \
 
146
        tomboykeybinder.c \
 
147
        tomboykeybinder.h
 
148
 
 
149
-indicator_applet_complete_LDADD = \
 
150
+mate_indicator_applet_complete_LDADD = \
 
151
        $(APPLET_LIBS) \
 
152
-       $(INDICATOR3_LIBS) $(INDICATOR4_LIBS)
 
153
+       $(INDICATOR3_LIBS) $(INDICATOR4_LIBS) \
 
154
+       -lX11
 
155
--
 
156
cgit