Merge lp:~cyphermox/xchat-gnome/update-to-0.26.2+git into lp:~ubuntu-desktop/xchat-gnome/ubuntu
- update-to-0.26.2+git
- Merge into ubuntu
Status: | Merged |
---|---|
Merged at revision: | 10 |
Proposed branch: | lp:~cyphermox/xchat-gnome/update-to-0.26.2+git |
Merge into: | lp:~ubuntu-desktop/xchat-gnome/ubuntu |
Diff against target: |
369 lines (+84/-178) 11 files modified
debian/changelog (+29/-0) debian/control (+3/-3) debian/control.in (+3/-3) debian/patches/10_obey_nick_suffix.patch (+0/-20) debian/patches/11_topic_return.patch (+0/-10) debian/patches/21_add_gui_info_ptr.patch (+0/-25) debian/patches/50_serverlist_update.patch (+0/-34) debian/patches/51_freenode_default_port_8001.patch (+31/-0) debian/patches/98_autoconf.patch (+0/-83) debian/patches/98_ice_depends_for_eggsmclient.patch (+17/-0) debian/rules (+1/-0) |
To merge this branch: | bzr merge lp:~cyphermox/xchat-gnome/update-to-0.26.2+git |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Robert Ancell | Approve | ||
Didier Roche-Tolomelli | Needs Fixing | ||
Review via email: mp+43283@code.launchpad.net |
Commit message
Description of the change
- 23. By Mathieu Trudel-Lapierre
-
Further explain changes in debian/control. Thanks Didier Roche for the review
and hints for this. - 24. By Mathieu Trudel-Lapierre
-
Revise autogen/autoreconf use to properly handle reconfiguration due to using
a git snaphost (which aren't configured yet) and due to the changes we make
through patches to the build process:debian/rules: run dh_autoreconf to take into account build process changes
for the various patches (and also because a snapshot from git is not
configured yet).Thanks didrocks for review and advice.
- 25. By Mathieu Trudel-Lapierre
-
debian/control: add Build-Depends on dh-autoreconf for added dh_autoreconf.
Mathieu Trudel-Lapierre (cyphermox) wrote : | # |
> Hey Mathieu, thanks for your nice work there :)
>
> Some little fixes to take into consideration:
>
Hey Didier, thanks for the input.
> * NOCONFIGURE=1 ./autogen.sh; \
> -> you will need automake and such in the builder chroot in that case. I
> would suggest using dh_autoreconf (and build-dep on dh-autoreconf then)
> rather.
Thanks, done.
>
> * debian/control:
> -> all changes aren't listed/explained
I'll assume you meant more "explained", than listed, because I don't see a change I didn't mention. However, I added some more details about the "why" the changes were made.
- 26. By Mathieu Trudel-Lapierre
-
Update control.in as well with Build-Depends changes:
debian/control{ ,.in}: Drop Build-Depends on libgnome, libgnomeui, since they
are no longer required by configure. - 27. By Mathieu Trudel-Lapierre
-
Also update control.in:
debian/control{ ,.in}: Add Build-Depends on libsm-dev >= 1.0.0, new
dependency introduced in 0.26.2. - 28. By Mathieu Trudel-Lapierre
-
Again, also update control.in:
debian/control{ ,.in}: add Build-Depends on dh-autoreconf for the added call
to dh_autoreconf. - 29. By Mathieu Trudel-Lapierre
-
Update control.in (I swear, this will get into my brain soon :)
debian/control{ ,.in}: change libnotify build-depends to libnotify4-dev
(>= 0.7.0) so that the notify-osd plugin will build properly (the
NOTIFY_CHECK_VERSION macro isn't available otherwise).
Robert Ancell (robert-ancell) wrote : | # |
Looks good. Note I changed the version from 0.26.2+git to 0.26.1+git as the git version is still marked as 0.26.1.
Preview Diff
1 | === modified file 'debian/changelog' |
2 | --- debian/changelog 2010-07-26 14:30:43 +0000 |
3 | +++ debian/changelog 2010-12-13 21:37:17 +0000 |
4 | @@ -1,3 +1,32 @@ |
5 | +xchat-gnome (1:0.26.2+git20101206.557c940-0ubuntu1) UNRELEASED; urgency=low |
6 | + |
7 | + * New upstream snapshot from Git: 2010-12-06, rev 557c940. |
8 | + * debian/control{,.in}: Drop Build-Depends on libgnome, libgnomeui, since they |
9 | + are no longer required by configure. |
10 | + * debian/control{,.in}: Add Build-Depends on libsm-dev >= 1.0.0, new |
11 | + dependency introduced in 0.26.2. |
12 | + * debian/patches/10_obey_nick_suffix.patch: dropped, applied upstream. |
13 | + * debian/patches/11_topic_return.patch: dropped, applied upstream. |
14 | + * debian/patches/21_add_gui_info_ptr.patch: dropped, applied upstream. |
15 | + * debian/patches/50_serverlist_update.patch: dropped, applied upstream. The |
16 | + freenode port changes are split to 51_freenode_default_port_8001.patch. |
17 | + * debian/patches/51_freenode_default_port_8001.patch: avoid connecting to |
18 | + ports in the 6660-6669 range for Freenode to workaround an old DCC exploit. |
19 | + * debian/patches/98_autoconf.patch: dropped. It doesn't apply to building |
20 | + from git. |
21 | + * debian/rules: run dh_autoreconf to take into account build process changes |
22 | + for the various patches (and also because a snapshot from git is not |
23 | + configured yet). |
24 | + * debian/control{,.in}: add Build-Depends on dh-autoreconf for the added call |
25 | + to dh_autoreconf. |
26 | + * debian/control{,.in}: change libnotify build-depends to libnotify4-dev |
27 | + (>= 0.7.0) so that the notify-osd plugin will build properly (the |
28 | + NOTIFY_CHECK_VERSION macro isn't available otherwise). |
29 | + * debian/patches/98_ice_depends_for_eggsmclient.patch: add missing ice |
30 | + dependency for the egg_smclient parts, which will allow linking to succeed. |
31 | + |
32 | + -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Mon, 13 Dec 2010 14:59:33 -0500 |
33 | + |
34 | xchat-gnome (1:0.26.1-1ubuntu3) maverick; urgency=low |
35 | |
36 | * Update description (LP: #596022) |
37 | |
38 | === modified file 'debian/control' |
39 | --- debian/control 2010-07-26 14:30:43 +0000 |
40 | +++ debian/control 2010-12-13 21:37:17 +0000 |
41 | @@ -6,11 +6,12 @@ |
42 | Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/xchat-gnome/ubuntu |
43 | Uploaders: @GNOME_TEAM@ |
44 | Build-Depends: debhelper (>= 5.0.0), |
45 | + dh-autoreconf, |
46 | gnome-pkg-tools, |
47 | autotools-dev, |
48 | cdbs (>= 0.4.41), |
49 | libgtk2.0-dev (>= 2.14.0), |
50 | - libgnomeui-dev (>= 2.16.0), |
51 | + libsm-dev (>= 1.0.0), |
52 | libglade2-dev (>= 2.3.2), |
53 | libgconf2-dev (>= 2.8.0), |
54 | libxft-dev, |
55 | @@ -21,13 +22,12 @@ |
56 | libdbus-glib-1-dev (>= 0.60), |
57 | libtool, |
58 | libgnutls-dev, |
59 | - libnotify-dev (>= 0.3.2), |
60 | + libnotify4-dev (>= 0.7.0), |
61 | libsexy-dev (>= 0.1.11), |
62 | gnome-doc-utils, |
63 | libssl-dev, |
64 | dpkg-dev (>= 1.13.19), |
65 | libglib2.0-dev (>= 2.18.0), |
66 | - libgnome2-dev (>= 2.16.0), |
67 | liblaunchpad-integration-dev (>= 0.1.17), |
68 | libcanberra-gtk-dev (>= 0.3) |
69 | Standards-Version: 3.8.0 |
70 | |
71 | === modified file 'debian/control.in' |
72 | --- debian/control.in 2010-07-26 14:30:43 +0000 |
73 | +++ debian/control.in 2010-12-13 21:37:17 +0000 |
74 | @@ -6,12 +6,13 @@ |
75 | Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/xchat-gnome/ubuntu |
76 | Uploaders: @GNOME_TEAM@ |
77 | Build-Depends: debhelper (>= 5.0.0), |
78 | + dh-autoreconf, |
79 | gnome-pkg-tools, |
80 | autotools-dev, |
81 | cdbs (>= 0.4.41), |
82 | libcanberra-gtk-dev (>= 0.3), |
83 | libgtk2.0-dev (>= 2.14.0), |
84 | - libgnomeui-dev (>= 2.16.0), |
85 | + libsm-dev (>= 1.0.0), |
86 | libglade2-dev (>= 2.3.2), |
87 | libgconf2-dev (>= 2.8.0), |
88 | libxft-dev, |
89 | @@ -22,13 +23,12 @@ |
90 | libdbus-glib-1-dev (>= 0.60), |
91 | libtool, |
92 | libgnutls-dev, |
93 | - libnotify-dev (>= 0.3.2), |
94 | + libnotify4-dev (>= 0.7.0), |
95 | libsexy-dev (>= 0.1.11), |
96 | gnome-doc-utils, |
97 | libssl-dev, |
98 | dpkg-dev (>= 1.13.19), |
99 | libglib2.0-dev (>= 2.18.0), |
100 | - libgnome2-dev (>= 2.16.0), |
101 | liblaunchpad-integration-dev (>= 0.1.17) |
102 | Standards-Version: 3.8.1 |
103 | |
104 | |
105 | === removed file 'debian/patches/10_obey_nick_suffix.patch' |
106 | --- debian/patches/10_obey_nick_suffix.patch 2009-06-15 11:30:47 +0000 |
107 | +++ debian/patches/10_obey_nick_suffix.patch 1970-01-01 00:00:00 +0000 |
108 | @@ -1,20 +0,0 @@ |
109 | ---- src/fe-gnome/text-entry.c.orig 2009-06-13 11:24:05.451097417 +0200 |
110 | -+++ src/fe-gnome/text-entry.c 2009-06-13 14:01:09.839088698 +0200 |
111 | -@@ -563,7 +563,7 @@ |
112 | - g_free (p); |
113 | - pos = g_utf8_strlen ((char *) options->data, -1) + start; |
114 | - } else { |
115 | -- npt = g_strdup_printf ("%s: ", (char *) options->data); |
116 | -+ npt = g_strdup_printf ("%s%c ", (char *) options->data, prefs.nick_suffix[0]); |
117 | - pos = g_utf8_strlen ((char *) options->data, -1) + 2; |
118 | - } |
119 | - } else { |
120 | -@@ -577,7 +577,7 @@ |
121 | - g_free (p); |
122 | - pos = g_utf8_strlen ((char *) options->data, -1) + start; |
123 | - } else { |
124 | -- npt = g_strdup_printf ("%s: %s", (char *) options->data, at_cursor); |
125 | -+ npt = g_strdup_printf ("%s%c %s", (char *) options->data, prefs.nick_suffix[0], at_cursor); |
126 | - pos = g_utf8_strlen ((char *) options->data, -1) + 2; |
127 | - } |
128 | - } |
129 | |
130 | === removed file 'debian/patches/11_topic_return.patch' |
131 | --- debian/patches/11_topic_return.patch 2009-06-15 11:30:47 +0000 |
132 | +++ debian/patches/11_topic_return.patch 1970-01-01 00:00:00 +0000 |
133 | @@ -1,10 +0,0 @@ |
134 | ---- src/fe-gnome/topic-label.c.orig 2009-06-13 13:11:20.943589693 +0200 |
135 | -+++ src/fe-gnome/topic-label.c 2009-06-13 13:13:42.527593315 +0200 |
136 | -@@ -315,6 +315,7 @@ |
137 | - topic_entry_activate (GtkTextBuffer *textbuffer, GtkTextIter *arg1, gchar *text, gint len, GtkDialog *dialog) |
138 | - { |
139 | - if (strncmp (text, "\n", len) == 0) { |
140 | -+ g_signal_stop_emission_by_name (G_OBJECT (textbuffer), "insert-text"); |
141 | - gtk_dialog_response (dialog, GTK_RESPONSE_OK); |
142 | - } |
143 | - } |
144 | |
145 | === removed file 'debian/patches/21_add_gui_info_ptr.patch' |
146 | --- debian/patches/21_add_gui_info_ptr.patch 2010-01-06 03:24:38 +0000 |
147 | +++ debian/patches/21_add_gui_info_ptr.patch 1970-01-01 00:00:00 +0000 |
148 | @@ -1,25 +0,0 @@ |
149 | -# |
150 | -# Description: Implement win_ptr in xchat_get_info |
151 | -# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xchat-gnome/+bug/503665 |
152 | -# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=606176 |
153 | -# |
154 | - |
155 | -diff --git a/src/fe-gnome/fe-gnome.c b/src/fe-gnome/fe-gnome.c |
156 | -index fd32bd9..beadab0 100644 |
157 | ---- a/src/fe-gnome/fe-gnome.c |
158 | -+++ b/src/fe-gnome/fe-gnome.c |
159 | -@@ -773,8 +773,12 @@ fe_gui_info (session * sess, int info_type) |
160 | - void * |
161 | - fe_gui_info_ptr (session *sess, int info_type) |
162 | - { |
163 | -- return NULL; |
164 | -- /* FIXME implement? */ |
165 | -+ switch (info_type) |
166 | -+ { |
167 | -+ case 0: /* native window pointer (for plugins) */ |
168 | -+ return GTK_WINDOW (gui.main_window); |
169 | -+ } |
170 | -+ return NULL; |
171 | - } |
172 | - |
173 | - void |
174 | |
175 | === removed file 'debian/patches/50_serverlist_update.patch' |
176 | --- debian/patches/50_serverlist_update.patch 2009-04-13 10:24:16 +0000 |
177 | +++ debian/patches/50_serverlist_update.patch 1970-01-01 00:00:00 +0000 |
178 | @@ -1,34 +0,0 @@ |
179 | -Modify default port for irc.freenode.com to 8001 to prevent dcc exploit. |
180 | -Fix Oz.net servers list wrongly referring to OzNet (LP: #146434). |
181 | - |
182 | -diff -Nur xchat-gnome-0.18/src/common/servlist.c xchat-gnome-0.18.new/src/common/servlist.c |
183 | ---- a/src/common/servlist.c 2007-06-13 02:03:18.000000000 +0200 |
184 | -+++ b/src/common/servlist.c 2008-02-14 13:00:03.000000000 +0100 |
185 | -@@ -207,7 +207,7 @@ |
186 | - {0, "irc.vendetta.com"}, |
187 | - |
188 | - {"FreeNode", 0}, |
189 | -- {0, "irc.freenode.net"}, |
190 | -+ {0, "irc.freenode.net/8001"}, |
191 | - |
192 | - /* {"Freeworld", 0}, |
193 | - {0, "kabel.freeworld.nu"}, |
194 | -@@ -337,8 +337,15 @@ |
195 | - {"OtherNet", 0}, |
196 | - {0, "irc.othernet.org"}, |
197 | - |
198 | -- {"OzNet", 0}, |
199 | -- {0, "irc.oz.org"}, |
200 | -+ {"Oz.org", 0}, |
201 | -+ {0, "irc.oz.org"}, |
202 | -+ {0, "germany.oz.org"}, |
203 | -+ {0, "sandiego.oz.org"}, |
204 | -+ {0, "us.oz.org"}, |
205 | -+ {0, "au.oz.org"}, |
206 | -+ {0, "rockhampton.oz.org"}, |
207 | -+ {0, "wollongong.oz.org"}, |
208 | -+ {0, "waix.oz.org"}, |
209 | - |
210 | - {"PTlink", 0}, |
211 | - {0, "irc.PTlink.net"}, |
212 | - |
213 | |
214 | === added file 'debian/patches/51_freenode_default_port_8001.patch' |
215 | --- debian/patches/51_freenode_default_port_8001.patch 1970-01-01 00:00:00 +0000 |
216 | +++ debian/patches/51_freenode_default_port_8001.patch 2010-12-13 21:37:17 +0000 |
217 | @@ -0,0 +1,31 @@ |
218 | +From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> |
219 | +Subject: Drop ports 666x for FreeNode to workaround a possible DCC exploit. |
220 | + |
221 | +Since ports 800x are available for connections to FreeNode, this avoids |
222 | +exposing users an old vulnerability on some routers where a malformed DCC SEND |
223 | +command sent to a client would cause them to get disconnected. Such routers |
224 | +usually try to check what goes on on common IRC ports (6660-6669), so just |
225 | +staying clear from this range is a little safer. |
226 | + |
227 | +This is an old patch ported so that it still works, but given the |
228 | +CVEs are from back in 2006, it's likely it could be dropped without |
229 | +problems. |
230 | + |
231 | +For reference, the CVEs at play were CVE-2006-1067 [1] and |
232 | +CVE-2006-1068 [2]. |
233 | + |
234 | + [1] - http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-1067 |
235 | + [2] - http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-1068 |
236 | + |
237 | +--- a/src/common/servlist.c 2010-12-09 11:40:03.000000000 -0500 |
238 | ++++ b/src/common/servlist.c 2010-12-09 11:40:25.500695002 -0500 |
239 | +@@ -207,9 +207,6 @@ |
240 | + {0, "irc.vendetta.com"}, |
241 | + |
242 | + {"FreeNode", 0}, |
243 | +- {0, "irc.freenode.net/6665"}, |
244 | +- {0, "irc.freenode.net/6666"}, |
245 | +- {0, "irc.freenode.net/6667"}, |
246 | + {0, "irc.freenode.net/8000"}, |
247 | + {0, "irc.freenode.net/8001"}, |
248 | + {0, "irc.freenode.net/8002"}, |
249 | |
250 | === removed file 'debian/patches/98_autoconf.patch' |
251 | --- debian/patches/98_autoconf.patch 2009-04-13 10:48:16 +0000 |
252 | +++ debian/patches/98_autoconf.patch 1970-01-01 00:00:00 +0000 |
253 | @@ -1,83 +0,0 @@ |
254 | -diff -Nur -x '*.orig' -x '*~' xchat-gnome-0.26.1/configure xchat-gnome-0.26.1.new/configure |
255 | ---- xchat-gnome-0.26.1/configure 2009-04-12 19:48:10.000000000 +0200 |
256 | -+++ xchat-gnome-0.26.1.new/configure 2009-04-13 12:32:37.000000000 +0200 |
257 | -@@ -13818,6 +13818,7 @@ |
258 | - glib-2.0 >= \$GLIB_REQUIRED \\ |
259 | - gio-2.0 >= \$GLIB_REQUIRED \\ |
260 | - gtk+-2.0 >= \$GTK_REQUIRED \\ |
261 | -+ launchpad-integration \\ |
262 | - libglade-2.0 >= \$LIBGLADE_REQUIRED \\ |
263 | - libgnome-2.0 >= \$LIBGNOME_REQUIRED \\ |
264 | - libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED \\ |
265 | -@@ -13828,6 +13829,7 @@ |
266 | - glib-2.0 >= $GLIB_REQUIRED \ |
267 | - gio-2.0 >= $GLIB_REQUIRED \ |
268 | - gtk+-2.0 >= $GTK_REQUIRED \ |
269 | -+ launchpad-integration \ |
270 | - libglade-2.0 >= $LIBGLADE_REQUIRED \ |
271 | - libgnome-2.0 >= $LIBGNOME_REQUIRED \ |
272 | - libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ |
273 | -@@ -13841,6 +13843,7 @@ |
274 | - glib-2.0 >= $GLIB_REQUIRED \ |
275 | - gio-2.0 >= $GLIB_REQUIRED \ |
276 | - gtk+-2.0 >= $GTK_REQUIRED \ |
277 | -+ launchpad-integration \ |
278 | - libglade-2.0 >= $LIBGLADE_REQUIRED \ |
279 | - libgnome-2.0 >= $LIBGNOME_REQUIRED \ |
280 | - libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ |
281 | -@@ -13863,6 +13866,7 @@ |
282 | - glib-2.0 >= \$GLIB_REQUIRED \\ |
283 | - gio-2.0 >= \$GLIB_REQUIRED \\ |
284 | - gtk+-2.0 >= \$GTK_REQUIRED \\ |
285 | -+ launchpad-integration \\ |
286 | - libglade-2.0 >= \$LIBGLADE_REQUIRED \\ |
287 | - libgnome-2.0 >= \$LIBGNOME_REQUIRED \\ |
288 | - libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED \\ |
289 | -@@ -13873,6 +13877,7 @@ |
290 | - glib-2.0 >= $GLIB_REQUIRED \ |
291 | - gio-2.0 >= $GLIB_REQUIRED \ |
292 | - gtk+-2.0 >= $GTK_REQUIRED \ |
293 | -+ launchpad-integration \ |
294 | - libglade-2.0 >= $LIBGLADE_REQUIRED \ |
295 | - libgnome-2.0 >= $LIBGNOME_REQUIRED \ |
296 | - libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ |
297 | -@@ -13886,6 +13891,7 @@ |
298 | - glib-2.0 >= $GLIB_REQUIRED \ |
299 | - gio-2.0 >= $GLIB_REQUIRED \ |
300 | - gtk+-2.0 >= $GTK_REQUIRED \ |
301 | -+ launchpad-integration \ |
302 | - libglade-2.0 >= $LIBGLADE_REQUIRED \ |
303 | - libgnome-2.0 >= $LIBGNOME_REQUIRED \ |
304 | - libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ |
305 | -@@ -13914,6 +13920,7 @@ |
306 | - glib-2.0 >= $GLIB_REQUIRED \ |
307 | - gio-2.0 >= $GLIB_REQUIRED \ |
308 | - gtk+-2.0 >= $GTK_REQUIRED \ |
309 | -+ launchpad-integration \ |
310 | - libglade-2.0 >= $LIBGLADE_REQUIRED \ |
311 | - libgnome-2.0 >= $LIBGNOME_REQUIRED \ |
312 | - libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ |
313 | -@@ -13925,6 +13932,7 @@ |
314 | - glib-2.0 >= $GLIB_REQUIRED \ |
315 | - gio-2.0 >= $GLIB_REQUIRED \ |
316 | - gtk+-2.0 >= $GTK_REQUIRED \ |
317 | -+ launchpad-integration \ |
318 | - libglade-2.0 >= $LIBGLADE_REQUIRED \ |
319 | - libgnome-2.0 >= $LIBGNOME_REQUIRED \ |
320 | - libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ |
321 | -@@ -13939,6 +13947,7 @@ |
322 | - glib-2.0 >= $GLIB_REQUIRED \ |
323 | - gio-2.0 >= $GLIB_REQUIRED \ |
324 | - gtk+-2.0 >= $GTK_REQUIRED \ |
325 | -+ launchpad-integration \ |
326 | - libglade-2.0 >= $LIBGLADE_REQUIRED \ |
327 | - libgnome-2.0 >= $LIBGNOME_REQUIRED \ |
328 | - libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ |
329 | -@@ -13959,6 +13968,7 @@ |
330 | - glib-2.0 >= $GLIB_REQUIRED \ |
331 | - gio-2.0 >= $GLIB_REQUIRED \ |
332 | - gtk+-2.0 >= $GTK_REQUIRED \ |
333 | -+ launchpad-integration \ |
334 | - libglade-2.0 >= $LIBGLADE_REQUIRED \ |
335 | - libgnome-2.0 >= $LIBGNOME_REQUIRED \ |
336 | - libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ |
337 | |
338 | === added file 'debian/patches/98_ice_depends_for_eggsmclient.patch' |
339 | --- debian/patches/98_ice_depends_for_eggsmclient.patch 1970-01-01 00:00:00 +0000 |
340 | +++ debian/patches/98_ice_depends_for_eggsmclient.patch 2010-12-13 21:37:17 +0000 |
341 | @@ -0,0 +1,17 @@ |
342 | +From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> |
343 | +Subject: Add a compile-time check for libICE, which is required by libsm. |
344 | + |
345 | +Adding a check for ice in configure (for EGG_SMCLIENT) makes sure |
346 | +ICE is added to EGG_SMCLIENT_CFLAGS, but more importantly to |
347 | +EGG_SMCLIENT_LIBS, so that linking has -lICE and doesn't bork. |
348 | + |
349 | +--- configure.ac.orig 2010-12-09 12:53:46.000000000 -0500 |
350 | ++++ configure.ac 2010-12-09 12:54:20.190695001 -0500 |
351 | +@@ -72,6 +72,7 @@ |
352 | + PKG_CHECK_MODULES([EGG_SMCLIENT], [\ |
353 | + gtk+-2.0 >= $GTK_REQUIRED \ |
354 | + sm >= $SM_REQUIRED \ |
355 | ++ ice \ |
356 | + ]) |
357 | + AC_SUBST(EGG_SMCLIENT_CFLAGS) |
358 | + AC_SUBST(EGG_SMCLIENT_LIBS) |
359 | |
360 | === modified file 'debian/rules' |
361 | --- debian/rules 2009-06-15 11:30:47 +0000 |
362 | +++ debian/rules 2010-12-13 21:37:17 +0000 |
363 | @@ -1,5 +1,6 @@ |
364 | #!/usr/bin/make -f |
365 | |
366 | +include /usr/share/cdbs/1/rules/autoreconf.mk |
367 | include /usr/share/cdbs/1/rules/debhelper.mk |
368 | include /usr/share/cdbs/1/rules/simple-patchsys.mk |
369 | include /usr/share/cdbs/1/rules/utils.mk |
Hey Mathieu, thanks for your nice work there :)
Some little fixes to take into consideration:
* NOCONFIGURE=1 ./autogen.sh; \
-> you will need automake and such in the builder chroot in that case. I would suggest using dh_autoreconf (and build-dep on dh-autoreconf then) rather.
* debian/control:
-> all changes aren't listed/explained