r35038 - in /desktop/experimental/gnome-settings-daemon/debian: changelog patches/git_keyring_environment.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat May 19 06:30:40 2012
New Revision: 35038

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35038
Log:
Update to 3.4.2 and drop git_keyring_environment.patch which is now upstream

Removed:
    desktop/experimental/gnome-settings-daemon/debian/patches/git_keyring_environment.patch
Modified:
    desktop/experimental/gnome-settings-daemon/debian/changelog
    desktop/experimental/gnome-settings-daemon/debian/patches/series

Modified: desktop/experimental/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/changelog?rev=35038&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] Sat May 19 06:30:40 2012
@@ -1,21 +1,18 @@
-gnome-settings-daemon (3.4.1-1) UNRELEASED; urgency=low
+gnome-settings-daemon (3.4.2-1) UNRELEASED; urgency=low
 
   * New upstream release
-  * d/p/01-xrandr-correct-the-type-of-the-rotation-parameter.patch:
+  * debian/patches/01-xrandr-correct-the-type-of-the-rotation-parameter.patch:
     + Removed, fixed upstream
-  * 02-lock-screensaver-on-lid-close.patch:
+  * debian/patches/02-lock-screensaver-on-lid-close.patch:
     + Removed, fixed upstream
   * debian/patches/04_superP.patch: Refreshed
-  * Sync with ubuntu:
+  * Sync with Ubuntu:
     + Update build-depend versions of various items
     + Add build-depend on libnss3-dev for smartcard support
     + Add build-depend on libwacom-dev, xserver-xorg-input-wacom for wacom
       support
     + debian/patches/10_smaller_syndaemon_timeout.patch:
       - Added: Only disable touchpach clicks, not mouse movements (bgo: #673055)
-    + debian/patches/git_keyring_environment.patch:
-      - Added: Get the environment from gnome-keyring when launch custom apps
-          (from upstream git)
     + debian/patches/power-check-null-devices.patch:
       - Added: Fix crash when up_client_get_devices returns NULL (bgo: #674827)
     + debian/patches/power-ignore-bad-dbus-requests.patch:

Modified: desktop/experimental/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/series?rev=35038&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] Sat May 19 06:30:40 2012
@@ -1,6 +1,5 @@
 04_superP.patch
 10_smaller_syndaemon_timeout.patch
-git_keyring_environment.patch
 power-check-null-devices.patch
 power-ignore-bad-dbus-requests.patch
 revert_git_datetime_dropping.patch