r23568 - in /desktop/experimental/gdm3/debian: changelog control.in patches/05_stop_welcome_session.patch rules source/ source/format
lethalman-guest at users.alioth.debian.org
lethalman-guest at users.alioth.debian.org
Tue Apr 6 13:18:45 UTC 2010
Author: lethalman-guest
Date: Tue Apr 6 13:18:43 2010
New Revision: 23568
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23568
Log:
* Switch to source format 3.0 (quilt).
- Add debian/source/format.
- Drop quilt from Build-Depends.
- Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk include.
* debian/patches/05_stop_welcome_session.patch:
- Kill process group with SIGKILL and wait 200ms.
Added:
desktop/experimental/gdm3/debian/source/
desktop/experimental/gdm3/debian/source/format
Modified:
desktop/experimental/gdm3/debian/changelog
desktop/experimental/gdm3/debian/control.in
desktop/experimental/gdm3/debian/patches/05_stop_welcome_session.patch
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=23568&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/changelog [utf-8] (original)
+++ desktop/experimental/gdm3/debian/changelog [utf-8] Tue Apr 6 13:18:43 2010
@@ -4,6 +4,13 @@
* debian/control.in:
- Added libpolkit-gobject-1-dev and libpolkit-gtk-1-dev build-depends
for gdmsetup patch.
+ - Update to Standards-Version 3.8.4, no additional changes needed.
+ * Switch to source format 3.0 (quilt).
+ - Add debian/source/format.
+ - Drop quilt from Build-Depends.
+ - Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk include.
+ * debian/patches/05_stop_welcome_session.patch:
+ - Kill process group with SIGKILL and wait 200ms.
* debian/patches/11_xephyr_nested.patch:
- Added, support running gdm in a nested window.
* debian/patches/12_polkit_settings.patch:
Modified: desktop/experimental/gdm3/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/control.in?rev=23568&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/control.in [utf-8] (original)
+++ desktop/experimental/gdm3/debian/control.in [utf-8] Tue Apr 6 13:18:43 2010
@@ -4,7 +4,6 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: gnome-pkg-tools,
- quilt,
debhelper (>= 5),
cdbs,
intltool (>= 0.40.0),
@@ -37,7 +36,7 @@
iso-codes,
libaudit-dev,
xserver-xorg
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Package: gdm3
Architecture: any
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=23568&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 6 13:18:43 2010
@@ -9,12 +9,17 @@
#define MAX_LOGS 5
-@@ -961,7 +961,7 @@
+@@ -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, 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/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/rules?rev=23568&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/rules [utf-8] (original)
+++ desktop/experimental/gdm3/debian/rules [utf-8] Tue Apr 6 13:18:43 2010
@@ -2,7 +2,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.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/gnome-get-source.mk
Added: desktop/experimental/gdm3/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/source/format?rev=23568&op=file
==============================================================================
--- desktop/experimental/gdm3/debian/source/format (added)
+++ desktop/experimental/gdm3/debian/source/format [utf-8] Tue Apr 6 13:18:43 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the pkg-gnome-commits
mailing list