author | yippi |
Thu, 27 Sep 2007 22:30:33 +0000 | |
changeset 10561 | 2e7fecf0591b |
parent 10515 | 79c4a78f3fd3 |
child 11217 | d1778cc22a58 |
permissions | -rw-r--r-- |
10515 | 1 |
diff -urN gnome-desktop-2.20.0/Makefile.am gnome-desktop-2.20.0-hacked/Makefile.am |
2 |
--- gnome-desktop-2.20.0/Makefile.am 2006-04-11 01:17:35.000000000 +1200 |
|
3 |
+++ gnome-desktop-2.20.0-hacked/Makefile.am 2006-04-28 12:31:36.869661000 +1200 |
|
8943 | 4 |
@@ -1,5 +1,10 @@ |
5 |
ACLOCAL_AMFLAGS = -I m4 |
|
6 |
||
6128 | 7 |
+XML_IN_FILES= gnome-version.xml.in |
8 |
+XML_FILES = $(XML_IN_FILES:.xml.in=.xml) |
|
9 |
+versiondir=$(datadir)/gnome-about |
|
10 |
+version_DATA= $(XML_FILES) |
|
11 |
+ |
|
12 |
SUBDIRS = \ |
|
13 |
po \ |
|
14 |
libgnome-desktop \ |
|
9466 | 15 |
@@ -16,8 +16,8 @@ |
6128 | 16 |
|
17 |
EXTRA_DIST = \ |
|
9466 | 18 |
MAINTAINERS \ |
6128 | 19 |
- gnome-version.xml.in.in \ |
20 |
- gnome-version.xml \ |
|
21 |
+ $(XML_IN_FILES) \ |
|
22 |
+ $(XML_FILES) \ |
|
23 |
COPYING-DOCS \ |
|
10515 | 24 |
HACKING \ |
25 |
intltool-extract.in \ |
|
7161 | 26 |
@@ -19,8 +25,9 @@ |
6128 | 27 |
intltool-update.in \ |
28 |
gnome-doc-utils.make |
|
29 |
||
30 |
-versiondir=$(datadir)/gnome-about |
|
31 |
-version_DATA=gnome-version.xml |
|
32 |
+ |
|
33 |
+ |
|
34 |
+ |
|
35 |
@INTLTOOL_XML_RULE@ |
|
36 |
||
7161 | 37 |
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper |
10169 | 38 |
--- gnome-desktop-2.19.5/gnome-about/contributors.list.orig 2007-07-09 15:38:27.500214799 +0100 |
39 |
+++ gnome-desktop-2.19.5/gnome-about/contributors.list 2007-07-09 15:47:12.106338716 +0100 |
|
40 |
@@ -555,3 +555,84 @@ |
|
41 |
Sascha Ziemann |
|
42 |
Michael Zucchi |
|
43 |
Jason van Zyl |
|
44 |
+Amith Yamasani |
|
45 |
+Anand Subramanian |
|
46 |
+Antonio Xu |
|
47 |
+Archana Shah |
|
48 |
+Ashish Mukharji |
|
49 |
+Balamurali Viswanathan |
|
50 |
+Biswa Lal |
|
51 |
+Bolian Yin |
|
52 |
+Brian Nitz |
|
53 |
+Calvin Liu |
|
54 |
+Carl Gadener |
|
55 |
+Chandrashekhar BK |
|
56 |
+Curtis Sasaki |
|
57 |
+Dan Baigent |
|
58 |
+Deirdre Williams |
|
59 |
+Derek Rafter |
|
60 |
+Dermot McCluskey |
|
61 |
+Dinoop Thomas |
|
62 |
+Dirk Grobler |
|
63 |
+Ervin Yan |
|
64 |
+Gary Little |
|
65 |
+Geoff Baysinger |
|
66 |
+Ghee Teo |
|
67 |
+Girish Kulkarni |
|
68 |
+Harry Lu |
|
69 |
+Hema Seetharamaiah |
|
70 |
+Henry Jia |
|
71 |
+Ii Gyoung Park |
|
72 |
+Jack Jia |
|
73 |
+Jason van Zyl |
|
74 |
+Jeff McMeekin |
|
75 |
+Jerry Tan |
|
76 |
+Jessie Li |
|
77 |
+Joshua Xia |
|
78 |
+Kalpesh Shah |
|
79 |
+Karl Gaffney |
|
80 |
+Kaveri Murthy |
|
81 |
+Kyle Yuan |
|
82 |
+Lalith Kumar |
|
83 |
+Laszlo Kovacs |
|
84 |
+Laszlo Peter |
|
85 |
+Leena Gunda |
|
86 |
+Leo Binchy |
|
87 |
+Leon Sha |
|
88 |
+Leon Zhang |
|
89 |
+Louie Zhao |
|
90 |
+Louise Siu |
|
91 |
+Luke Shi |
|
92 |
+Mark Duggan |
|
93 |
+Mark Yang |
|
94 |
+Martin Damboldt |
|
95 |
+Matt Keenan |
|
96 |
+Michael Krivoruchko |
|
97 |
+Michael Twomey |
|
98 |
+Mike Lei |
|
99 |
+Muktha Narayan |
|
100 |
+Nancy Lee |
|
101 |
+Narayana Pattipati |
|
102 |
+Niall Power |
|
103 |
+Olaf Felka |
|
104 |
+Oliver Braun |
|
105 |
+Partha Pratim |
|
106 |
+Patrick Gu |
|
107 |
+Pete Zha |
|
108 |
+Rick Ju |
|
109 |
+Robert Kinsella |
|
110 |
+Robert O'Dea |
|
111 |
+Robin Lu |
|
112 |
+Shane O'Connor |
|
113 |
+Simford Dong |
|
114 |
+Sowmya Adiga |
|
115 |
+Srirama Sharma |
|
116 |
+Suresh Chandrasekharan |
|
117 |
+Susan Jefferies |
|
118 |
+Terry Ponce |
|
119 |
+Thorsten Laux |
|
120 |
+Vijay Anand |
|
121 |
+Vijaykumar Patwari |
|
122 |
+Vinay M R |
|
123 |
+Vishnu Kumar |
|
124 |
+Yogeesh MB |
|
125 |
diff -urN gnome-desktop-2.19.5/gnome-about/gnome-about.c gnome-desktop-2.19.5-hacked/gnome-about/gnome-about.c |
|
10561 | 126 |
--- gnome-desktop-2.20.0/gnome-about/gnome-about.c-orig 2007-09-26 16:16:27.836390000 -0500 |
127 |
+++ gnome-desktop-2.20.0/gnome-about/gnome-about.c 2007-09-26 16:14:08.394970000 -0500 |
|
128 |
@@ -50,11 +50,14 @@ |
|
129 |
||
130 |
/* pick some good defaults */ |
|
131 |
static gdouble canvas_width = 550.0; |
|
132 |
-static gdouble canvas_height = 350.0; |
|
133 |
+static gdouble canvas_height = 400.0; |
|
134 |
||
2465 | 135 |
|
136 |
static char **introduction_messages = NULL; |
|
137 |
static GnomeCanvasItem *subheader = NULL; |
|
138 |
+static GnomeCanvasItem *welcome_text = NULL; |
|
139 |
+static GnomeCanvasItem *version_text = NULL; |
|
140 |
+static char *version_string = NULL; |
|
141 |
static gdouble version_info_height = 0.0; |
|
142 |
static gint contrib_i = 0; |
|
10169 | 143 |
|
10561 | 144 |
@@ -321,8 +324,8 @@ display_introduction_message (gpointer d |
145 |
"fill_color", "White", |
|
146 |
"x1", -4.0, |
|
147 |
"y1", -4.0, |
|
148 |
- "x2", 304.0, |
|
149 |
- "y2", 84.0, |
|
150 |
+ "x2", 404.0, |
|
151 |
+ "y2", 184.0, |
|
152 |
NULL); |
|
153 |
||
154 |
intro_text = |
|
155 |
@@ -331,8 +334,8 @@ display_introduction_message (gpointer d |
|
5518 | 156 |
"text", introduction_messages[intro_i], |
157 |
"editable", FALSE, |
|
158 |
/* FIXME */ |
|
159 |
- "width", 300.0, |
|
10561 | 160 |
- "height", 80.0, |
161 |
+ "width", 400.0, |
|
162 |
+ "height",180.0, |
|
5518 | 163 |
"grow_height", TRUE, |
164 |
"cursor_visible", FALSE, |
|
10561 | 165 |
NULL); |
166 |
@@ -515,6 +518,7 @@ typedef struct { |
|
2582 | 167 |
|
168 |
const gchar *text; |
|
169 |
const gchar *url; |
|
170 |
+ gboolean is_link; |
|
171 |
} HRefItem; |
|
172 |
||
173 |
static gboolean |
|
10561 | 174 |
@@ -541,18 +545,39 @@ href_item_event_callback (GnomeCanvasIte |
2582 | 175 |
case GDK_BUTTON_PRESS: { |
176 |
GError *error= NULL; |
|
177 |
||
178 |
- gnome_url_show (href->url, &error); |
|
179 |
- if (error) { |
|
180 |
- char *message; |
|
181 |
- |
|
182 |
- message = g_strdup_printf (_("Could not open the address \"%s\": %s"), |
|
183 |
- href->url, error->message); |
|
184 |
- show_error_dialog (message); |
|
185 |
+ if (!href->is_link) { |
|
186 |
+ gnome_url_show (href->url, &error); |
|
187 |
+ if (error) { |
|
188 |
+ char *message; |
|
189 |
+ |
|
190 |
+ message = g_strdup_printf (_("Could not open the address \"%s\": %s"), |
|
191 |
+ href->url, error->message); |
|
192 |
+ show_error_dialog (message); |
|
193 |
||
194 |
- g_free (message); |
|
195 |
- g_error_free (error); |
|
196 |
- } |
|
197 |
+ g_free (message); |
|
198 |
+ g_error_free (error); |
|
199 |
+ } |
|
200 |
+ } else { |
|
201 |
+ char *tmp; |
|
202 |
+ tmp = g_find_program_in_path (href->url); |
|
203 |
+ |
|
204 |
+ if (tmp) { |
|
205 |
+ g_spawn_command_line_async (tmp, &error); |
|
206 |
+ g_free (tmp); |
|
207 |
+ } |
|
208 |
+ |
|
209 |
+ if (error) { |
|
210 |
+ char *message; |
|
211 |
+ |
|
9275 | 212 |
+ /* SUN_BRANDING */ |
2582 | 213 |
+ message = g_strdup_printf (_("Could not execute \"%s\": %s"), |
214 |
+ href->url, error->message); |
|
215 |
+ show_error_dialog (message); |
|
216 |
||
217 |
+ g_free (message); |
|
218 |
+ g_error_free (error); |
|
219 |
+ } |
|
220 |
+ } |
|
221 |
return TRUE; |
|
222 |
} |
|
223 |
||
10561 | 224 |
@@ -567,6 +592,7 @@ static HRefItem * |
2582 | 225 |
href_item_new (GnomeCanvasGroup *group, |
226 |
const gchar *text, |
|
227 |
const gchar *url, |
|
228 |
+ gboolean is_link, |
|
229 |
gdouble *current_x, |
|
230 |
gdouble *current_y) |
|
231 |
{ |
|
10561 | 232 |
@@ -576,6 +602,7 @@ href_item_new (GnomeCanvasGroup *group, |
2582 | 233 |
item = g_new0 (HRefItem, 1); |
234 |
item->text = g_strdup (text); |
|
235 |
item->url = g_strdup (url); |
|
236 |
+ item->is_link = is_link; |
|
237 |
||
238 |
item->item = |
|
239 |
gnome_canvas_item_new (group, |
|
10561 | 240 |
@@ -765,8 +792,8 @@ create_date_string (const char *value) |
5518 | 241 |
|
242 |
g_date_set_dmy (date, day, month, year); |
|
243 |
||
244 |
- result = g_new0 (char, 24); |
|
245 |
- g_date_strftime (result, 24, "%x", date); |
|
246 |
+ result = g_new0 (char, 30); |
|
247 |
+ g_date_strftime (result, 30, "%x", date); |
|
248 |
||
249 |
g_date_free (date); |
|
250 |
||
10561 | 251 |
@@ -787,6 +814,7 @@ get_version_info (char **version_string, |
2465 | 252 |
char *platform = NULL; |
253 |
char *minor = NULL; |
|
254 |
char *micro = NULL; |
|
255 |
+ char *distributor_version_string = NULL; |
|
256 |
||
8943 | 257 |
file = gnome_program_locate_file (NULL, |
258 |
GNOME_FILE_DOMAIN_APP_DATADIR, |
|
10561 | 259 |
@@ -830,6 +858,8 @@ get_version_info (char **version_string, |
8943 | 260 |
*distributor_string = g_strdup (value); |
261 |
else if (!g_ascii_strcasecmp (name, "date") && value && value[0]) |
|
262 |
*build_date_string = create_date_string (value); |
|
2465 | 263 |
+ if (!g_ascii_strcasecmp (name, "distributor-version") && value && value[0]) |
264 |
+ distributor_version_string = g_strdup (value); |
|
265 |
||
8943 | 266 |
bits = bits->next; |
267 |
xmlFree (value); |
|
10561 | 268 |
@@ -844,7 +874,7 @@ get_version_info (char **version_string, |
8943 | 269 |
*version_string = g_strconcat (platform, ".", minor, NULL); |
2465 | 270 |
|
8943 | 271 |
if (!*version_string) |
272 |
- *version_string = g_strconcat (platform, ".", minor, ".", |
|
273 |
+ *version_string = g_strconcat (platform, " ", minor, ".", |
|
274 |
micro, NULL); |
|
2465 | 275 |
|
276 |
g_free (platform); |
|
10561 | 277 |
@@ -884,6 +914,7 @@ display_version_info (GnomeCanvasGroup * |
8950 | 278 |
{ |
279 |
char *version_string = NULL; |
|
280 |
char *distributor_string = NULL; |
|
281 |
+ char *distributor_version_string = NULL; |
|
282 |
char *build_date_string = NULL; |
|
283 |
char *format = NULL; |
|
284 |
char *text = NULL; |
|
10561 | 285 |
@@ -903,22 +934,39 @@ display_version_info (GnomeCanvasGroup * |
8943 | 286 |
|
287 |
format = g_strdup_printf ("<b>%s</b>%%s", _("%s: ")); |
|
2465 | 288 |
|
289 |
- if (version_string && version_string[0]) { |
|
290 |
+ if (distributor_version_string && distributor_version_string[0]) { |
|
291 |
+ gdouble tmp; |
|
292 |
+ |
|
293 |
+ text = g_strdup_printf ("<b>%s: </b>%s", |
|
9275 | 294 |
+ /* SUN_BRANDING */ |
2465 | 295 |
+ _("Version"), distributor_version_string); |
296 |
+ version_text = gnome_canvas_item_new (GNOME_CANVAS_GROUP (info), |
|
8943 | 297 |
+ gnome_canvas_text_get_type (), |
298 |
+ "markup", text, |
|
299 |
+ "anchor", GTK_ANCHOR_NW, |
|
300 |
+ "x", 0.0, |
|
301 |
+ "y", height, |
|
302 |
+ NULL); |
|
2465 | 303 |
+ g_free (text); |
304 |
+ |
|
305 |
+ g_object_get (version_text, "text_height", &tmp, NULL); |
|
306 |
+ height += tmp + 4.0; |
|
307 |
+ } |
|
308 |
+ else if (version_string && version_string[0]) { |
|
309 |
gdouble tmp; |
|
310 |
- GnomeCanvasItem *item; |
|
311 |
||
8943 | 312 |
text = g_strdup_printf (format, |
2465 | 313 |
_("Version"), version_string); |
314 |
- item = gnome_canvas_item_new (GNOME_CANVAS_GROUP (info), |
|
315 |
- gnome_canvas_text_get_type (), |
|
316 |
- "markup", text, |
|
317 |
- "anchor", GTK_ANCHOR_NW, |
|
318 |
- "x", 0.0, |
|
319 |
- "y", height, |
|
320 |
- NULL); |
|
321 |
+ version_text = gnome_canvas_item_new (GNOME_CANVAS_GROUP (info), |
|
8943 | 322 |
+ gnome_canvas_text_get_type (), |
323 |
+ "markup", text, |
|
324 |
+ "anchor", GTK_ANCHOR_NW, |
|
325 |
+ "x", 0.0, |
|
326 |
+ "y", height, |
|
327 |
+ NULL); |
|
2465 | 328 |
g_free (text); |
329 |
||
330 |
- g_object_get (item, "text_height", &tmp, NULL); |
|
331 |
+ g_object_get (version_text, "text_height", &tmp, NULL); |
|
332 |
height += tmp + 4.0; |
|
333 |
} |
|
334 |
||
10561 | 335 |
@@ -961,8 +1009,8 @@ display_version_info (GnomeCanvasGroup * |
2465 | 336 |
} |
337 |
||
8943 | 338 |
g_free (format); |
2465 | 339 |
- g_free (version_string); |
340 |
g_free (distributor_string); |
|
341 |
+ g_free (distributor_version_string); |
|
342 |
g_free (build_date_string); |
|
343 |
||
344 |
gnome_canvas_item_set (info, "y", canvas_height - height, NULL); |
|
10561 | 345 |
@@ -976,7 +1024,7 @@ create_canvas (void) |
3031 | 346 |
GtkWidget *canvas; |
347 |
||
348 |
HRefItem *href; |
|
349 |
- gchar *text; |
|
350 |
+ gchar *text, *path; |
|
351 |
||
352 |
GnomeCanvasItem *item; |
|
353 |
GnomeCanvasGroup *root; |
|
10561 | 354 |
@@ -1029,8 +1077,10 @@ create_canvas (void) |
2465 | 355 |
current_y = (gdouble)gdk_pixbuf_get_height (header) + 5.0; |
356 |
||
357 |
href = href_item_new (root, |
|
358 |
- _("About GNOME"), |
|
359 |
- "http://www.gnome.org/about/", |
|
9275 | 360 |
+ /* SUN_BRANDING */ |
2465 | 361 |
+ _("About JDS"), |
362 |
+ "http://www.sun.com/software/javadesktopsystem/", |
|
2582 | 363 |
+ FALSE, |
2465 | 364 |
¤t_x, ¤t_y); |
365 |
||
366 |
/* make a nice guess for the dot delta */ |
|
10561 | 367 |
@@ -1043,8 +1093,10 @@ create_canvas (void) |
2465 | 368 |
/* and more items on a likewise way. |
369 |
*/ |
|
370 |
href = href_item_new (root, |
|
371 |
- _("News"), |
|
5518 | 372 |
- "http://news.gnome.org", |
9275 | 373 |
+ /* SUN_BRANDING */ |
2582 | 374 |
+ _("About GNOME"), |
375 |
+ "http://www.gnome.org/about/", |
|
376 |
+ FALSE, |
|
2465 | 377 |
¤t_x, ¤t_y); |
378 |
item = create_dot (root, ¤t_x, ¤t_y, dot_delta); |
|
379 |
||
10561 | 380 |
@@ -1054,29 +1106,43 @@ create_canvas (void) |
2582 | 381 |
*/ |
382 |
href = href_item_new (root, |
|
383 |
_("Software"), |
|
384 |
- "http://www.gnome.org/softwaremap", |
|
5518 | 385 |
+ "http://www.sun.com/software", |
2582 | 386 |
+ FALSE, |
387 |
¤t_x, ¤t_y); |
|
388 |
item = create_dot (root, ¤t_x, ¤t_y, dot_delta); |
|
389 |
||
390 |
href = href_item_new (root, |
|
391 |
_("Developers"), |
|
392 |
- "http://developer.gnome.org/", |
|
3030 | 393 |
- ¤t_x, ¤t_y); |
394 |
- item = create_dot (root, ¤t_x, ¤t_y, dot_delta); |
|
395 |
- |
|
396 |
- href = href_item_new (root, |
|
397 |
- _("Friends of GNOME"), |
|
398 |
- "http://www.gnome.org/friends/", |
|
2582 | 399 |
+ "http://developers.sun.com/", |
400 |
+ FALSE, |
|
401 |
¤t_x, ¤t_y); |
|
2465 | 402 |
item = create_dot (root, ¤t_x, ¤t_y, dot_delta); |
403 |
||
404 |
href = href_item_new (root, |
|
3030 | 405 |
_("Contact"), |
406 |
- "http://www.gnome.org/contact/", |
|
2582 | 407 |
+ "http://www.sun.com/contact/", |
408 |
+ FALSE, |
|
409 |
¤t_x, ¤t_y); |
|
410 |
||
3031 | 411 |
+ path = g_find_program_in_path ("bug-buddy"); |
412 |
+ |
|
413 |
+ if (path != NULL) { |
|
3030 | 414 |
+ item = create_dot (root, ¤t_x, ¤t_y, dot_delta); |
415 |
+ href = href_item_new (root, |
|
9275 | 416 |
+ /* SUN_BRANDING */ |
3030 | 417 |
+ _("Report a bug"), |
418 |
+ "bug-buddy", |
|
419 |
+ TRUE, |
|
420 |
+ ¤t_x, ¤t_y); |
|
3031 | 421 |
+ g_free (path); |
3030 | 422 |
+ } |
423 |
+ |
|
2465 | 424 |
/* resize */ |
425 |
canvas_width = current_x; |
|
426 |
+ |
|
427 |
+ if (current_x > canvas_width) |
|
428 |
+ canvas_width = current_x; |
|
429 |
+ |
|
430 |
gnome_canvas_set_scroll_region (GNOME_CANVAS (canvas), 0, 0, |
|
431 |
canvas_width, canvas_height); |
|
432 |
gtk_widget_set_size_request (GTK_WIDGET (canvas), |
|
10561 | 433 |
@@ -1086,7 +1152,7 @@ create_canvas (void) |
2465 | 434 |
points = gnome_canvas_points_new (2); |
435 |
points->coords[0] = 0.0; |
|
436 |
points->coords[1] = gdk_pixbuf_get_height (header); |
|
437 |
- points->coords[2] = current_x; |
|
438 |
+ points->coords[2] = canvas_width; |
|
439 |
points->coords[3] = gdk_pixbuf_get_height (header); |
|
440 |
||
441 |
item = gnome_canvas_item_new (root, |
|
10561 | 442 |
@@ -1123,6 +1189,7 @@ create_canvas (void) |
6128 | 443 |
"x", (canvas_width - tmp) / 2.0, |
2465 | 444 |
NULL); |
445 |
||
446 |
+ welcome_text = item; |
|
447 |
||
448 |
text = g_strdup_printf ("<big><b>%s</b></big>", |
|
449 |
_("Brought to you by:")); |
|
9543 | 450 |
diff -urN gnome-desktop-2.18.0/gnome-about/gnome-about.desktop.in.in gnome-desktop-2.18.0-hacked/gnome-about/gnome-about.desktop.in.in |
451 |
--- gnome-desktop-2.18.0/gnome-about/gnome-about.desktop.in.in 2006-04-11 00:48:42.000000000 +1200 |
|
452 |
+++ gnome-desktop-2.18.0-hacked/gnome-about/gnome-about.desktop.in.in 2006-04-28 12:32:33.271037000 +1200 |
|
9275 | 453 |
@@ -1,12 +1,14 @@ |
7161 | 454 |
[Desktop Entry] |
455 |
Encoding=UTF-8 |
|
456 |
-_Name=About GNOME |
|
7753 | 457 |
-_Comment=Learn more about GNOME |
9275 | 458 |
+#SUN_BRANDING |
7161 | 459 |
+_Name=About Java Desktop System |
9275 | 460 |
+#SUN_BRANDING |
8628
c3b3c1d14139
Merged 217update branch changes r9777:9830 into trunk branch.
dcarbery
parents:
8379
diff
changeset
|
461 |
+_Comment=Learn more about Java Desktop System |
7161 | 462 |
Exec=gnome-about |
8628
c3b3c1d14139
Merged 217update branch changes r9777:9830 into trunk branch.
dcarbery
parents:
8379
diff
changeset
|
463 |
Icon=gnome-logo-icon-transparent |
7161 | 464 |
Terminal=false |
465 |
Type=Application |
|
9543 | 466 |
-Categories=GNOME;GTK;Core; |
7161 | 467 |
+Categories=GNOME;GTK;Application;System; |
468 |
OnlyShowIn=GNOME; |
|
469 |
X-GNOME-Bugzilla-Bugzilla=GNOME |
|
470 |
X-GNOME-Bugzilla-Product=gnome-desktop |
|
8943 | 471 |
--- gnome-desktop-2.17.5.old/configure.in 2006-10-19 16:54:29.498958000 +0100 |
472 |
+++ gnome-desktop-2.17.5/configure.in 2006-10-19 16:57:57.110569000 +0100 |
|
473 |
@@ -40,15 +40,21 @@ |
|
8379 | 474 |
GNOME_DATE=`date +"%Y-%m-%d"` |
475 |
||
476 |
AC_ARG_WITH(gnome_distributor, [ --with-gnome-distributor=DISTRIBUTOR Specify name of GNOME distributor]) |
|
477 |
+AC_ARG_WITH(gnome_distributor_version, [ --with-gnome-distributor-version=DISTRIBUTOR Specify version of GNOME distributor]) |
|
478 |
||
479 |
if test "x$with_gnome_distributor" != x ; then |
|
480 |
GNOME_DISTRIBUTOR=$with_gnome_distributor |
|
481 |
fi |
|
482 |
||
483 |
+if test "x$with_gnome_distributor_version" != x ; then |
|
484 |
+ GNOME_DISTRIBUTOR_VERSION=$with_gnome_distributor_version |
|
485 |
+fi |
|
486 |
+ |
|
487 |
AC_SUBST(GNOME_PLATFORM) |
|
488 |
AC_SUBST(GNOME_MINOR) |
|
489 |
AC_SUBST(GNOME_MICRO) |
|
490 |
AC_SUBST(GNOME_DISTRIBUTOR) |
|
491 |
+AC_SUBST(GNOME_DISTRIBUTOR_VERSION) |
|
492 |
AC_SUBST(GNOME_DATE) |
|
493 |
||
8943 | 494 |
GNOME_COMMON_INIT |