r25283 - in /desktop/unstable/gconf/debian: changelog control control.in po-up/ po-up/POTFILES.in po-up/patches.pot rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Oct 3 20:39:40 UTC 2010
Author: joss
Date: Sun Oct 3 20:39:40 2010
New Revision: 25283
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25283
Log:
* Include patch-translations.mk, bump build-depends accordingly.
* Include 03_error_message.patch in POTFILES.in.
Added:
desktop/unstable/gconf/debian/po-up/
desktop/unstable/gconf/debian/po-up/POTFILES.in
desktop/unstable/gconf/debian/po-up/patches.pot
Modified:
desktop/unstable/gconf/debian/changelog
desktop/unstable/gconf/debian/control
desktop/unstable/gconf/debian/control.in
desktop/unstable/gconf/debian/rules
Modified: desktop/unstable/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/changelog?rev=25283&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/changelog [utf-8] (original)
+++ desktop/unstable/gconf/debian/changelog [utf-8] Sun Oct 3 20:39:40 2010
@@ -1,3 +1,10 @@
+gconf (2.28.1-5) UNRELEASED; urgency=low
+
+ * Include patch-translations.mk, bump build-depends accordingly.
+ * Include 03_error_message.patch in POTFILES.in.
+
+ -- Josselin Mouette <joss at debian.org> Sun, 03 Oct 2010 21:33:40 +0200
+
gconf (2.28.1-4) unstable; urgency=low
* 03_error_message.patch: new patch. Replace the error message by
Modified: desktop/unstable/gconf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/control?rev=25283&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/control [utf-8] (original)
+++ desktop/unstable/gconf/debian/control [utf-8] Sun Oct 3 20:39:40 2010
@@ -11,7 +11,7 @@
Build-Depends: debhelper (>= 5),
cdbs (>= 0.4.41),
quilt,
- gnome-pkg-tools (>= 0.10),
+ gnome-pkg-tools (>= 0.14),
dpkg-dev (>= 1.13.19),
gtk-doc-tools (>= 1.0),
libglib2.0-dev (>= 2.14.0),
Modified: desktop/unstable/gconf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/control.in?rev=25283&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/control.in [utf-8] (original)
+++ desktop/unstable/gconf/debian/control.in [utf-8] Sun Oct 3 20:39:40 2010
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 5),
cdbs (>= 0.4.41),
quilt,
- gnome-pkg-tools (>= 0.10),
+ gnome-pkg-tools (>= 0.14),
dpkg-dev (>= 1.13.19),
gtk-doc-tools (>= 1.0),
libglib2.0-dev (>= 2.14.0),
Added: desktop/unstable/gconf/debian/po-up/POTFILES.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/po-up/POTFILES.in?rev=25283&op=file
==============================================================================
--- desktop/unstable/gconf/debian/po-up/POTFILES.in (added)
+++ desktop/unstable/gconf/debian/po-up/POTFILES.in [utf-8] Sun Oct 3 20:39:40 2010
@@ -1,0 +1,1 @@
+patches/03_error_message.patch
Added: desktop/unstable/gconf/debian/po-up/patches.pot
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/po-up/patches.pot?rev=25283&op=file
==============================================================================
--- desktop/unstable/gconf/debian/po-up/patches.pot (added)
+++ desktop/unstable/gconf/debian/po-up/patches.pot [utf-8] Sun Oct 3 20:39:40 2010
@@ -1,0 +1,26 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-03 21:34+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../patches/03_error_message.patch:2
+#, c-format
+msgid ""
+"Failed to contact configuration server; the most common cause is a missing "
+"or misconfigured D-Bus session bus daemon. See http://projects.gnome.org/"
+"gconf/ for information. (Details - %s)"
+msgstr ""
Modified: desktop/unstable/gconf/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/rules?rev=25283&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/rules [utf-8] (original)
+++ desktop/unstable/gconf/debian/rules [utf-8] Sun Oct 3 20:39:40 2010
@@ -7,6 +7,7 @@
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
+include /usr/share/gnome-pkg-tools/1/rules/patch-translations.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
GNOME_MODULE := GConf
More information about the pkg-gnome-commits
mailing list