r25504 - in /desktop/experimental/gconf: ./ debian/ debian/patches/ debian/po-up/

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Nov  6 20:03:42 2010
New Revision: 25504

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25504
Log:
Merge changes from the unstable branch.

Added:
    desktop/experimental/gconf/debian/patches/04_manpage.patch
      - copied unchanged from r25503, desktop/unstable/gconf/debian/patches/04_manpage.patch
    desktop/experimental/gconf/debian/po-up/cs.po
      - copied unchanged from r25503, desktop/unstable/gconf/debian/po-up/cs.po
    desktop/experimental/gconf/debian/po-up/da.po
      - copied unchanged from r25503, desktop/unstable/gconf/debian/po-up/da.po
    desktop/experimental/gconf/debian/po-up/de.po
      - copied unchanged from r25503, desktop/unstable/gconf/debian/po-up/de.po
    desktop/experimental/gconf/debian/po-up/fr.po
      - copied unchanged from r25503, desktop/unstable/gconf/debian/po-up/fr.po
    desktop/experimental/gconf/debian/po-up/pt_BR.po
      - copied unchanged from r25503, desktop/unstable/gconf/debian/po-up/pt_BR.po
    desktop/experimental/gconf/debian/po-up/sv.po
      - copied unchanged from r25503, desktop/unstable/gconf/debian/po-up/sv.po
Modified:
    desktop/experimental/gconf/   (props changed)
    desktop/experimental/gconf/debian/changelog
    desktop/experimental/gconf/debian/patches/series
    desktop/experimental/gconf/debian/update-gconf-defaults

Propchange: desktop/experimental/gconf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov  6 20:03:42 2010
@@ -1,1 +1,1 @@
-/desktop/unstable/gconf:24421,25283
+/desktop/unstable/gconf:24421,25283-25503

Modified: desktop/experimental/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/changelog?rev=25504&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/changelog [utf-8] (original)
+++ desktop/experimental/gconf/debian/changelog [utf-8] Sat Nov  6 20:03:42 2010
@@ -2,8 +2,18 @@
 
   * 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
+  * pt_BR.po: Brazilian Portuguese translation. Closes: #599032.
+  * fr.po: French translation by Christian Perrier. Closes: #599049.
+  * da.po: Danish translation by Joe Hansen. Closes: #599125.
+  * cs.po: Czech translation by Michal Simunek. Closes: #599198.
+  * update-gconf-defaults: patch from Ubuntu to deal with broken 
+    symlinks. Closes: #599393. Thanks Michael Vogt.
+  * de.po: German translation by Helge Kreutzmann. Closes: #599683.
+  * sv.po: Swedish translation by Martin Bagge. Closes: #599854.
+  * 04_manpage.patch: patch from A. Costa. Fixes typos in the manual 
+    page. Closes: #600899.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 09 Oct 2010 09:59:07 +0200
 
 gconf (2.31.5-1) experimental; urgency=low
 

Modified: desktop/experimental/gconf/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/patches/series?rev=25504&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gconf/debian/patches/series [utf-8] Sat Nov  6 20:03:42 2010
@@ -1,4 +1,5 @@
 01_defaults_path.patch
 02_fix_wrong_return_value.patch
 03_error_message.patch
+04_manpage.patch
 25_gconf-path-max-hurd.patch

Modified: desktop/experimental/gconf/debian/update-gconf-defaults
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gconf/debian/update-gconf-defaults?rev=25504&op=diff
==============================================================================
--- desktop/experimental/gconf/debian/update-gconf-defaults [utf-8] (original)
+++ desktop/experimental/gconf/debian/update-gconf-defaults [utf-8] Sat Nov  6 20:03:42 2010
@@ -130,7 +130,8 @@
     if f.endswith(ext):
       break
   else:
-    defaults_files.append(f)
+    if os.path.exists(os.path.join(options.source_dir, f)):
+      defaults_files.append(f)
 defaults_files.sort()
 
 if options.ifchanged: