summaryrefslogtreecommitdiff
path: root/debian/patches/03-use-dbus-sharp.patch
blob: 41d8304472edc0670c62b36cf3d0ae92d8804d9d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
Description: Usage of new dbus-sharp bindings
Author: Rico Tzschichholz <ricotz@ubuntu.com>
Forwarded: no

diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' notify-sharp-0.4.0~r3032~/Makefile.in notify-sharp-0.4.0~r3032/Makefile.in
--- notify-sharp-0.4.0~r3032~/Makefile.in	2009-03-05 13:54:27.000000000 +0100
+++ notify-sharp-0.4.0~r3032/Makefile.in	2011-02-21 15:51:39.923407305 +0100
@@ -114,8 +114,8 @@
 MONODOC_LIBS = @MONODOC_LIBS@
 MONO_CFLAGS = @MONO_CFLAGS@
 MONO_LIBS = @MONO_LIBS@
-NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
+DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
+DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' notify-sharp-0.4.0~r3032~/configure notify-sharp-0.4.0~r3032/configure
--- notify-sharp-0.4.0~r3032~/configure	2009-03-05 13:54:26.000000000 +0100
+++ notify-sharp-0.4.0~r3032/configure	2011-02-21 15:50:49.293407326 +0100
@@ -601,8 +601,8 @@
 ac_unique_file="src/Global.cs"
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-NDESK_DBUS_LIBS
-NDESK_DBUS_CFLAGS
+DBUS_SHARP_LIBS
+DBUS_SHARP_CFLAGS
 GTK_SHARP_LIBS
 GTK_SHARP_CFLAGS
 BUILD_DOCS_FALSE
@@ -709,8 +709,8 @@
 MONODOC_LIBS
 GTK_SHARP_CFLAGS
 GTK_SHARP_LIBS
-NDESK_DBUS_CFLAGS
-NDESK_DBUS_LIBS'
+DBUS_SHARP_CFLAGS
+DBUS_SHARP_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1356,10 +1356,10 @@
               C compiler flags for GTK_SHARP, overriding pkg-config
   GTK_SHARP_LIBS
               linker flags for GTK_SHARP, overriding pkg-config
-  NDESK_DBUS_CFLAGS
-              C compiler flags for NDESK_DBUS, overriding pkg-config
-  NDESK_DBUS_LIBS
-              linker flags for NDESK_DBUS, overriding pkg-config
+  DBUS_SHARP_CFLAGS
+              C compiler flags for DBUS_SHARP, overriding pkg-config
+  DBUS_SHARP_LIBS
+              linker flags for DBUS_SHARP, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -3237,27 +3237,27 @@
 fi
 
 
-NDESK_DBUS_REQ_VERSION=0.4
-NDESK_DBUS_GLIB_REQ_VERSION=0.3
+DBUS_SHARP_REQ_VERSION=0.7
+DBUS_SHARP_GLIB_REQ_VERSION=0.5
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for NDESK_DBUS" >&5
-$as_echo_n "checking for NDESK_DBUS... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking for DBUS_SHARP" >&5
+$as_echo_n "checking for DBUS_SHARP... " >&6; }
 
 if test -n "$PKG_CONFIG"; then
-    if test -n "$NDESK_DBUS_CFLAGS"; then
-        pkg_cv_NDESK_DBUS_CFLAGS="$NDESK_DBUS_CFLAGS"
+    if test -n "$DBUS_SHARP_CFLAGS"; then
+        pkg_cv_DBUS_SHARP_CFLAGS="$DBUS_SHARP_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ndesk-dbus-1.0 >= \$NDESK_DBUS_REQ_VERSION \\
-                              ndesk-dbus-glib-1.0 >= \$NDESK_DBUS_GLIB_REQ_VERSION\"") >&5
-  ($PKG_CONFIG --exists --print-errors "ndesk-dbus-1.0 >= $NDESK_DBUS_REQ_VERSION \
-                              ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQ_VERSION") 2>&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-sharp-1.0 >= \$DBUS_SHARP_REQ_VERSION \\
+                              dbus-sharp-glib-1.0 >= \$DBUS_SHARP_GLIB_REQ_VERSION\"") >&5
+  ($PKG_CONFIG --exists --print-errors "dbus-sharp-1.0 >= $DBUS_SHARP_REQ_VERSION \
+                              dbus-sharp-glib-1.0 >= $DBUS_SHARP_GLIB_REQ_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_NDESK_DBUS_CFLAGS=`$PKG_CONFIG --cflags "ndesk-dbus-1.0 >= $NDESK_DBUS_REQ_VERSION \
-                              ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQ_VERSION" 2>/dev/null`
+  pkg_cv_DBUS_SHARP_CFLAGS=`$PKG_CONFIG --cflags "dbus-sharp-1.0 >= $DBUS_SHARP_REQ_VERSION \
+                              dbus-sharp-glib-1.0 >= $DBUS_SHARP_GLIB_REQ_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -3266,19 +3266,19 @@
 	pkg_failed=untried
 fi
 if test -n "$PKG_CONFIG"; then
-    if test -n "$NDESK_DBUS_LIBS"; then
-        pkg_cv_NDESK_DBUS_LIBS="$NDESK_DBUS_LIBS"
+    if test -n "$DBUS_SHARP_LIBS"; then
+        pkg_cv_DBUS_SHARP_LIBS="$DBUS_SHARP_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ndesk-dbus-1.0 >= \$NDESK_DBUS_REQ_VERSION \\
-                              ndesk-dbus-glib-1.0 >= \$NDESK_DBUS_GLIB_REQ_VERSION\"") >&5
-  ($PKG_CONFIG --exists --print-errors "ndesk-dbus-1.0 >= $NDESK_DBUS_REQ_VERSION \
-                              ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQ_VERSION") 2>&5
+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-sharp-1.0 >= \$DBUS_SHARP_REQ_VERSION \\
+                              dbus-sharp-glib-1.0 >= \$DBUS_SHARP_GLIB_REQ_VERSION\"") >&5
+  ($PKG_CONFIG --exists --print-errors "dbus-sharp-1.0 >= $DBUS_SHARP_REQ_VERSION \
+                              dbus-sharp-glib-1.0 >= $DBUS_SHARP_GLIB_REQ_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_NDESK_DBUS_LIBS=`$PKG_CONFIG --libs "ndesk-dbus-1.0 >= $NDESK_DBUS_REQ_VERSION \
-                              ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQ_VERSION" 2>/dev/null`
+  pkg_cv_DBUS_SHARP_LIBS=`$PKG_CONFIG --libs "dbus-sharp-1.0 >= $DBUS_SHARP_REQ_VERSION \
+                              dbus-sharp-glib-1.0 >= $DBUS_SHARP_GLIB_REQ_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -3297,37 +3297,37 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        NDESK_DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ndesk-dbus-1.0 >= $NDESK_DBUS_REQ_VERSION \
-                              ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQ_VERSION"`
+	        DBUS_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-sharp-1.0 >= $DBUS_SHARP_REQ_VERSION \
+                              dbus-sharp-glib-1.0 >= $DBUS_SHARP_GLIB_REQ_VERSION"`
         else
-	        NDESK_DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ndesk-dbus-1.0 >= $NDESK_DBUS_REQ_VERSION \
-                              ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQ_VERSION"`
+	        DBUS_SHARP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-sharp-1.0 >= $DBUS_SHARP_REQ_VERSION \
+                              dbus-sharp-glib-1.0 >= $DBUS_SHARP_GLIB_REQ_VERSION"`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$NDESK_DBUS_PKG_ERRORS" >&5
+	echo "$DBUS_SHARP_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (ndesk-dbus-1.0 >= $NDESK_DBUS_REQ_VERSION \
-                              ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQ_VERSION) were not met:
+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (dbus-sharp-1.0 >= $DBUS_SHARP_REQ_VERSION \
+                              dbus-sharp-glib-1.0 >= $DBUS_SHARP_GLIB_REQ_VERSION) were not met:
 
-$NDESK_DBUS_PKG_ERRORS
+$DBUS_SHARP_PKG_ERRORS
 
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-Alternatively, you may set the environment variables NDESK_DBUS_CFLAGS
-and NDESK_DBUS_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables DBUS_SHARP_CFLAGS
+and DBUS_SHARP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 " >&5
-$as_echo "$as_me: error: Package requirements (ndesk-dbus-1.0 >= $NDESK_DBUS_REQ_VERSION \
-                              ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQ_VERSION) were not met:
+$as_echo "$as_me: error: Package requirements (dbus-sharp-1.0 >= $DBUS_SHARP_REQ_VERSION \
+                              dbus-sharp-glib-1.0 >= $DBUS_SHARP_GLIB_REQ_VERSION) were not met:
 
-$NDESK_DBUS_PKG_ERRORS
+$DBUS_SHARP_PKG_ERRORS
 
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-Alternatively, you may set the environment variables NDESK_DBUS_CFLAGS
-and NDESK_DBUS_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables DBUS_SHARP_CFLAGS
+and DBUS_SHARP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 " >&2;}
    { (exit 1); exit 1; }; }
@@ -3338,8 +3338,8 @@
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
-Alternatively, you may set the environment variables NDESK_DBUS_CFLAGS
-and NDESK_DBUS_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables DBUS_SHARP_CFLAGS
+and DBUS_SHARP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -3348,16 +3348,16 @@
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
-Alternatively, you may set the environment variables NDESK_DBUS_CFLAGS
-and NDESK_DBUS_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables DBUS_SHARP_CFLAGS
+and DBUS_SHARP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }; }
 else
