r30922 - in /desktop/experimental/gnome-settings-daemon/debian: ./ patches/
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Fri Oct 21 21:11:10 UTC 2011
Author: sjoerd
Date: Fri Oct 21 21:11:09 2011
New Revision: 30922
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30922
Log:
* New upstream release (3.2.1)
* debian/patches/01_medias_keys_dont_go_up_to_11.patch:
+ Removed, merged upsteram
* debian/patches/02_missing_format.patch:
+ Removed, fixed upstream
* debian/patches/03_deal_with_absence_of_gnome-session.patch:
+ Removed, merged upstream
* debian/patches/04_superP.patch: Refreshed
* debian/control.in: Update build-depends
Removed:
desktop/experimental/gnome-settings-daemon/debian/patches/01_medias_keys_dont_go_up_to_11.patch
desktop/experimental/gnome-settings-daemon/debian/patches/02_missing_format.patch
desktop/experimental/gnome-settings-daemon/debian/patches/03_deal_with_absence_of_gnome-session.patch
Modified:
desktop/experimental/gnome-settings-daemon/debian/changelog
desktop/experimental/gnome-settings-daemon/debian/control
desktop/experimental/gnome-settings-daemon/debian/control.in
desktop/experimental/gnome-settings-daemon/debian/patches/04_superP.patch
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=30922&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] Fri Oct 21 21:11:09 2011
@@ -1,4 +1,4 @@
-gnome-settings-daemon (3.0.3-4) UNRELEASED; urgency=low
+gnome-settings-daemon (3.2.1-1) UNRELEASED; urgency=low
[ Michael Biebl ]
* Use the new maintscript facility in dh_installdeb to remove the obsolete
@@ -12,7 +12,18 @@
* 04_superP.patch: new patch. Allow to reconfigure the Super-P
shortcut which is otherwise hardcoded to VIDEO_OUT.
- -- Michael Biebl <biebl at debian.org> Wed, 19 Oct 2011 09:45:33 +0200
+ [ Sjoerd Simons ]
+ * New upstream release (3.2.1)
+ * debian/patches/01_medias_keys_dont_go_up_to_11.patch:
+ + Removed, merged upsteram
+ * debian/patches/02_missing_format.patch:
+ + Removed, fixed upstream
+ * debian/patches/03_deal_with_absence_of_gnome-session.patch:
+ + Removed, merged upstream
+ * debian/patches/04_superP.patch: Refreshed
+ * debian/control.in: Update build-depends
+
+ -- Sjoerd Simons <sjoerd at debian.org> Fri, 21 Oct 2011 23:09:29 +0200
gnome-settings-daemon (3.0.3-3) unstable; urgency=low
Modified: desktop/experimental/gnome-settings-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/control?rev=30922&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/control [utf-8] Fri Oct 21 21:11:09 2011
@@ -15,10 +15,10 @@
autotools-dev,
intltool (>= 0.37.1),
libdbus-glib-1-dev (>= 0.74),
- libglib2.0-dev (>= 2.26.0),
+ libglib2.0-dev (>= 2.30.0),
libgtk-3-dev (>= 3.0.0),
libgconf2-dev (>= 2.6.1),
- libnotify-dev (>= 0.7.0),
+ libnotify-dev (>= 0.7.3),
libxt-dev,
libxi-dev,
libfontconfig1-dev,
@@ -29,7 +29,7 @@
libgstreamer0.10-dev (>= 0.10.1.2),
libgstreamer-plugins-base0.10-dev (>= 0.10.1.2),
gsettings-desktop-schemas-dev,
- libgnome-desktop-3-dev (>= 2.91.93),
+ libgnome-desktop-3-dev (>= 3.1.5),
libpulse-dev (>= 0.9.23),
libcanberra-gtk3-dev,
libcups2-dev,
Modified: desktop/experimental/gnome-settings-daemon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/control.in?rev=30922&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/control.in [utf-8] Fri Oct 21 21:11:09 2011
@@ -10,10 +10,10 @@
autotools-dev,
intltool (>= 0.37.1),
libdbus-glib-1-dev (>= 0.74),
- libglib2.0-dev (>= 2.26.0),
+ libglib2.0-dev (>= 2.30.0),
libgtk-3-dev (>= 3.0.0),
libgconf2-dev (>= 2.6.1),
- libnotify-dev (>= 0.7.0),
+ libnotify-dev (>= 0.7.3),
libxt-dev,
libxi-dev,
libfontconfig1-dev,
@@ -24,7 +24,7 @@
libgstreamer0.10-dev (>= 0.10.1.2),
libgstreamer-plugins-base0.10-dev (>= 0.10.1.2),
gsettings-desktop-schemas-dev,
- libgnome-desktop-3-dev (>= 2.91.93),
+ libgnome-desktop-3-dev (>= 3.1.5),
libpulse-dev (>= 0.9.23),
libcanberra-gtk3-dev,
libcups2-dev,
Modified: desktop/experimental/gnome-settings-daemon/debian/patches/04_superP.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/04_superP.patch?rev=30922&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/04_superP.patch [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/04_superP.patch [utf-8] Fri Oct 21 21:11:09 2011
@@ -1,6 +1,24 @@
---- gnome-settings-daemon-2.91.93/plugins/media-keys/acme.h.orig 2011-03-31 14:27:13.298838842 +0700
-+++ gnome-settings-daemon-2.91.93/plugins/media-keys/acme.h 2011-03-31 14:35:00.669362095 +0700
-@@ -47,11 +47,11 @@
+diff --git a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
+index 85438c5..c3ad6c0 100644
+--- a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
++++ b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
+@@ -80,6 +80,11 @@
+ <_summary>Stop playback</_summary>
+ <_description>Binding to stop playback.</_description>
+ </key>
++ <key name="video-out" type="s">
++ <default>'<Super>p'</default>
++ <_summary>Video output</_summary>
++ <_description>Binding to switch the video output device.</_description>
++ </key>
+ <key name="volume-down" type="s">
+ <default>'XF86AudioLowerVolume'</default>
+ <_summary>Volume down</_summary>
+diff --git a/plugins/media-keys/acme.h b/plugins/media-keys/acme.h
+index 54ec19b..028609a 100644
+--- a/plugins/media-keys/acme.h
++++ b/plugins/media-keys/acme.h
+@@ -51,11 +51,11 @@ typedef enum {
STOP_KEY,
PREVIOUS_KEY,
NEXT_KEY,
@@ -13,7 +31,7 @@
VIDEO_OUT2_KEY,
ROTATE_VIDEO_KEY,
MAGNIFIER_KEY,
-@@ -92,12 +92,12 @@
+@@ -110,12 +110,12 @@ static struct {
{ STOP_KEY, "stop", NULL, NULL },
{ PREVIOUS_KEY, "previous", NULL, NULL },
{ NEXT_KEY, "next", NULL, NULL },
@@ -27,17 +45,3 @@
/* Key code of the XF86Display key (Fn-F7 on Thinkpads, Fn-F4 on HP machines, etc.) */
{ VIDEO_OUT2_KEY, NULL, "XF86Display", NULL },
/* Key code of the XF86RotateWindows key (present on some tablets) */
---- gnome-settings-daemon-2.91.93/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in.orig 2011-03-31 14:44:11.845107222 +0700
-+++ gnome-settings-daemon-2.91.93/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in 2011-03-31 14:43:25.644063308 +0700
-@@ -90,6 +90,11 @@
- <_summary>Toggle touchpad</_summary>
- <_description>Binding to enable or disable the touchpad.</_description>
- </key>
-+ <key name="video-out" type="s">
-+ <default>'<Super>p'</default>
-+ <_summary>Video output</_summary>
-+ <_description>Binding to switch the video output device.</_description>
-+ </key>
- <key name="volume-down" type="s">
- <default>'XF86AudioLowerVolume'</default>
- <_summary>Volume down</_summary>
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=30922&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] Fri Oct 21 21:11:09 2011
@@ -1,4 +1,1 @@
-01_medias_keys_dont_go_up_to_11.patch
-02_missing_format.patch
-03_deal_with_absence_of_gnome-session.patch
04_superP.patch
More information about the pkg-gnome-commits
mailing list