r22142 - in /desktop/experimental/gdm/debian: TODO changelog control control.in patches/04_custom-conf.patch patches/series

lethalman-guest at users.alioth.debian.org lethalman-guest at users.alioth.debian.org
Sun Oct 25 10:11:23 UTC 2009


Author: lethalman-guest
Date: Sun Oct 25 10:11:20 2009
New Revision: 22142

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22142
Log:
* debian/control.in:
  - Require libxklavier-dev build-dep instead of libxklavier12-dev.
  - Update to Standards-Version 3.8.3, no additional changes needed.
* debian/patches/04_custom-conf.patch:
  - TODO: The custom.conf file cannot be found.

Added:
    desktop/experimental/gdm/debian/patches/04_custom-conf.patch
Modified:
    desktop/experimental/gdm/debian/TODO
    desktop/experimental/gdm/debian/changelog
    desktop/experimental/gdm/debian/control
    desktop/experimental/gdm/debian/control.in
    desktop/experimental/gdm/debian/patches/series

Modified: desktop/experimental/gdm/debian/TODO
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm/debian/TODO?rev=22142&op=diff
==============================================================================
--- desktop/experimental/gdm/debian/TODO [utf-8] (original)
+++ desktop/experimental/gdm/debian/TODO [utf-8] Sun Oct 25 10:11:20 2009
@@ -1,8 +1,5 @@
 This file lists the most obvious breakages in GDM. There are probably a 
 lot of bugs remaining after that, these are only the blockers.
-
- * The custom.conf file cannot be found
-   => Probably needs a bit of patching.
 
  * The default keyboard layout is wrong
    => Ubuntu has a patch, 01_default_keyboard_layout_hal.patch.

Modified: desktop/experimental/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm/debian/changelog?rev=22142&op=diff
==============================================================================
--- desktop/experimental/gdm/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdm/debian/changelog [utf-8] Sun Oct 25 10:11:20 2009
@@ -1,5 +1,6 @@
 gdm (2.28.1-1) UNRELEASED; urgency=low
 
+  [ Josselin Mouette ]
   * New upstream release.
   * Require devicekit-power and recommend g-p-m 2.28.
   * Require policykit-1-gnome for the policykit 1.0 port.
@@ -7,7 +8,14 @@
   * 90_relibtoolize.patch: updated for the new version.
   * Add debian/TODO detailing the (huge) amount of work remaining.
 
- -- Josselin Mouette <joss at debian.org>  Sun, 25 Oct 2009 07:24:50 +0100
+  [ Luca Bruno ]
+  * debian/control.in:
+    - Require libxklavier-dev build-dep instead of libxklavier12-dev.
+    - Update to Standards-Version 3.8.3, no additional changes needed.
+  * debian/patches/04_custom-conf.patch:
+    - TODO: The custom.conf file cannot be found.
+
+ -- Luca Bruno <lethalman88 at gmail.com>  Sun, 25 Oct 2009 11:04:57 +0100
 
 gdm (2.26.1-1) UNRELEASED; urgency=low
 

Modified: desktop/experimental/gdm/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm/debian/control?rev=22142&op=diff
==============================================================================
--- desktop/experimental/gdm/debian/control [utf-8] (original)
+++ desktop/experimental/gdm/debian/control [utf-8] Sun Oct 25 10:11:20 2009
@@ -16,7 +16,7 @@
                libglade2-dev (>= 1:1.99.2),
                libgconf2-dev (>= 2.6.1),
                libpanel-applet2-dev (>= 2.0.0),
-               libxklavier12-dev (>= 4.0),
+               libxklavier-dev (>= 4.0),
                libcanberra-gtk-dev (>= 0.4),
                libfontconfig1-dev (>= 2.5.0),
                libdevkit-power-gobject-dev (>= 008),

Modified: desktop/experimental/gdm/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm/debian/control.in?rev=22142&op=diff
==============================================================================
--- desktop/experimental/gdm/debian/control.in [utf-8] (original)
+++ desktop/experimental/gdm/debian/control.in [utf-8] Sun Oct 25 10:11:20 2009
@@ -16,7 +16,7 @@
                libglade2-dev (>= 1:1.99.2),
                libgconf2-dev (>= 2.6.1),
                libpanel-applet2-dev (>= 2.0.0),
-               libxklavier12-dev (>= 4.0),
+               libxklavier-dev (>= 4.0),
                libcanberra-gtk-dev (>= 0.4),
                libfontconfig1-dev (>= 2.5.0),
                libdevkit-power-gobject-dev (>= 008),
@@ -36,7 +36,7 @@
                iso-codes,
                libaudit-dev,
                xserver-xorg
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 
 Package: gdm
 Architecture: any

Added: desktop/experimental/gdm/debian/patches/04_custom-conf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm/debian/patches/04_custom-conf.patch?rev=22142&op=file
==============================================================================
--- desktop/experimental/gdm/debian/patches/04_custom-conf.patch (added)
+++ desktop/experimental/gdm/debian/patches/04_custom-conf.patch [utf-8] Sun Oct 25 10:11:20 2009
@@ -1,0 +1,12 @@
+diff -urN gdm-2.28.1.orig/common/gdm-settings-desktop-backend.c gdm-2.28.1/common/gdm-settings-desktop-backend.c
+--- gdm-2.28.1.orig/common/gdm-settings-desktop-backend.c	2009-10-20 00:12:45.000000000 +0200
++++ gdm-2.28.1/common/gdm-settings-desktop-backend.c	2009-10-25 11:30:12.000000000 +0100
+@@ -327,7 +327,7 @@
+         backend->priv = GDM_SETTINGS_DESKTOP_BACKEND_GET_PRIVATE (backend);
+ 
+         backend->priv->key_file = g_key_file_new ();
+-        backend->priv->filename = g_strdup (GDMCONFDIR "/custom.conf");
++        backend->priv->filename = g_strdup (GDM_CUSTOM_CONF);
+ 
+         error = NULL;
+         res = g_key_file_load_from_file (backend->priv->key_file,

Modified: desktop/experimental/gdm/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm/debian/patches/series?rev=22142&op=diff
==============================================================================
--- desktop/experimental/gdm/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gdm/debian/patches/series [utf-8] Sun Oct 25 10:11:20 2009
@@ -1,4 +1,5 @@
 01_minimal_uid.patch
 02_xnest-wrapper.patch
 03_authdir.patch
+04_custom-conf.patch
 90_relibtoolize.patch




More information about the pkg-gnome-commits mailing list