-	NDESK_DBUS_CFLAGS=$pkg_cv_NDESK_DBUS_CFLAGS
-	NDESK_DBUS_LIBS=$pkg_cv_NDESK_DBUS_LIBS
+	DBUS_SHARP_CFLAGS=$pkg_cv_DBUS_SHARP_CFLAGS
+	DBUS_SHARP_LIBS=$pkg_cv_DBUS_SHARP_LIBS
         { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' notify-sharp-0.4.0~r3032~/configure.ac notify-sharp-0.4.0~r3032/configure.ac
--- notify-sharp-0.4.0~r3032~/configure.ac	2009-03-05 13:48:52.000000000 +0100
+++ notify-sharp-0.4.0~r3032/configure.ac	2011-02-21 15:51:01.813407321 +0100
@@ -66,11 +66,11 @@
 PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP_REQ_VERSION)
 AC_SUBST(GTK_SHARP_LIBS)
 
-NDESK_DBUS_REQ_VERSION=0.4
-NDESK_DBUS_GLIB_REQ_VERSION=0.3
-PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQ_VERSION \
-                              ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQ_VERSION)
-AC_SUBST(NDESK_DBUS_LIBS)
+DBUS_SHARP_REQ_VERSION=0.7
+DBUS_SHARP_GLIB_REQ_VERSION=0.5
+PKG_CHECK_MODULES(DBUS_SHARP, dbus-sharp-1.0 >= $DBUS_SHARP_REQ_VERSION \
+                              dbus-sharp-glib-1.0 >= $DBUS_SHARP_GLIB_REQ_VERSION)
+AC_SUBST(DBUS_SHARP_LIBS)
 
 required_assemblies="Mono.Posix"
 
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' notify-sharp-0.4.0~r3032~/docs/Makefile.in notify-sharp-0.4.0~r3032/docs/Makefile.in
--- notify-sharp-0.4.0~r3032~/docs/Makefile.in	2009-03-05 13:54:27.000000000 +0100
+++ notify-sharp-0.4.0~r3032/docs/Makefile.in	2011-02-21 15:52:22.453407288 +0100
@@ -87,8 +87,8 @@
 MONODOC_LIBS = @MONODOC_LIBS@
 MONO_CFLAGS = @MONO_CFLAGS@
 MONO_LIBS = @MONO_LIBS@
-NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
+DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
+DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' notify-sharp-0.4.0~r3032~/src/Global.cs notify-sharp-0.4.0~r3032/src/Global.cs
--- notify-sharp-0.4.0~r3032~/src/Global.cs	2009-03-05 13:48:52.000000000 +0100
+++ notify-sharp-0.4.0~r3032/src/Global.cs	2011-02-21 15:52:47.303407277 +0100
@@ -24,7 +24,7 @@
 using System.Reflection;
 using System.Collections.Generic;
 
-using NDesk.DBus;
+using DBus;
 using org.freedesktop;
 using org.freedesktop.DBus;
 
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' notify-sharp-0.4.0~r3032~/src/Makefile.am notify-sharp-0.4.0~r3032/src/Makefile.am
--- notify-sharp-0.4.0~r3032~/src/Makefile.am	2009-03-05 13:48:52.000000000 +0100
+++ notify-sharp-0.4.0~r3032/src/Makefile.am	2011-02-21 15:51:59.283407298 +0100
@@ -7,7 +7,7 @@
 LIBFLAGS = \
 	-r:Mono.Posix \
 	$(GTK_SHARP_LIBS) \
-	$(NDESK_DBUS_LIBS)
+	$(DBUS_SHARP_LIBS)
 
 CSFILES = \
 	$(srcdir)/Global.cs \
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' notify-sharp-0.4.0~r3032~/src/Makefile.in notify-sharp-0.4.0~r3032/src/Makefile.in
--- notify-sharp-0.4.0~r3032~/src/Makefile.in	2009-03-05 13:54:27.000000000 +0100
+++ notify-sharp-0.4.0~r3032/src/Makefile.in	2011-02-21 15:52:06.933407294 +0100
@@ -78,8 +78,8 @@
 MONODOC_LIBS = @MONODOC_LIBS@
 MONO_CFLAGS = @MONO_CFLAGS@
 MONO_LIBS = @MONO_LIBS@
-NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@
-NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@
+DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
+DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -151,7 +151,7 @@
 LIBFLAGS = \
 	-r:Mono.Posix \
 	$(GTK_SHARP_LIBS) \
-	$(NDESK_DBUS_LIBS)
+	$(DBUS_SHARP_LIBS)
 
 CSFILES = \
 	$(srcdir)/Global.cs \
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' notify-sharp-0.4.0~r3032~/src/Notification.cs notify-sharp-0.4.0~r3032/src/Notification.cs
--- notify-sharp-0.4.0~r3032~/src/Notification.cs	2011-02-21 15:50:16.733407339 +0100
+++ notify-sharp-0.4.0~r3032/src/Notification.cs	2011-02-21 15:52:50.933407277 +0100
@@ -28,7 +28,7 @@
 using Gdk;
 using Gtk;
 
-using NDesk.DBus;
+using DBus;
 using org.freedesktop;
 using org.freedesktop.DBus;