114 lines
4.1 KiB
Diff
114 lines
4.1 KiB
Diff
Index: configure.in
|
|
===================================================================
|
|
--- configure.in (révision 5453)
|
|
+++ configure.in (révision 5455)
|
|
@@ -45,11 +45,25 @@ if test "x$with_gnome_distributor" != x
|
|
GNOME_DISTRIBUTOR=$with_gnome_distributor
|
|
fi
|
|
|
|
+AC_ARG_ENABLE([date-in-gnome-version],
|
|
+ [AS_HELP_STRING([--disable-date-in-gnome-version],[do not put the build date in gnome-version.xml])],
|
|
+ [],[enable_date_in_gnome_version=yes])
|
|
+if test "$enable_date_in_gnome_version" = "no"; then
|
|
+ GNOME_DATE=
|
|
+ GNOME_DATE_COMMENT_START="<!--"
|
|
+ GNOME_DATE_COMMENT_END="-->"
|
|
+else
|
|
+ GNOME_DATE_COMMENT_START=
|
|
+ GNOME_DATE_COMMENT_END=
|
|
+fi
|
|
+
|
|
AC_SUBST(GNOME_PLATFORM)
|
|
AC_SUBST(GNOME_MINOR)
|
|
AC_SUBST(GNOME_MICRO)
|
|
AC_SUBST(GNOME_DISTRIBUTOR)
|
|
AC_SUBST(GNOME_DATE)
|
|
+AC_SUBST(GNOME_DATE_COMMENT_START)
|
|
+AC_SUBST(GNOME_DATE_COMMENT_END)
|
|
|
|
GNOME_COMMON_INIT
|
|
GNOME_DEBUG_CHECK
|
|
Index: ChangeLog
|
|
===================================================================
|
|
--- ChangeLog (révision 5453)
|
|
+++ ChangeLog (révision 5455)
|
|
@@ -1,3 +1,18 @@
|
|
+2009-03-27 Vincent Untz <vuntz@gnome.org>
|
|
+
|
|
+ * configure.in:
|
|
+ * gnome-version.xml.in.in: add a --disable-date-in-gnome-version
|
|
+ configure option to not put the build date in gnome-version.xml. The
|
|
+ build date is actually not that useful since it's not the build date
|
|
+ for all of GNOME, but for this specific package. So it can be
|
|
+ confusing.
|
|
+
|
|
+2009-03-26 Vincent Untz <vuntz@gnome.org>
|
|
+
|
|
+ * gnome-about/gnome-about.in: make the code returning the content of
|
|
+ gnome-version.xml a bit more solid, so that we can handle a file
|
|
+ that doesn't contain the date, the distributor or the version.
|
|
+
|
|
2009-03-16 Vincent Untz <vuntz@gnome.org>
|
|
|
|
* configure.in: post-release bump to 2.26.1
|
|
Index: gnome-version.xml.in.in
|
|
===================================================================
|
|
--- gnome-version.xml.in.in (révision 5453)
|
|
+++ gnome-version.xml.in.in (révision 5455)
|
|
@@ -4,7 +4,7 @@
|
|
<minor>@GNOME_MINOR@</minor>
|
|
<micro>@GNOME_MICRO@</micro>
|
|
<distributor>@GNOME_DISTRIBUTOR@</distributor>
|
|
- <date>@GNOME_DATE@</date>
|
|
+ @GNOME_DATE_COMMENT_START@<date>@GNOME_DATE@</date>@GNOME_DATE_COMMENT_END@
|
|
<description>
|
|
<!-- NOTE TO AUTHORS: Do not put anything in the following paragraphs that
|
|
will be substituted by the configure script. Otherwise you will break
|
|
Index: gnome-about/gnome-about.in
|
|
===================================================================
|
|
--- gnome-about/gnome-about.in (révision 5453)
|
|
+++ gnome-about/gnome-about.in (révision 5455)
|
|
@@ -86,7 +86,7 @@ def cleanup_date (date):
|
|
# FIXME: we don't have g_locale_to_utf8 in python. See bug #530382
|
|
return unicode (time.strftime ("%x", time.strptime (date, "%Y-%m-%d")), locale.getpreferredencoding ()).encode ("utf-8")
|
|
except:
|
|
- return False
|
|
+ return ""
|
|
|
|
# Imported from GNOME's Sabayon
|
|
# (sabayon/admin-tool/lockdown/disabledapplets.py)
|
|
@@ -965,7 +965,9 @@ contributors list) correctly positionned
|
|
self.load_description_messages (node)
|
|
|
|
'''Format version'''
|
|
- if not len (infos["minor"]):
|
|
+ if not len (infos["platform"]):
|
|
+ version = ""
|
|
+ elif not len (infos["minor"]):
|
|
version = infos["platform"]
|
|
elif not len (infos["micro"]):
|
|
version = "%s.%s" % (infos["platform"], infos["minor"])
|
|
@@ -973,11 +975,17 @@ contributors list) correctly positionned
|
|
version = "%s.%s.%s" % (infos["platform"], infos["minor"],
|
|
infos["micro"])
|
|
|
|
- return [
|
|
- (_("Version"), version),
|
|
- (_("Distributor"), infos["distributor"]),
|
|
- (_("Build Date"), cleanup_date (infos["date"]))
|
|
- ]
|
|
+ date = cleanup_date (infos["date"])
|
|
+
|
|
+ retval = []
|
|
+ if version:
|
|
+ retval.append((_("Version"), version))
|
|
+ if infos["distributor"]:
|
|
+ retval.append((_("Distributor"), infos["distributor"]))
|
|
+ if date:
|
|
+ retval.append((_("Build Date"), date))
|
|
+
|
|
+ return retval
|
|
|
|
def load_description_messages (self, node):
|
|
'''Find the best translation of each description message'''
|