r23945 - in /desktop/unstable/gdm3: ./ debian/changelog debian/patches/13_gdmsetup.patch debian/patches/13_gdmsetup_desktop.patch debian/patches/series debian/po-up/POTFILES.in debian/po-up/fr.po debian/po-up/patches.pot

joss at users.alioth.debian.org joss at users.alioth.debian.org
Wed Apr 21 20:14:02 UTC 2010 

Author: joss
Date: Wed Apr 21 20:14:02 2010
New Revision: 23945

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23945
Log:
* 13_gdmsetup_desktop.patch: split the desktop file in another patch, 
  again for translations.
* debian/po-up/POTFILES.in: add it here.
* debian/po-up/fr.po: updated accordingly.

Added:
    desktop/unstable/gdm3/debian/patches/13_gdmsetup_desktop.patch
      - copied unchanged from r23944, desktop/experimental/gdm3/debian/patches/13_gdmsetup_desktop.patch
Modified:
    desktop/unstable/gdm3/   (props changed)
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/patches/13_gdmsetup.patch
    desktop/unstable/gdm3/debian/patches/series
    desktop/unstable/gdm3/debian/po-up/POTFILES.in
    desktop/unstable/gdm3/debian/po-up/fr.po
    desktop/unstable/gdm3/debian/po-up/patches.pot

Propchange: desktop/unstable/gdm3/
------------------------------------------------------------------------------
    svn:mergeinfo = /desktop/experimental/gdm3:23944

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=23945&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Wed Apr 21 20:14:02 2010
@@ -2,12 +2,15 @@
 
   * 11_xephyr_nested.patch: don’t lock the screen when you use Xnest. 
     Also handle correctly the -l option.
-  * debian/po-up/fr.po: updated accordingly.
   * greeter.gconf-defaults: remove trailing whitespace.
   * debian/gdm3.postinst: create a /var/lib/gdm3/.gconf.path that 
     mentions the .gconf.mandatory where the settings live. This fixes 
     all issues with g-s-d, which didn’t obtain the correct settings. 
     Yay!
+  * 13_gdmsetup_desktop.patch: split the desktop file in another patch, 
+    again for translations.
+  * debian/po-up/POTFILES.in: add it here.
+  * debian/po-up/fr.po: updated accordingly.
 
  -- Josselin Mouette <joss at debian.org>  Wed, 21 Apr 2010 19:43:24 +0200
 

Modified: desktop/unstable/gdm3/debian/patches/13_gdmsetup.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/13_gdmsetup.patch?rev=23945&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/13_gdmsetup.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/13_gdmsetup.patch [utf-8] Wed Apr 21 20:14:02 2010
@@ -14,8 +14,8 @@
 #
 Index: gdm-2.30.0/configure.ac
 ===================================================================
---- gdm-2.30.0.orig/configure.ac	2010-04-14 00:52:54.469740508 +0200
-+++ gdm-2.30.0/configure.ac	2010-04-14 00:52:54.505740821 +0200
+--- gdm-2.30.0.orig/configure.ac	2010-04-21 21:54:20.573200619 +0200
++++ gdm-2.30.0/configure.ac	2010-04-21 21:54:31.233187563 +0200
 @@ -41,6 +41,7 @@ dnl ------------------------------------
  
  DBUS_GLIB_REQUIRED_VERSION=0.74
@@ -50,7 +50,7 @@
 Index: gdm-2.30.0/gui/gdmsetup/gdmsetup.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdm-2.30.0/gui/gdmsetup/gdmsetup.c	2010-04-14 00:52:54.505740821 +0200
++++ gdm-2.30.0/gui/gdmsetup/gdmsetup.c	2010-04-21 21:54:31.233187563 +0200
 @@ -0,0 +1,370 @@
 +#ifdef HAVE_CONFIG_H
 +#include "config.h"
@@ -422,27 +422,10 @@
 +
 +    return 0;
 +}
-Index: gdm-2.30.0/gui/gdmsetup/gdmsetup.desktop.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdm-2.30.0/gui/gdmsetup/gdmsetup.desktop.in	2010-04-14 00:52:54.505740821 +0200
-@@ -0,0 +1,12 @@
-+[Desktop Entry]
-+_Name=Login Screen
-+_Comment=Configure login screen behavior
-+Exec=gdmsetup
-+Icon=gdmsetup
-+StartupNotify=true
-+Terminal=false
-+Type=Application
-+Categories=GNOME;GTK;Settings;System;
-+X-GNOME-Bugzilla-Bugzilla=GNOME
-+X-GNOME-Bugzilla-Product=gdm
-+X-GNOME-Bugzilla-Component=general
 Index: gdm-2.30.0/gui/gdmsetup/Makefile.am
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gdm-2.30.0/gui/gdmsetup/Makefile.am	2010-04-14 00:55:01.385238809 +0200
++++ gdm-2.30.0/gui/gdmsetup/Makefile.am	2010-04-21 21:54:31.233187563 +0200
 @@ -0,0 +1,42 @@
 +NULL =
 +
