r25284 - in /desktop/experimental/gconf: ./ debian/changelog debian/control debian/control.in debian/po-up/ debian/rules

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Oct  3 20:45:06 2010
New Revision: 25284

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25284
Log:
* Include patch-translations.mk, bump build-depends accordingly.
* Include 03_error_message.patch in POTFILES.in.

Added:
    desktop/experimental/gconf/debian/po-up/
      - copied from r25283, desktop/unstable/gconf/debian/po-up/
Modified:
    desktop/experimental/gconf/   (props changed)
    desktop/experimental/gconf/debian/changelog
    desktop/experimental/gconf/debian/control
    desktop/experimental/gconf/debian/control.in
    desktop/experimental/gconf/debian/rules

Propchange: desktop/experimental/gconf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct  3 20:45:06 2010
@@ -1,1 +1,1 @@
-/desktop/unstable/gconf:24421
+/desktop/unstable/gconf:24421,25283

Modified: desktop/experimental/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/changelog?rev=25284&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/changelog [utf-8] (original)
+++ desktop/experimental/gconf/debian/changelog [utf-8] Sun Oct  3 20:45:06 2010
@@ -1,3 +1,10 @@
+gconf (2.31.5-2) 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.31.5-1) experimental; urgency=low
 
   [ Josselin Mouette ]

Modified: desktop/experimental/gconf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/control?rev=25284&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/control [utf-8] (original)
+++ desktop/experimental/gconf/debian/control [utf-8] Sun Oct  3 20:45:06 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.25.9),

Modified: desktop/experimental/gconf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/control.in?rev=25284&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/control.in [utf-8] (original)
+++ desktop/experimental/gconf/debian/control.in [utf-8] Sun Oct  3 20:45:06 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.25.9),

Modified: desktop/experimental/gconf/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/rules?rev=25284&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/rules [utf-8] (original)
+++ desktop/experimental/gconf/debian/rules [utf-8] Sun Oct  3 20:45:06 2010
@@ -8,6 +8,7 @@
 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/check-dist.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