r12961 - in /packages/unstable/xdg-user-dirs-gtk/debian: changelog control copyright patches/ patches/01_no_desktop_bookmark.patch patches/90_from_svn_handle_en_us_variants.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Thu Oct 4 13:30:29 UTC 2007
Author: slomo
Date: Thu Oct 4 13:30:29 2007
New Revision: 12961
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12961
Log:
* update to 0.6
Added:
packages/unstable/xdg-user-dirs-gtk/debian/patches/
packages/unstable/xdg-user-dirs-gtk/debian/patches/01_no_desktop_bookmark.patch
packages/unstable/xdg-user-dirs-gtk/debian/patches/90_from_svn_handle_en_us_variants.patch
Modified:
packages/unstable/xdg-user-dirs-gtk/debian/changelog
packages/unstable/xdg-user-dirs-gtk/debian/control
packages/unstable/xdg-user-dirs-gtk/debian/copyright
Modified: packages/unstable/xdg-user-dirs-gtk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xdg-user-dirs-gtk/debian/changelog?rev=12961&op=diff
==============================================================================
--- packages/unstable/xdg-user-dirs-gtk/debian/changelog (original)
+++ packages/unstable/xdg-user-dirs-gtk/debian/changelog Thu Oct 4 13:30:29 2007
@@ -1,6 +1,13 @@
-xdg-user-dirs-gtk (0.3-1) unstable; urgency=low
+xdg-user-dirs-gtk (0.6-1) unstable; urgency=low
- * Initial version (Closes: #413955)
+ * Initial version (Closes: #413955).
+ * debian/patches/01_no_desktop_bookmark.patch:
+ + Don't bookmark the desktop directory since it's already handled
+ as a special case by the GNOME desktop applications (LP: #122602)
+ Patch taken from Ubuntu.
+ * debian/patches/90_from_svn_handle_en_us_variants.patch:
+ + patch from SVN, handle en_US variants correctly. Patch taken from
+ Ubuntu.
-- Sebastian Dröge <slomo at debian.org> Thu, 8 Mar 2007 07:16:00 +0100
Modified: packages/unstable/xdg-user-dirs-gtk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xdg-user-dirs-gtk/debian/control?rev=12961&op=diff
==============================================================================
--- packages/unstable/xdg-user-dirs-gtk/debian/control (original)
+++ packages/unstable/xdg-user-dirs-gtk/debian/control Thu Oct 4 13:30:29 2007
@@ -2,7 +2,7 @@
Section: utils
Priority: optional
Maintainer: Sebastian Dröge <slomo at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Kilian Krause <kilian at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, Ondřej Surý <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Build-Depends: cdbs, debhelper (>= 5), gnome-pkg-tools, libgtk2.0-dev, xdg-user-dirs, libxml-parser-perl
Standards-Version: 3.7.2
Modified: packages/unstable/xdg-user-dirs-gtk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xdg-user-dirs-gtk/debian/copyright?rev=12961&op=diff
==============================================================================
--- packages/unstable/xdg-user-dirs-gtk/debian/copyright (original)
+++ packages/unstable/xdg-user-dirs-gtk/debian/copyright Thu Oct 4 13:30:29 2007
@@ -8,7 +8,21 @@
Alexander Larsson <alexl at redhat.com>
Copyright:
+
+ For everything not listed below:
Copyright (C) 2007 Red Hat, Inc
+
+ For po/fr.po,
+ po/ca.po,
+ po/pt_BR.po,
+ po/it.po,
+ po/sv.po,
+ po/hu.po,
+ po/ja.po:
+ Copyright (C) 2007 Free Software Foundation, Inc.
+
+ For po/fi.po:
+ Copyright (C) 2007 Timo Jyrinki
License:
Added: packages/unstable/xdg-user-dirs-gtk/debian/patches/01_no_desktop_bookmark.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xdg-user-dirs-gtk/debian/patches/01_no_desktop_bookmark.patch?rev=12961&op=file
==============================================================================
--- packages/unstable/xdg-user-dirs-gtk/debian/patches/01_no_desktop_bookmark.patch (added)
+++ packages/unstable/xdg-user-dirs-gtk/debian/patches/01_no_desktop_bookmark.patch Thu Oct 4 13:30:29 2007
@@ -1,0 +1,12 @@
+diff -Nur xdg-user-dirs-gtk-0.6/update.c xdg-user-dirs-gtk-0.6.new/update.c
+--- xdg-user-dirs-gtk-0.6/update.c 2007-07-03 10:40:34.000000000 +0200
++++ xdg-user-dirs-gtk-0.6.new/update.c 2007-10-02 19:52:11.000000000 +0200
+@@ -293,7 +293,7 @@
+ for (i = 0; make_bm_for[i] != NULL; i++)
+ {
+ entry = find_dir_entry (new_entries, make_bm_for[i]);
+- if (entry && strcmp (entry->path, g_get_home_dir ()) != 0)
++ if (entry && strcmp (entry->path, g_get_home_dir ()) != 0 && strcmp (entry->path, (find_dir_entry (new_entries, "DESKTOP"))->path))
+ {
+ uri = g_filename_to_uri (entry->path, NULL, NULL);
+ if (uri)
Added: packages/unstable/xdg-user-dirs-gtk/debian/patches/90_from_svn_handle_en_us_variants.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xdg-user-dirs-gtk/debian/patches/90_from_svn_handle_en_us_variants.patch?rev=12961&op=file
==============================================================================
--- packages/unstable/xdg-user-dirs-gtk/debian/patches/90_from_svn_handle_en_us_variants.patch (added)
+++ packages/unstable/xdg-user-dirs-gtk/debian/patches/90_from_svn_handle_en_us_variants.patch Thu Oct 4 13:30:29 2007
@@ -1,0 +1,11 @@
+--- trunk/update.c 2007/09/29 18:16:08 57
++++ trunk/update.c 2007/10/02 09:33:53 58
+@@ -45,7 +45,7 @@
+
+ locale = setlocale (LC_MESSAGES, NULL);
+
+- if (strcmp (locale, "en_US") == 0 ||
++ if (strncmp (locale, "en_US", 5) == 0 ||
+ strcmp (locale, "C") == 0)
+ return TRUE;
+
More information about the pkg-gnome-commits
mailing list