@@ -488,8 +471,8 @@
 +	$(NULL)
 Index: gdm-2.30.0/gui/Makefile.am
 ===================================================================
---- gdm-2.30.0.orig/gui/Makefile.am	2010-03-29 23:42:03.000000000 +0200
-+++ gdm-2.30.0/gui/Makefile.am	2010-04-14 00:52:54.505740821 +0200
+--- gdm-2.30.0.orig/gui/Makefile.am	2010-04-21 21:54:20.485199141 +0200
++++ gdm-2.30.0/gui/Makefile.am	2010-04-21 21:54:31.233187563 +0200
 @@ -4,4 +4,5 @@ SUBDIRS =			\
  	simple-chooser		\
  	simple-greeter		\
@@ -498,8 +481,8 @@
  	$(NULL)
 Index: gdm-2.30.0/po/POTFILES.in
 ===================================================================
---- gdm-2.30.0.orig/po/POTFILES.in	2010-04-14 00:52:54.469740508 +0200
-+++ gdm-2.30.0/po/POTFILES.in	2010-04-14 00:52:54.505740821 +0200
+--- gdm-2.30.0.orig/po/POTFILES.in	2010-04-21 21:54:20.461194693 +0200
++++ gdm-2.30.0/po/POTFILES.in	2010-04-21 21:54:31.233187563 +0200
 @@ -60,6 +60,9 @@ data/greeter-autostart/gok.desktop.in
  data/greeter-autostart/metacity.desktop.in
  data/greeter-autostart/orca-screen-reader.desktop.in

Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=23945&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series [utf-8] Wed Apr 21 20:14:02 2010
@@ -12,4 +12,5 @@
 12_polkit_settings.patch
 13_gdmsetup.patch
 13_gdmsetup_ui.patch
+13_gdmsetup_desktop.patch
 90_relibtoolize.patch

Modified: desktop/unstable/gdm3/debian/po-up/POTFILES.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/po-up/POTFILES.in?rev=23945&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/po-up/POTFILES.in [utf-8] (original)
+++ desktop/unstable/gdm3/debian/po-up/POTFILES.in [utf-8] Wed Apr 21 20:14:02 2010
@@ -1,3 +1,4 @@
 patches/11_xephyr_nested.patch
 patches/13_gdmsetup.patch
 [type: gettext/glade]patches/13_gdmsetup_ui.patch
+[type: gettext/ini]patches/13_gdmsetup_desktop.patch

Modified: desktop/unstable/gdm3/debian/po-up/fr.po
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/po-up/fr.po?rev=23945&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/po-up/fr.po [utf-8] (original)
+++ desktop/unstable/gdm3/debian/po-up/fr.po [utf-8] Wed Apr 21 20:14:02 2010
@@ -5,8 +5,8 @@
 msgstr ""
 "Project-Id-Version: gdm3 2.30.0-1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 19:44+0200\n"
-"PO-Revision-Date: 2010-04-21 19:44+0200\n"
+"POT-Creation-Date: 2010-04-21 22:03+0200\n"
+"PO-Revision-Date: 2010-04-21 22:05+0200\n"
 "Last-Translator: Josselin Mouette <joss at debian.org>\n"
 "Language-Team: Debian-l10n-French <debian-l10n-french at lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -46,3 +46,11 @@
 #: ../patches/13_gdmsetup_ui.patch.h:5
 msgid "_Show the screen for choosing who will log in"
 msgstr "_Choisir l’utilisateur qui se connecte"
+
+#: ../patches/13_gdmsetup_desktop.patch.h:1
+msgid "Configure login screen behavior"
+msgstr "Configurer le comportement de l’écran de connexion"
+
+#: ../patches/13_gdmsetup_desktop.patch.h:2
+msgid "Login Screen"
+msgstr "Écran de connexion"

Modified: desktop/unstable/gdm3/debian/po-up/patches.pot
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/po-up/patches.pot?rev=23945&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/po-up/patches.pot [utf-8] (original)
+++ desktop/unstable/gdm3/debian/po-up/patches.pot [utf-8] Wed Apr 21 20:14:02 2010
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 19:44+0200\n"
+"POT-Creation-Date: 2010-04-21 22:03+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"
@@ -49,3 +49,11 @@
 #: ../patches/13_gdmsetup_ui.patch.h:5
 msgid "_Show the screen for choosing who will log in"
 msgstr ""
+
+#: ../patches/13_gdmsetup_desktop.patch.h:1
+msgid "Configure login screen behavior"
+msgstr ""
+
+#: ../patches/13_gdmsetup_desktop.patch.h:2
+msgid "Login Screen"
+msgstr ""

More information about the pkg-gnome-commits mailing list