r35857 - in /desktop/unstable/gnome-settings-daemon/debian: ./ patches/

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sat Sep 29 13:31:53 UTC 2012


Author: joss
Date: Sat Sep 29 13:31:53 2012
New Revision: 35857

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35857
Log:
* New upstream git snapshot from the stable branch (which will not be 
  released despite the amount of useful bug fixes).
* 10_smaller_syndaemon_timeout.patch: refreshed.
* Drop merged patches: power-update-fallback-status-icon.patch,
  20_disable-wacom-support-on-s390-s390x.patch, 
  21_disable-wacom-on-non-Linux-platforms.patch,
  24-common-Try-XI-2.2-if-XI-2.0-fails.patch.
* Bump libwacom dependency.

Removed:
    desktop/unstable/gnome-settings-daemon/debian/patches/20_disable-wacom-support-on-s390-s390x.patch
    desktop/unstable/gnome-settings-daemon/debian/patches/21_disable-wacom-on-non-Linux-platforms.patch
    desktop/unstable/gnome-settings-daemon/debian/patches/24-common-Try-XI-2.2-if-XI-2.0-fails.patch
    desktop/unstable/gnome-settings-daemon/debian/patches/power-update-fallback-status-icon.patch
Modified:
    desktop/unstable/gnome-settings-daemon/debian/changelog
    desktop/unstable/gnome-settings-daemon/debian/control
    desktop/unstable/gnome-settings-daemon/debian/control.in
    desktop/unstable/gnome-settings-daemon/debian/patches/10_smaller_syndaemon_timeout.patch
    desktop/unstable/gnome-settings-daemon/debian/patches/series

Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=35857&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] Sat Sep 29 13:31:53 2012
@@ -1,9 +1,17 @@
-gnome-settings-daemon (3.4.2-6) UNRELEASED; urgency=low
+gnome-settings-daemon (3.4.2+git20120925.a4c817-1) unstable; urgency=low
 
   * debian/g-s-d.gsettings-override: disable remember-numlock-state, 
     because of the infamous https://bugzilla.gnome.org/679151
-
- -- Josselin Mouette <joss at debian.org>  Sat, 29 Sep 2012 11:17:52 +0200
+  * New upstream git snapshot from the stable branch (which will not be 
+    released despite the amount of useful bug fixes).
+  * 10_smaller_syndaemon_timeout.patch: refreshed.
+  * Drop merged patches: power-update-fallback-status-icon.patch,
+    20_disable-wacom-support-on-s390-s390x.patch, 
+    21_disable-wacom-on-non-Linux-platforms.patch,
+    24-common-Try-XI-2.2-if-XI-2.0-fails.patch.
+  * Bump libwacom dependency.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 29 Sep 2012 12:17:15 +0200
 
 gnome-settings-daemon (3.4.2-5) unstable; urgency=low
 

Modified: desktop/unstable/gnome-settings-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/control?rev=35857&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/control [utf-8] Sat Sep 29 13:31:53 2012
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 8.1.0~),
                gnome-pkg-tools,
@@ -40,7 +40,7 @@
                libcolord-dev (>= 0.1.12),
                liblcms2-dev,
                libnss3-dev,
-               libwacom-dev (>= 0.3) [!hurd-any !kfreebsd-any !s390 !s390x],
+               libwacom-dev (>= 0.6) [!hurd-any !kfreebsd-any !s390 !s390x],
                xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390 !s390x]
 Standards-Version: 3.9.3
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-settings-daemon/

Modified: desktop/unstable/gnome-settings-daemon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/control.in?rev=35857&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/control.in [utf-8] Sat Sep 29 13:31:53 2012
@@ -35,7 +35,7 @@
                libcolord-dev (>= 0.1.12),
                liblcms2-dev,
                libnss3-dev,
-               libwacom-dev (>= 0.3) [!hurd-any !kfreebsd-any !s390 !s390x],
+               libwacom-dev (>= 0.6) [!hurd-any !kfreebsd-any !s390 !s390x],
                xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390 !s390x]
 Standards-Version: 3.9.3
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-settings-daemon/

Modified: desktop/unstable/gnome-settings-daemon/debian/patches/10_smaller_syndaemon_timeout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/10_smaller_syndaemon_timeout.patch?rev=35857&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/10_smaller_syndaemon_timeout.patch [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/10_smaller_syndaemon_timeout.patch [utf-8] Sat Sep 29 13:31:53 2012
@@ -1,9 +1,9 @@
-Index: gnome-settings-daemon-3.4.2/plugins/mouse/gsd-mouse-manager.c
+Index: gnome-settings-daemon-3.4.2+git20120925.a4c817/plugins/mouse/gsd-mouse-manager.c
 ===================================================================
---- gnome-settings-daemon-3.4.2.orig/plugins/mouse/gsd-mouse-manager.c	2012-05-15 12:11:58.000000000 +0200
-+++ gnome-settings-daemon-3.4.2/plugins/mouse/gsd-mouse-manager.c	2012-05-19 08:39:03.315704485 +0200
-@@ -552,7 +552,8 @@
-                 args[2] = "2.0";
+--- gnome-settings-daemon-3.4.2+git20120925.a4c817.orig/plugins/mouse/gsd-mouse-manager.c	2012-09-29 12:09:15.000000000 +0200
++++ gnome-settings-daemon-3.4.2+git20120925.a4c817/plugins/mouse/gsd-mouse-manager.c	2012-09-29 12:11:23.119038602 +0200
+@@ -577,7 +577,8 @@ set_disable_w_typing (GsdMouseManager *m
+                 args[2] = "1.0";
                  args[3] = "-K";
                  args[4] = "-R";
 -                args[5] = NULL;

Modified: desktop/unstable/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/series?rev=35857&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] Sat Sep 29 13:31:53 2012
@@ -2,9 +2,5 @@
 10_smaller_syndaemon_timeout.patch
 power-check-null-devices.patch
 power-ignore-bad-dbus-requests.patch
-power-update-fallback-status-icon.patch
 revert_git_datetime_dropping.patch
-20_disable-wacom-support-on-s390-s390x.patch
-21_disable-wacom-on-non-Linux-platforms.patch
 22_backlight_optional.patch
-24-common-Try-XI-2.2-if-XI-2.0-fails.patch




More information about the pkg-gnome-commits mailing list