r23785 - in /desktop/experimental/gdm3/debian: ./ patches/ po-up/ po/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue Apr 13 22:13:06 UTC 2010
Author: joss
Date: Tue Apr 13 22:12:59 2010
New Revision: 23785
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23785
Log:
* New German translation of the desktop file by Gert Michael Kulyk.
* Use patch-translations to translate patches that require it.
* Split the .ui file in a separate patch so that the format can be
specified.
* Add French translation for the patches.
* 05_stop_welcome_session.patch: revert one of the changes, not
necessary with gnome-session 2.30.
* Require gnome-session-bin 2.30.
Added:
desktop/experimental/gdm3/debian/patches/13_gdmsetup_ui.patch
desktop/experimental/gdm3/debian/po-up/
desktop/experimental/gdm3/debian/po-up/POTFILES.in
desktop/experimental/gdm3/debian/po-up/fr.po
desktop/experimental/gdm3/debian/po-up/patches.pot
desktop/experimental/gdm3/debian/po/de.po
Modified:
desktop/experimental/gdm3/debian/changelog
desktop/experimental/gdm3/debian/control
desktop/experimental/gdm3/debian/control.in
desktop/experimental/gdm3/debian/patches/05_stop_welcome_session.patch
desktop/experimental/gdm3/debian/patches/11_xephyr_nested.patch
desktop/experimental/gdm3/debian/patches/13_gdmsetup.patch
desktop/experimental/gdm3/debian/patches/series
desktop/experimental/gdm3/debian/po/debian.pot
desktop/experimental/gdm3/debian/po/fr.po
desktop/experimental/gdm3/debian/rules
Modified: desktop/experimental/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/changelog?rev=23785&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog [utf-8] Tue Apr 13 22:12:59 2010
@@ -1,5 +1,6 @@
-gdm3 (2.30.0-1) UNRELEASED; urgency=low
-
+gdm3 (2.30.0-1) experimental; urgency=low
+
+ [ Luca Bruno ]
* New upstream release.
* debian/control.in:
- Added libpolkit-gobject-1-dev and libpolkit-gtk-1-dev build-depends
@@ -21,7 +22,17 @@
* debian/gdmsetup.svg:
- Added, use this icon instead of old gdm-setup.png.
- -- Luca Bruno <lethalman88 at gmail.com> Thu, 01 Apr 2010 21:07:25 +0200
+ [ Josselin Mouette ]
+ * New German translation of the desktop file by Gert Michael Kulyk.
+ * Use patch-translations to translate patches that require it.
+ * Split the .ui file in a separate patch so that the format can be
+ specified.
+ * Add French translation for the patches.
+ * 05_stop_welcome_session.patch: revert one of the changes, not
+ necessary with gnome-session 2.30.
+ * Require gnome-session-bin 2.30.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 14 Apr 2010 00:03:39 +0200
gdm3 (2.29.92-1) experimental; urgency=low
Modified: desktop/experimental/gdm3/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control?rev=23785&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control [utf-8] (original)
+++ desktop/experimental/gdm3/debian/control [utf-8] Tue Apr 13 22:12:59 2010
@@ -8,8 +8,7 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
-Build-Depends: gnome-pkg-tools,
- quilt,
+Build-Depends: gnome-pkg-tools (>= 0.16.3),
debhelper (>= 5),
cdbs,
intltool (>= 0.40.0),
@@ -42,7 +41,7 @@
iso-codes,
libaudit-dev,
xserver-xorg
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Package: gdm3
Architecture: any
@@ -51,7 +50,7 @@
adduser,
libpam-modules (>= 0.72-1),
libpam-runtime (>= 0.76-13.1),
- gnome-session-bin,
+ gnome-session-bin (>= 2.30),
metacity,
policykit-1-gnome,
upower,
Modified: desktop/experimental/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control.in?rev=23785&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control.in [utf-8] (original)
+++ desktop/experimental/gdm3/debian/control.in [utf-8] Tue Apr 13 22:12:59 2010
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: gnome-pkg-tools,
+Build-Depends: gnome-pkg-tools (>= 0.16.3),
debhelper (>= 5),
cdbs,
intltool (>= 0.40.0),
@@ -45,7 +45,7 @@
adduser,
libpam-modules (>= 0.72-1),
libpam-runtime (>= 0.76-13.1),
- gnome-session-bin,
+ gnome-session-bin (>= 2.30),
metacity,
policykit-1-gnome,
upower,
Modified: desktop/experimental/gdm3/debian/patches/05_stop_welcome_session.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/05_stop_welcome_session.patch?rev=23785&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/05_stop_welcome_session.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/05_stop_welcome_session.patch [utf-8] Tue Apr 13 22:12:59 2010
@@ -1,5 +1,7 @@
---- a/daemon/gdm-welcome-session.c
-+++ b/daemon/gdm-welcome-session.c
+Index: gdm-2.30.0/daemon/gdm-welcome-session.c
+===================================================================
+--- gdm-2.30.0.orig/daemon/gdm-welcome-session.c 2010-04-13 23:55:36.713237666 +0200
++++ gdm-2.30.0/daemon/gdm-welcome-session.c 2010-04-14 00:05:56.241737918 +0200
@@ -46,7 +46,7 @@
#include "gdm-welcome-session.h"
@@ -9,17 +11,3 @@
#define MAX_LOGS 5
-@@ -961,10 +961,12 @@
-
- g_debug ("GdmWelcomeSession: Stopping welcome_session");
-
-- res = gdm_signal_pid (welcome_session->priv->pid, SIGTERM);
-+ res = gdm_signal_pid (-welcome_session->priv->pid, SIGKILL);
- if (res < 0) {
- g_warning ("Unable to kill welcome session process");
- } else {
-+ /* wait 200ms */
-+ g_usleep (G_USEC_PER_SEC/10*2);
- welcome_session_died (welcome_session);
- }
-
Modified: desktop/experimental/gdm3/debian/patches/11_xephyr_nested.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/11_xephyr_nested.patch?rev=23785&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/11_xephyr_nested.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/11_xephyr_nested.patch [utf-8] Tue Apr 13 22:12:59 2010
@@ -1,7 +1,9 @@
Debian: add CreateNestedDisplay(parent_display_id) dbus method.
---- a/daemon/gdm-display.c
-+++ b/daemon/gdm-display.c
-@@ -52,6 +52,7 @@
+Index: gdm-2.30.0/daemon/gdm-display.c
+===================================================================
+--- gdm-2.30.0.orig/daemon/gdm-display.c 2010-04-13 23:54:54.333236999 +0200
++++ gdm-2.30.0/daemon/gdm-display.c 2010-04-13 23:54:55.869241009 +0200
+@@ -52,6 +52,7 @@ struct GdmDisplayPrivate
{
char *id;
char *seat_id;
@@ -9,7 +11,7 @@
char *remote_hostname;
int x11_display_number;
-@@ -66,6 +67,7 @@
+@@ -66,6 +67,7 @@ struct GdmDisplayPrivate
GdmDisplayAccessFile *access_file;
gboolean is_local;
@@ -17,7 +19,7 @@
guint finish_idle_id;
GdmSlaveProxy *slave_proxy;
-@@ -78,12 +80,14 @@
+@@ -78,12 +80,14 @@ enum {
PROP_ID,
PROP_STATUS,
PROP_SEAT_ID,
@@ -32,7 +34,7 @@
PROP_SLAVE_COMMAND,
};
-@@ -275,6 +279,33 @@
+@@ -275,6 +279,33 @@ gdm_display_add_user_authorization (GdmD
return ret;
}
@@ -66,7 +68,7 @@
static gboolean
gdm_display_real_set_slave_bus_name (GdmDisplay *display,
const char *name,
-@@ -742,6 +773,24 @@
+@@ -742,6 +773,24 @@ gdm_display_get_id (GdmDisplay *
}
gboolean
@@ -91,7 +93,7 @@
gdm_display_get_x11_display_name (GdmDisplay *display,
char **x11_display,
GError **error)
-@@ -769,6 +818,20 @@
+@@ -769,6 +818,20 @@ gdm_display_is_local (GdmDisplay *displa
return TRUE;
}
@@ -112,7 +114,7 @@
static void
_gdm_display_set_id (GdmDisplay *display,
const char *id)
-@@ -786,6 +849,18 @@
+@@ -786,6 +849,18 @@ _gdm_display_set_seat_id (GdmDisplay
}
static void
@@ -131,7 +133,7 @@
_gdm_display_set_remote_hostname (GdmDisplay *display,
const char *hostname)
{
-@@ -824,6 +899,13 @@
+@@ -824,6 +899,13 @@ _gdm_display_set_is_local (GdmDisplay
}
static void
@@ -145,7 +147,7 @@
_gdm_display_set_slave_command (GdmDisplay *display,
const char *command)
{
-@@ -845,6 +927,9 @@
+@@ -845,6 +927,9 @@ gdm_display_set_property (GObject
case PROP_ID:
_gdm_display_set_id (self, g_value_get_string (value));
break;
@@ -155,7 +157,7 @@
case PROP_STATUS:
_gdm_display_set_status (self, g_value_get_int (value));
break;
-@@ -866,6 +951,9 @@
+@@ -866,6 +951,9 @@ gdm_display_set_property (GObject
case PROP_IS_LOCAL:
_gdm_display_set_is_local (self, g_value_get_boolean (value));
break;
@@ -165,7 +167,7 @@
case PROP_SLAVE_COMMAND:
_gdm_display_set_slave_command (self, g_value_get_string (value));
break;
-@@ -889,6 +977,9 @@
+@@ -889,6 +977,9 @@ gdm_display_get_property (GObject
case PROP_ID:
g_value_set_string (value, self->priv->id);
break;
@@ -175,7 +177,7 @@
case PROP_STATUS:
g_value_set_int (value, self->priv->status);
break;
-@@ -914,6 +1005,9 @@
+@@ -914,6 +1005,9 @@ gdm_display_get_property (GObject
case PROP_IS_LOCAL:
g_value_set_boolean (value, self->priv->is_local);
break;
@@ -185,7 +187,7 @@
case PROP_SLAVE_COMMAND:
g_value_set_string (value, self->priv->slave_command);
break;
-@@ -979,6 +1073,11 @@
+@@ -979,6 +1073,11 @@ gdm_display_dispose (GObject *object)
g_debug ("GdmDisplay: Disposing display");
@@ -197,7 +199,7 @@
if (display->priv->finish_idle_id > 0) {
g_source_remove (display->priv->finish_idle_id);
display->priv->finish_idle_id = 0;
-@@ -1032,6 +1131,15 @@
+@@ -1032,6 +1131,15 @@ gdm_display_class_init (GdmDisplayClass
"id",
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
@@ -213,7 +215,7 @@
g_object_class_install_property (object_class,
PROP_REMOTE_HOSTNAME,
g_param_spec_string ("remote-hostname",
-@@ -1086,6 +1194,14 @@
+@@ -1086,6 +1194,14 @@ gdm_display_class_init (GdmDisplayClass
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class,
@@ -228,7 +230,7 @@
PROP_SLAVE_COMMAND,
g_param_spec_string ("slave-command",
"slave command",
-@@ -1137,6 +1253,10 @@
+@@ -1137,6 +1253,10 @@ gdm_display_finalize (GObject *object)
g_free (display->priv->x11_cookie);
g_free (display->priv->slave_command);
@@ -239,9 +241,11 @@
if (display->priv->access_file != NULL) {
g_object_unref (display->priv->access_file);
}
---- a/daemon/gdm-display.h
-+++ b/daemon/gdm-display.h
-@@ -102,6 +102,9 @@
+Index: gdm-2.30.0/daemon/gdm-display.h
+===================================================================
+--- gdm-2.30.0.orig/daemon/gdm-display.h 2010-04-13 23:54:54.317236641 +0200
++++ gdm-2.30.0/daemon/gdm-display.h 2010-04-13 23:54:55.869241009 +0200
+@@ -102,6 +102,9 @@ gboolean gdm_display_unmanage
gboolean gdm_display_get_id (GdmDisplay *display,
char **id,
GError **error);
@@ -251,7 +255,7 @@
gboolean gdm_display_get_remote_hostname (GdmDisplay *display,
char **hostname,
GError **error);
-@@ -117,6 +120,9 @@
+@@ -117,6 +120,9 @@ gboolean gdm_display_get_seat
gboolean gdm_display_is_local (GdmDisplay *display,
gboolean *local,
GError **error);
@@ -261,7 +265,7 @@
gboolean gdm_display_get_timed_login_details (GdmDisplay *display,
gboolean *enabled,
char **username,
-@@ -137,6 +143,10 @@
+@@ -137,6 +143,10 @@ gboolean gdm_display_add_user
gboolean gdm_display_remove_user_authorization (GdmDisplay *display,
const char *username,
GError **error);
@@ -272,8 +276,10 @@
gboolean gdm_display_set_slave_bus_name (GdmDisplay *display,
const char *name,
GError **error);
---- a/daemon/gdm-local-display-factory.c
-+++ b/daemon/gdm-local-display-factory.c
+Index: gdm-2.30.0/daemon/gdm-local-display-factory.c
+===================================================================
+--- gdm-2.30.0.orig/daemon/gdm-local-display-factory.c 2010-04-13 23:54:54.309237440 +0200
++++ gdm-2.30.0/daemon/gdm-local-display-factory.c 2010-04-13 23:54:55.869241009 +0200
@@ -22,6 +22,8 @@
#include <stdlib.h>
@@ -283,7 +289,7 @@
#include <glib.h>
#include <glib/gi18n.h>
-@@ -274,6 +276,131 @@
+@@ -274,6 +276,131 @@ gdm_local_display_factory_create_product
return ret;
}
@@ -415,9 +421,11 @@
static void
on_static_display_status_changed (GdmDisplay *display,
---- a/daemon/gdm-local-display-factory.h
-+++ b/daemon/gdm-local-display-factory.h
-@@ -65,6 +65,10 @@
+Index: gdm-2.30.0/daemon/gdm-local-display-factory.h
+===================================================================
+--- gdm-2.30.0.orig/daemon/gdm-local-display-factory.h 2010-04-13 23:54:54.297235705 +0200
++++ gdm-2.30.0/daemon/gdm-local-display-factory.h 2010-04-13 23:54:55.869241009 +0200
+@@ -65,6 +65,10 @@ gboolean gdm_local_dis
char **id,
GError **error);
@@ -428,8 +436,10 @@
gboolean gdm_local_display_factory_create_product_display (GdmLocalDisplayFactory *factory,
const char *parent_display_id,
const char *relay_address,
---- a/daemon/gdm-local-display-factory.xml
-+++ b/daemon/gdm-local-display-factory.xml
+Index: gdm-2.30.0/daemon/gdm-local-display-factory.xml
+===================================================================
+--- gdm-2.30.0.orig/daemon/gdm-local-display-factory.xml 2010-04-13 23:54:54.285240325 +0200
++++ gdm-2.30.0/daemon/gdm-local-display-factory.xml 2010-04-13 23:54:55.869241009 +0200
@@ -9,5 +9,10 @@
<method name="CreateTransientDisplay">
<arg name="id" direction="out" type="o"/>
@@ -441,9 +451,11 @@
+ </method>
</interface>
</node>
---- a/daemon/gdm-simple-slave.c
-+++ b/daemon/gdm-simple-slave.c
-@@ -1043,6 +1043,9 @@
+Index: gdm-2.30.0/daemon/gdm-simple-slave.c
+===================================================================
+--- gdm-2.30.0.orig/daemon/gdm-simple-slave.c 2010-04-13 23:54:54.261239786 +0200
++++ gdm-2.30.0/daemon/gdm-simple-slave.c 2010-04-13 23:54:55.869241009 +0200
+@@ -1043,6 +1043,9 @@ static gboolean
idle_connect_to_display (GdmSimpleSlave *slave)
{
gboolean res;
@@ -453,7 +465,7 @@
slave->priv->connection_attempts++;
-@@ -1053,7 +1056,8 @@
+@@ -1053,7 +1056,8 @@ idle_connect_to_display (GdmSimpleSlave
/* FIXME: handle wait-for-go */
@@ -463,7 +475,7 @@
delay = 0;
enabled = FALSE;
-@@ -1109,12 +1113,20 @@
+@@ -1109,12 +1113,20 @@ gdm_simple_slave_run (GdmSimpleSlave *sl
{
char *display_name;
char *auth_file;
@@ -484,7 +496,7 @@
NULL);
/* if this is local display start a server if one doesn't
-@@ -1133,6 +1145,16 @@
+@@ -1133,6 +1145,16 @@ gdm_simple_slave_run (GdmSimpleSlave *sl
NULL);
}
@@ -501,9 +513,11 @@
g_signal_connect (slave->priv->server,
"exited",
G_CALLBACK (on_server_exited),
---- a/daemon/gdm-slave.c
-+++ b/daemon/gdm-slave.c
-@@ -78,31 +78,41 @@
+Index: gdm-2.30.0/daemon/gdm-slave.c
+===================================================================
+--- gdm-2.30.0.orig/daemon/gdm-slave.c 2010-04-13 23:54:54.233239647 +0200
++++ gdm-2.30.0/daemon/gdm-slave.c 2010-04-13 23:54:55.873241587 +0200
+@@ -78,31 +78,41 @@ struct GdmSlavePrivate
/* cached display values */
char *display_id;
@@ -548,7 +562,7 @@
};
enum {
-@@ -378,6 +388,10 @@
+@@ -378,6 +388,10 @@ gdm_slave_connect_to_x11_display (GdmSla
g_debug ("GdmSlave: Server is ready - opening display %s", slave->priv->display_name);
@@ -559,7 +573,7 @@
g_setenv ("DISPLAY", slave->priv->display_name, TRUE);
g_setenv ("XAUTHORITY", slave->priv->display_x11_authority_file, TRUE);
-@@ -446,6 +460,15 @@
+@@ -446,6 +460,15 @@ display_proxy_destroyed_cb (DBusGProxy *
slave->priv->display_proxy = NULL;
}
@@ -575,7 +589,7 @@
static gboolean
gdm_slave_set_slave_bus_name (GdmSlave *slave)
{
-@@ -480,11 +503,13 @@
+@@ -480,11 +503,13 @@ gdm_slave_real_start (GdmSlave *slave)
{
gboolean res;
char *id;
@@ -589,7 +603,7 @@
g_debug ("GdmSlave: Creating proxy for %s", slave->priv->display_id);
error = NULL;
-@@ -539,6 +564,134 @@
+@@ -539,6 +564,134 @@ gdm_slave_real_start (GdmSlave *slave)
/* cache some values up front */
error = NULL;
res = dbus_g_proxy_call (slave->priv->display_proxy,
@@ -724,7 +738,7 @@
"IsLocal",
&error,
G_TYPE_INVALID,
-@@ -1284,6 +1437,14 @@
+@@ -1284,6 +1437,14 @@ _gdm_slave_set_display_id (GdmSlave *s
}
static void
@@ -739,7 +753,7 @@
_gdm_slave_set_display_name (GdmSlave *slave,
const char *name)
{
-@@ -1330,6 +1491,37 @@
+@@ -1330,6 +1491,37 @@ _gdm_slave_set_display_is_local (GdmSlav
}
static void
@@ -777,7 +791,7 @@
gdm_slave_set_property (GObject *object,
guint prop_id,
const GValue *value,
-@@ -1343,6 +1535,9 @@
+@@ -1343,6 +1535,9 @@ gdm_slave_set_property (GObject *ob
case PROP_DISPLAY_ID:
_gdm_slave_set_display_id (self, g_value_get_string (value));
break;
@@ -787,7 +801,7 @@
case PROP_DISPLAY_NAME:
_gdm_slave_set_display_name (self, g_value_get_string (value));
break;
-@@ -1361,6 +1556,18 @@
+@@ -1361,6 +1556,18 @@ gdm_slave_set_property (GObject *ob
case PROP_DISPLAY_IS_LOCAL:
_gdm_slave_set_display_is_local (self, g_value_get_boolean (value));
break;
@@ -806,7 +820,7 @@
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
-@@ -1381,6 +1588,9 @@
+@@ -1381,6 +1588,9 @@ gdm_slave_get_property (GObject *obje
case PROP_DISPLAY_ID:
g_value_set_string (value, self->priv->display_id);
break;
@@ -816,7 +830,7 @@
case PROP_DISPLAY_NAME:
g_value_set_string (value, self->priv->display_name);
break;
-@@ -1399,6 +1609,18 @@
+@@ -1399,6 +1609,18 @@ gdm_slave_get_property (GObject *obje
case PROP_DISPLAY_IS_LOCAL:
g_value_set_boolean (value, self->priv->display_is_local);
break;
@@ -835,7 +849,7 @@
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
-@@ -1480,6 +1702,13 @@
+@@ -1480,6 +1702,13 @@ gdm_slave_class_init (GdmSlaveClass *kla
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (object_class,
@@ -849,7 +863,7 @@
PROP_DISPLAY_NAME,
g_param_spec_string ("display-name",
"display name",
-@@ -1523,6 +1752,34 @@
+@@ -1523,6 +1752,34 @@ gdm_slave_class_init (GdmSlaveClass *kla
"display is local",
TRUE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
@@ -884,7 +898,7 @@
signals [STOPPED] =
g_signal_new ("stopped",
-@@ -1568,7 +1825,7 @@
+@@ -1568,7 +1825,7 @@ gdm_slave_finalize (GObject *object)
g_free (slave->priv->display_seat_id);
g_free (slave->priv->display_x11_authority_file);
g_free (slave->priv->parent_display_name);
@@ -893,8 +907,10 @@
g_array_free (slave->priv->display_x11_cookie, TRUE);
G_OBJECT_CLASS (gdm_slave_parent_class)->finalize (object);
---- a/daemon/gdm-display.xml
-+++ b/daemon/gdm-display.xml
+Index: gdm-2.30.0/daemon/gdm-display.xml
+===================================================================
+--- gdm-2.30.0.orig/daemon/gdm-display.xml 2010-04-13 23:54:54.209242529 +0200
++++ gdm-2.30.0/daemon/gdm-display.xml 2010-04-13 23:54:55.873241587 +0200
@@ -4,6 +4,9 @@
<method name="GetId">
<arg name="id" direction="out" type="o"/>
@@ -926,8 +942,10 @@
<method name="SetSlaveBusName">
<arg name="name" direction="in" type="s"/>
</method>
---- a/data/gdm.conf.in
-+++ b/data/gdm.conf.in
+Index: gdm-2.30.0/data/gdm.conf.in
+===================================================================
+--- gdm-2.30.0.orig/data/gdm.conf.in 2010-04-13 23:54:54.157241855 +0200
++++ gdm-2.30.0/data/gdm.conf.in 2010-04-13 23:54:55.873241587 +0200
@@ -62,10 +62,16 @@
<allow send_destination="org.gnome.DisplayManager"
send_interface="org.gnome.DisplayManager.Display"
@@ -945,9 +963,11 @@
<allow send_destination="org.gnome.DisplayManager"
send_interface="org.gnome.DisplayManager.Manager"
---- a/daemon/gdm-server.c
-+++ b/daemon/gdm-server.c
-@@ -76,11 +76,13 @@
+Index: gdm-2.30.0/daemon/gdm-server.c
+===================================================================
+--- gdm-2.30.0.orig/daemon/gdm-server.c 2010-04-13 23:54:54.185246881 +0200
++++ gdm-2.30.0/daemon/gdm-server.c 2010-04-13 23:54:55.873241587 +0200
+@@ -79,11 +79,13 @@ struct GdmServerPrivate
char *auth_file;
gboolean is_parented;
@@ -961,7 +981,7 @@
};
enum {
-@@ -89,6 +91,7 @@
+@@ -92,6 +94,7 @@ enum {
PROP_DISPLAY_DEVICE,
PROP_AUTH_FILE,
PROP_IS_PARENTED,
@@ -969,7 +989,7 @@
PROP_PARENT_DISPLAY_NAME,
PROP_PARENT_AUTH_FILE,
PROP_CHOSEN_HOSTNAME,
-@@ -166,9 +169,12 @@
+@@ -169,9 +172,12 @@ gdm_server_get_display_device (GdmServer
static gboolean
emit_ready_idle (GdmServer *server)
{
@@ -984,7 +1004,7 @@
return FALSE;
}
-@@ -654,7 +660,13 @@
+@@ -657,7 +663,13 @@ gdm_server_spawn (GdmServer *server,
g_ptr_array_foreach (env, (GFunc)g_free, NULL);
g_ptr_array_free (env, TRUE);
@@ -999,7 +1019,7 @@
server->priv->child_watch_id = g_child_watch_add (server->priv->pid,
(GChildWatchFunc)server_child_watch,
-@@ -759,6 +771,41 @@
+@@ -947,6 +959,41 @@ _gdm_server_set_user_name (GdmServer *s
}
static void
@@ -1041,7 +1061,7 @@
_gdm_server_set_disable_tcp (GdmServer *server,
gboolean disabled)
{
-@@ -785,9 +832,21 @@
+@@ -973,9 +1020,21 @@ gdm_server_set_property (GObject *o
case PROP_USER_NAME:
_gdm_server_set_user_name (self, g_value_get_string (value));
break;
@@ -1063,7 +1083,7 @@
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
-@@ -818,9 +877,21 @@
+@@ -1006,9 +1065,21 @@ gdm_server_get_property (GObject *obj
case PROP_USER_NAME:
g_value_set_string (value, self->priv->user_name);
break;
@@ -1085,7 +1105,7 @@
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
-@@ -921,6 +992,34 @@
+@@ -1109,6 +1180,34 @@ gdm_server_class_init (GdmServerClass *k
NULL,
TRUE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
@@ -1120,7 +1140,7 @@
}
-@@ -933,6 +1032,7 @@
+@@ -1121,6 +1220,7 @@ gdm_server_init (GdmServer *server)
server->priv->pid = -1;
server->priv->command = g_strdup (X_SERVER " -br -verbose");
server->priv->log_dir = g_strdup (LOGDIR);
@@ -1128,8 +1148,10 @@
add_ready_handler (server);
}
---- a/utils/gdmflexiserver.c
-+++ b/utils/gdmflexiserver.c
+Index: gdm-2.30.0/utils/gdmflexiserver.c
+===================================================================
+--- gdm-2.30.0.orig/utils/gdmflexiserver.c 2010-04-13 23:54:54.129241228 +0200
++++ gdm-2.30.0/utils/gdmflexiserver.c 2010-04-13 23:54:55.873241587 +0200
@@ -34,6 +34,9 @@
#include <dbus/dbus-glib-lowlevel.h>
@@ -1140,7 +1162,7 @@
#define GDM_DBUS_LOCAL_DISPLAY_FACTORY_PATH "/org/gnome/DisplayManager/LocalDisplayFactory"
#define GDM_DBUS_LOCAL_DISPLAY_FACTORY_INTERFACE "org.gnome.DisplayManager.LocalDisplayFactory"
-@@ -59,7 +62,7 @@
+@@ -59,7 +62,7 @@ static char **args_remaining = NU
/* Keep all config options for compatibility even if they are noops */
GOptionEntry options [] = {
{ "command", 'c', 0, G_OPTION_ARG_STRING, &send_command, N_("Only the VERSION command is supported"), N_("COMMAND") },
@@ -1149,7 +1171,7 @@
{ "no-lock", 'l', 0, G_OPTION_ARG_NONE, &no_lock, N_("Ignored - retained for compatibility"), NULL },
{ "debug", 'd', 0, G_OPTION_ARG_NONE, &debug_in, N_("Debugging output"), NULL },
{ "authenticate", 'a', 0, G_OPTION_ARG_NONE, &authenticate, N_("Ignored - retained for compatibility"), NULL },
-@@ -548,6 +551,216 @@
+@@ -548,6 +551,216 @@ oom:
}
static char **
@@ -1366,7 +1388,7 @@
seat_get_sessions (DBusConnection *connection,
const char *seat_id)
{
-@@ -666,6 +879,10 @@
+@@ -666,6 +879,10 @@ goto_login_session (GError **error)
return FALSE;
}
@@ -1377,7 +1399,7 @@
/* First look for any existing LoginWindow sessions on the seat.
If none are found, create a new one. */
-@@ -742,11 +959,6 @@
+@@ -742,11 +959,6 @@ main (int argc, char *argv[])
}
Modified: desktop/experimental/gdm3/debian/patches/13_gdmsetup.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/13_gdmsetup.patch?rev=23785&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/13_gdmsetup.patch [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/13_gdmsetup.patch [utf-8] Tue Apr 13 22:12:59 2010
@@ -12,9 +12,11 @@
# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gdm/+bug/395299
# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=587750
#
---- a/configure.ac
-+++ b/configure.ac
-@@ -41,6 +41,7 @@
+Index: gdm-2.30.0/configure.ac
+===================================================================
+--- gdm-2.30.0.orig/configure.ac 2010-04-13 23:55:12.673240111 +0200
++++ gdm-2.30.0/configure.ac 2010-04-13 23:55:13.389737672 +0200
+@@ -41,6 +41,7 @@ dnl ------------------------------------
DBUS_GLIB_REQUIRED_VERSION=0.74
POLKIT_GOBJECT_REQUIRED_VERSION=0.92
@@ -22,7 +24,7 @@
GLIB_REQUIRED_VERSION=2.22.0
GTK_REQUIRED_VERSION=2.12.0
PANGO_REQUIRED_VERSION=1.3.0
-@@ -118,6 +119,14 @@
+@@ -118,6 +119,14 @@ AC_SUBST(HAVE_DEVICEKIT_POWER)
AC_SUBST(DEVKIT_POWER_CFLAGS)
AC_SUBST(DEVKIT_POWER_LIBS)
@@ -37,7 +39,7 @@
PKG_CHECK_MODULES(SIMPLE_GREETER,
dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gtk+-2.0 >= $GTK_REQUIRED_VERSION
-@@ -1389,6 +1398,7 @@
+@@ -1389,6 +1398,7 @@ Makefile
daemon/Makefile
docs/Makefile
gui/Makefile
@@ -45,8 +47,10 @@
gui/simple-greeter/Makefile
gui/simple-greeter/libnotificationarea/Makefile
gui/simple-chooser/Makefile
---- /dev/null
-+++ b/gui/gdmsetup/gdmsetup.c
+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-13 23:55:13.389737672 +0200
@@ -0,0 +1,370 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
@@ -418,8 +422,10 @@
+
+ return 0;
+}
---- /dev/null
-+++ b/gui/gdmsetup/gdmsetup.desktop.in
+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-13 23:55:13.389737672 +0200
@@ -0,0 +1,12 @@
+[Desktop Entry]
+_Name=Login Screen
@@ -433,282 +439,10 @@
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gdm
+X-GNOME-Bugzilla-Component=general
---- /dev/null
-+++ b/gui/gdmsetup/gdmsetup.ui
-@@ -0,0 +1,271 @@
-+<?xml version="1.0"?>
-+<interface>
-+ <requires lib="gtk+" version="2.16"/>
-+ <!-- interface-naming-policy project-wide -->
-+ <object class="GtkListStore" id="login_user_model">
-+ <columns>
-+ <!-- column-name label -->
-+ <column type="gchararray"/>
-+ <!-- column-name user -->
-+ <column type="gchararray"/>
-+ <!-- column-name icon -->
-+ <column type="GdkPixbuf"/>
-+ </columns>
-+ </object>
-+ <object class="GtkDialog" id="gdm_capplet">
-+ <property name="border_width">5</property>
-+ <property name="title" translatable="yes" comments="Title of login screen settings dialog">Login Screen Settings</property>
-+ <property name="resizable">False</property>
-+ <property name="window_position">center</property>
-+ <property name="icon_name">gdm-setup</property>
-+ <property name="type_hint">normal</property>
-+ <property name="has_separator">False</property>
-+ <signal name="response" handler="gdm_capplet_response_cb"/>
-+ <child internal-child="vbox">
-+ <object class="GtkVBox" id="dialog-vbox1">
-+ <property name="visible">True</property>
-+ <property name="orientation">vertical</property>
-+ <property name="spacing">12</property>
-+ <child>
-+ <object class="GtkFrame" id="frame2">
-+ <property name="visible">True</property>
-+ <property name="label_xalign">0</property>
-+ <property name="shadow_type">none</property>
-+ <child>
-+ <object class="GtkAlignment" id="alignment2">
-+ <property name="visible">True</property>
-+ <property name="left_padding">12</property>
-+ <child>
-+ <object class="GtkVBox" id="gdm_capplet_vbox">
-+ <property name="visible">True</property>
-+ <property name="orientation">vertical</property>
-+ <property name="spacing">12</property>
-+ <child>
-+ <object class="GtkVBox" id="vbox3">
-+ <property name="visible">True</property>
-+ <property name="orientation">vertical</property>
-+ <property name="spacing">12</property>
-+ <child>
-+ <object class="GtkVBox" id="vbox1">
-+ <property name="visible">True</property>
-+ <property name="orientation">vertical</property>
-+ <property name="spacing">6</property>
-+ <child>
-+ <object class="GtkRadioButton" id="manual_login_radio">
-+ <property name="label" translatable="yes" comments="Radio option to set login screen to prompt for user">_Show the screen for choosing who will log in</property>
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="receives_default">False</property>
-+ <property name="use_underline">True</property>
-+ <property name="active">True</property>
-+ <property name="draw_indicator">True</property>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="position">0</property>
-+ </packing>
-+ </child>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="position">2</property>
-+ </packing>
-+ </child>
-+ <child>
-+ <object class="GtkVBox" id="vbox4">
-+ <property name="visible">True</property>
-+ <property name="orientation">vertical</property>
-+ <property name="spacing">6</property>
-+ <child>
-+ <object class="GtkHBox" id="hbox1">
-+ <property name="visible">True</property>
-+ <property name="spacing">6</property>
-+ <child>
-+ <object class="GtkRadioButton" id="automatic_login_radio">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="receives_default">False</property>
-+ <property name="draw_indicator">True</property>
-+ <property name="group">manual_login_radio</property>
-+ <signal name="toggled" handler="automatic_login_toggle_cb"/>
-+ <child>
-+ <object class="GtkLabel" id="user_prefix_label">
-+ <property name="visible">True</property>
-+ <property name="label">_Log in as</property>
-+ <property name="use_underline">True</property>
-+ </object>
-+ </child>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="position">0</property>
-+ </packing>
-+ </child>
-+ <child>
-+ <object class="GtkComboBox" id="default_user_combo_box">
-+ <property name="visible">True</property>
-+ <property name="sensitive">False</property>
-+ <property name="model">login_user_model</property>
-+ <signal name="changed" handler="default_user_combo_box_changed_cb"/>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="position">1</property>
-+ </packing>
-+ </child>
-+ <child>
-+ <object class="GtkEntry" id="default_user_entry">
-+ <property name="visible">True</property>
-+ <property name="sensitive">False</property>
-+ <property name="can_focus">True</property>
-+ <property name="invisible_char">•</property>
-+ <signal name="changed" handler="apply_config_cb"/>
-+ </object>
-+ <packing>
-+ <property name="position">2</property>
-+ </packing>
-+ </child>
-+ <child>
-+ <object class="GtkLabel" id="user_suffix_label">
-+ <property name="visible">True</property>
-+ <property name="label">automatically</property>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="position">3</property>
-+ </packing>
-+ </child>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="position">0</property>
-+ </packing>
-+ </child>
-+ <child>
-+ <object class="GtkAlignment" id="alignment1">
-+ <property name="visible">True</property>
-+ <property name="left_padding">16</property>
-+ <child>
-+ <object class="GtkHBox" id="login_delay_box">
-+ <property name="visible">True</property>
-+ <property name="sensitive">False</property>
-+ <property name="spacing">6</property>
-+ <child>
-+ <object class="GtkCheckButton" id="login_delay_check">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="receives_default">False</property>
-+ <property name="draw_indicator">True</property>
-+ <signal name="toggled" handler="login_delay_check_toggled_cb"/>
-+ <child>
-+ <object class="GtkLabel" id="delay_prefix_label">
-+ <property name="visible">True</property>
-+ <property name="label">_Allow</property>
-+ <property name="use_underline">True</property>
-+ </object>
-+ </child>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="position">0</property>
-+ </packing>
-+ </child>
-+ <child>
-+ <object class="GtkSpinButton" id="login_delay_spin">
-+ <property name="visible">True</property>
-+ <property name="sensitive">False</property>
-+ <property name="can_focus">True</property>
-+ <property name="invisible_char">•</property>
-+ <property name="adjustment">adjustment1</property>
-+ <signal name="value_changed" handler="apply_config_cb"/>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="position">1</property>
-+ </packing>
-+ </child>
-+ <child>
-+ <object class="GtkLabel" id="delay_suffix_label">
-+ <property name="visible">True</property>
-+ <property name="label">seconds for anyone else to log in first</property>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="position">2</property>
-+ </packing>
-+ </child>
-+ </object>
-+ </child>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="position">1</property>
-+ </packing>
-+ </child>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="position">3</property>
-+ </packing>
-+ </child>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="position">0</property>
-+ </packing>
-+ </child>
-+ </object>
-+ </child>
-+ </object>
-+ </child>
-+ <child type="label">
-+ <object class="GtkLabel" id="label2">
-+ <property name="visible">True</property>
-+ <property name="label" translatable="yes"><b>When the computer starts up</b></property>
-+ <property name="use_markup">True</property>
-+ </object>
-+ </child>
-+ </object>
-+ <packing>
-+ <property name="position">1</property>
-+ </packing>
-+ </child>
-+ <child internal-child="action_area">
-+ <object class="GtkHButtonBox" id="dialog-action_area1">
-+ <property name="visible">True</property>
-+ <property name="layout_style">end</property>
-+ <child>
-+ <object class="GtkButton" id="close_button">
-+ <property name="label">gtk-close</property>
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="receives_default">True</property>
-+ <property name="use_stock">True</property>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="fill">False</property>
-+ <property name="position">0</property>
-+ </packing>
-+ </child>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="pack_type">end</property>
-+ <property name="position">0</property>
-+ </packing>
-+ </child>
-+ </object>
-+ </child>
-+ <action-widgets>
-+ <action-widget response="-7">close_button</action-widget>
-+ </action-widgets>
-+ </object>
-+ <object class="GtkSizeGroup" id="combo_size_group"/>
-+ <object class="GtkSizeGroup" id="radio_size_group"/>
-+ <object class="GtkAdjustment" id="adjustment1">
-+ <property name="lower">1</property>
-+ <property name="upper">600</property>
-+ <property name="step_increment">1</property>
-+ </object>
-+</interface>
---- /dev/null
-+++ b/gui/gdmsetup/Makefile.am
+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-13 23:55:13.389737672 +0200
@@ -0,0 +1,42 @@
+NULL =
+
@@ -752,17 +486,21 @@
+ $(ui_DATA) \
+ $(System_in_files) \
+ $(NULL)
---- a/gui/Makefile.am
-+++ b/gui/Makefile.am
-@@ -4,4 +4,5 @@
+Index: gdm-2.30.0/gui/Makefile.am
+===================================================================
+--- gdm-2.30.0.orig/gui/Makefile.am 2010-04-13 23:54:51.793250131 +0200
++++ gdm-2.30.0/gui/Makefile.am 2010-04-13 23:55:13.389737672 +0200
+@@ -4,4 +4,5 @@ SUBDIRS = \
simple-chooser \
simple-greeter \
user-switch-applet \
+ gdmsetup \
$(NULL)
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -60,6 +60,9 @@
+Index: gdm-2.30.0/po/POTFILES.in
+===================================================================
+--- gdm-2.30.0.orig/po/POTFILES.in 2010-04-13 23:55:12.673240111 +0200
++++ gdm-2.30.0/po/POTFILES.in 2010-04-13 23:55:13.389737672 +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
data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in
Added: desktop/experimental/gdm3/debian/patches/13_gdmsetup_ui.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/13_gdmsetup_ui.patch?rev=23785&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/patches/13_gdmsetup_ui.patch (added)
+++ desktop/experimental/gdm3/debian/patches/13_gdmsetup_ui.patch [utf-8] Tue Apr 13 22:12:59 2010
@@ -1,0 +1,276 @@
+Index: gdm-2.30.0/gui/gdmsetup/gdmsetup.ui
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gdm-2.30.0/gui/gdmsetup/gdmsetup.ui 2010-04-13 23:37:41.000000000 +0200
+@@ -0,0 +1,271 @@
++<?xml version="1.0"?>
++<interface>
++ <requires lib="gtk+" version="2.16"/>
++ <!-- interface-naming-policy project-wide -->
++ <object class="GtkListStore" id="login_user_model">
++ <columns>
++ <!-- column-name label -->
++ <column type="gchararray"/>
++ <!-- column-name user -->
++ <column type="gchararray"/>
++ <!-- column-name icon -->
++ <column type="GdkPixbuf"/>
++ </columns>
++ </object>
++ <object class="GtkDialog" id="gdm_capplet">
++ <property name="border_width">5</property>
++ <property name="title" translatable="yes" comments="Title of login screen settings dialog">Login Screen Settings</property>
++ <property name="resizable">False</property>
++ <property name="window_position">center</property>
++ <property name="icon_name">gdm-setup</property>
++ <property name="type_hint">normal</property>
++ <property name="has_separator">False</property>
++ <signal name="response" handler="gdm_capplet_response_cb"/>
++ <child internal-child="vbox">
++ <object class="GtkVBox" id="dialog-vbox1">
++ <property name="visible">True</property>
++ <property name="orientation">vertical</property>
++ <property name="spacing">12</property>
++ <child>
++ <object class="GtkFrame" id="frame2">
++ <property name="visible">True</property>
++ <property name="label_xalign">0</property>
++ <property name="shadow_type">none</property>
++ <child>
++ <object class="GtkAlignment" id="alignment2">
++ <property name="visible">True</property>
++ <property name="left_padding">12</property>
++ <child>
++ <object class="GtkVBox" id="gdm_capplet_vbox">
++ <property name="visible">True</property>
++ <property name="orientation">vertical</property>
++ <property name="spacing">12</property>
++ <child>
++ <object class="GtkVBox" id="vbox3">
++ <property name="visible">True</property>
++ <property name="orientation">vertical</property>
++ <property name="spacing">12</property>
++ <child>
++ <object class="GtkVBox" id="vbox1">
++ <property name="visible">True</property>
++ <property name="orientation">vertical</property>
++ <property name="spacing">6</property>
++ <child>
++ <object class="GtkRadioButton" id="manual_login_radio">
++ <property name="label" translatable="yes" comments="Radio option to set login screen to prompt for user">_Show the screen for choosing who will log in</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">False</property>
++ <property name="use_underline">True</property>
++ <property name="active">True</property>
++ <property name="draw_indicator">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">2</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkVBox" id="vbox4">
++ <property name="visible">True</property>
++ <property name="orientation">vertical</property>
++ <property name="spacing">6</property>
++ <child>
++ <object class="GtkHBox" id="hbox1">
++ <property name="visible">True</property>
++ <property name="spacing">6</property>
++ <child>
++ <object class="GtkRadioButton" id="automatic_login_radio">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">False</property>
++ <property name="draw_indicator">True</property>
++ <property name="group">manual_login_radio</property>
++ <signal name="toggled" handler="automatic_login_toggle_cb"/>
++ <child>
++ <object class="GtkLabel" id="user_prefix_label">
++ <property name="visible">True</property>
++ <property name="label">_Log in as</property>
++ <property name="use_underline">True</property>
++ </object>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkComboBox" id="default_user_combo_box">
++ <property name="visible">True</property>
++ <property name="sensitive">False</property>
++ <property name="model">login_user_model</property>
++ <signal name="changed" handler="default_user_combo_box_changed_cb"/>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkEntry" id="default_user_entry">
++ <property name="visible">True</property>
++ <property name="sensitive">False</property>
++ <property name="can_focus">True</property>
++ <property name="invisible_char">•</property>
++ <signal name="changed" handler="apply_config_cb"/>
++ </object>
++ <packing>
++ <property name="position">2</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkLabel" id="user_suffix_label">
++ <property name="visible">True</property>
++ <property name="label">automatically</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">3</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkAlignment" id="alignment1">
++ <property name="visible">True</property>
++ <property name="left_padding">16</property>
++ <child>
++ <object class="GtkHBox" id="login_delay_box">
++ <property name="visible">True</property>
++ <property name="sensitive">False</property>
++ <property name="spacing">6</property>
++ <child>
++ <object class="GtkCheckButton" id="login_delay_check">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">False</property>
++ <property name="draw_indicator">True</property>
++ <signal name="toggled" handler="login_delay_check_toggled_cb"/>
++ <child>
++ <object class="GtkLabel" id="delay_prefix_label">
++ <property name="visible">True</property>
++ <property name="label">_Allow</property>
++ <property name="use_underline">True</property>
++ </object>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkSpinButton" id="login_delay_spin">
++ <property name="visible">True</property>
++ <property name="sensitive">False</property>
++ <property name="can_focus">True</property>
++ <property name="invisible_char">•</property>
++ <property name="adjustment">adjustment1</property>
++ <signal name="value_changed" handler="apply_config_cb"/>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkLabel" id="delay_suffix_label">
++ <property name="visible">True</property>
++ <property name="label">seconds for anyone else to log in first</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">2</property>
++ </packing>
++ </child>
++ </object>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">3</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ </object>
++ </child>
++ </object>
++ </child>
++ <child type="label">
++ <object class="GtkLabel" id="label2">
++ <property name="visible">True</property>
++ <property name="label" translatable="yes"><b>When the computer starts up</b></property>
++ <property name="use_markup">True</property>
++ </object>
++ </child>
++ </object>
++ <packing>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ <child internal-child="action_area">
++ <object class="GtkHButtonBox" id="dialog-action_area1">
++ <property name="visible">True</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton" id="close_button">
++ <property name="label">gtk-close</property>
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="receives_default">True</property>
++ <property name="use_stock">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="pack_type">end</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ </object>
++ </child>
++ <action-widgets>
++ <action-widget response="-7">close_button</action-widget>
++ </action-widgets>
++ </object>
++ <object class="GtkSizeGroup" id="combo_size_group"/>
++ <object class="GtkSizeGroup" id="radio_size_group"/>
++ <object class="GtkAdjustment" id="adjustment1">
++ <property name="lower">1</property>
++ <property name="upper">600</property>
++ <property name="step_increment">1</property>
++ </object>
++</interface>
Modified: desktop/experimental/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/patches/series?rev=23785&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gdm3/debian/patches/series [utf-8] Tue Apr 13 22:12:59 2010
@@ -11,4 +11,5 @@
11_xephyr_nested.patch
12_polkit_settings.patch
13_gdmsetup.patch
+13_gdmsetup_ui.patch
90_relibtoolize.patch
Added: desktop/experimental/gdm3/debian/po-up/POTFILES.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/po-up/POTFILES.in?rev=23785&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/po-up/POTFILES.in (added)
+++ desktop/experimental/gdm3/debian/po-up/POTFILES.in [utf-8] Tue Apr 13 22:12:59 2010
@@ -1,0 +1,3 @@
+patches/11_xephyr_nested.patch
+patches/13_gdmsetup.patch
+[type: gettext/glade]patches/13_gdmsetup_ui.patch
Added: desktop/experimental/gdm3/debian/po-up/fr.po
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/po-up/fr.po?rev=23785&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/po-up/fr.po (added)
+++ desktop/experimental/gdm3/debian/po-up/fr.po [utf-8] Tue Apr 13 22:12:59 2010
@@ -1,0 +1,44 @@
+# This file is distributed under the same license as the gdm3 package.
+# Josselin Mouette <joss at debian.org>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gdm3 2.30.0-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-13 23:55+0200\n"
+"PO-Revision-Date: 2010-04-13 23:57+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"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../patches/11_xephyr_nested.patch:684
+msgid "Run gdm in a nested window"
+msgstr "Lancer GDM dans une fenêtre imbriquée"
+
+#. Translators: Label for choosing which user to log in as. '%s' is replaced with an input field.
+#: ../patches/13_gdmsetup.patch:360
+#, c-format
+msgid "Log in as %s automatically"
+msgstr "Se connecter automatiquement en tant que %s"
+
+#. Translators: Label for choosing the login delay. '%s' is replaced with an input field.
+#: ../patches/13_gdmsetup.patch:362
+#, c-format
+msgid "Allow %s seconds for anyone else to log in first"
+msgstr "Laisser %s secondes aux autres utilisateurs pour se connecter avant"
+
+#: ../patches/13_gdmsetup_ui.patch.h:1
+msgid "<b>When the computer starts up</b>"
+msgstr "<b>Quand l’ordinateur démarre</b>"
+
+#. Title of login screen settings dialog
+#: ../patches/13_gdmsetup_ui.patch.h:3
+msgid "Login Screen Settings"
+msgstr "Paramètres de l’écran de connexion"
+
+#. Radio option to set login screen to prompt for user
+#: ../patches/13_gdmsetup_ui.patch.h:5
+msgid "_Show the screen for choosing who will log in"
+msgstr "_Choisir l’utilisateur qui se connecte"
Added: desktop/experimental/gdm3/debian/po-up/patches.pot
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/po-up/patches.pot?rev=23785&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/po-up/patches.pot (added)
+++ desktop/experimental/gdm3/debian/po-up/patches.pot [utf-8] Tue Apr 13 22:12:59 2010
@@ -1,0 +1,47 @@
+# 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-04-13 23:55+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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../patches/11_xephyr_nested.patch:684
+msgid "Run gdm in a nested window"
+msgstr ""
+
+#. Translators: Label for choosing which user to log in as. '%s' is replaced with an input field.
+#: ../patches/13_gdmsetup.patch:360
+#, c-format
+msgid "Log in as %s automatically"
+msgstr ""
+
+#. Translators: Label for choosing the login delay. '%s' is replaced with an input field.
+#: ../patches/13_gdmsetup.patch:362
+#, c-format
+msgid "Allow %s seconds for anyone else to log in first"
+msgstr ""
+
+#: ../patches/13_gdmsetup_ui.patch.h:1
+msgid "<b>When the computer starts up</b>"
+msgstr ""
+
+#. Title of login screen settings dialog
+#: ../patches/13_gdmsetup_ui.patch.h:3
+msgid "Login Screen Settings"
+msgstr ""
+
+#. Radio option to set login screen to prompt for user
+#: ../patches/13_gdmsetup_ui.patch.h:5
+msgid "_Show the screen for choosing who will log in"
+msgstr ""
Added: desktop/experimental/gdm3/debian/po/de.po
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/po/de.po?rev=23785&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/po/de.po (added)
+++ desktop/experimental/gdm3/debian/po/de.po [utf-8] Tue Apr 13 22:12:59 2010
@@ -1,0 +1,25 @@
+# German translations for gdm package
+# German messages for gdm.
+# Copyright (C) 2010 THE gdm'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the gdm package.
+# Gert Michael Kulyk <gkulyk at yahoo.de>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: gdm 2.30.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-13 23:55+0200\n"
+"PO-Revision-Date: 2010-04-08 10:32+0200\n"
+"Last-Translator: Gert Michael Kulyk <gkulyk at yahoo.de>\n"
+"Language-Team: German\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../debian/default.desktop.in.h:1
+msgid "System Default"
+msgstr "Systemvorgabe"
+
+#: ../../debian/default.desktop.in.h:2
+msgid "The default session on the system"
+msgstr "Die Vorgabesitzung des Systems"
Modified: desktop/experimental/gdm3/debian/po/debian.pot
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/po/debian.pot?rev=23785&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/po/debian.pot [utf-8] (original)
+++ desktop/experimental/gdm3/debian/po/debian.pot [utf-8] Tue Apr 13 22:12:59 2010
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-04 16:24+0100\n"
+"POT-Creation-Date: 2010-04-13 23:55+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"
Modified: desktop/experimental/gdm3/debian/po/fr.po
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/po/fr.po?rev=23785&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/po/fr.po [utf-8] (original)
+++ desktop/experimental/gdm3/debian/po/fr.po [utf-8] Tue Apr 13 22:12:59 2010
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: gdm3 2.28.1-1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-04 16:24+0100\n"
+"POT-Creation-Date: 2010-04-13 23:55+0200\n"
"PO-Revision-Date: 2009-12-04 16:27+0100\n"
"Last-Translator: Josselin Mouette <joss at debian.org>\n"
"Language-Team: Debian-l10n-French <debian-l10n-french at lists.debian.org>\n"
Modified: desktop/experimental/gdm3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/rules?rev=23785&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/rules [utf-8] (original)
+++ desktop/experimental/gdm3/debian/rules [utf-8] Tue Apr 13 22:12:59 2010
@@ -4,6 +4,7 @@
include /usr/share/cdbs/1/class/gnome.mk
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/patch-translations.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
GNOME_MODULE := gdm
@@ -67,6 +68,10 @@
clean::
rm -f $(MANPAGES)
rm -f $(OUTFILES)
+ rm -f gui/gdmsetup/gdmsetup.ui
+
+post-patches::
+ cp debian/gdmsetup.ui gui/gdmsetup/
%: %.pod
pod2man --section=$(shell echo $@ | sed 's/.*\.//') \
More information about the pkg-gnome-commits
mailing list