thank you Ansgar for keeping an eye on this issue and the first round of unblock requests! Among the list of packages which are on CD1, there were a couple of other packages which had important sourceful changes. In case of gtk+3.0 and gnome-keyring they fix an RC bug. Full debdiffs attached unblock metacity/1:2.34.3-3 unblock gtk+3.0/3.4.2-3 unblock gnome-keyring/3.4.1-5 -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
diff -Nru gnome-keyring-3.4.1/debian/changelog gnome-keyring-3.4.1/debian/changelog
--- gnome-keyring-3.4.1/debian/changelog 2012-05-24 00:42:23.000000000 +0200
+++ gnome-keyring-3.4.1/debian/changelog 2012-08-19 22:02:52.000000000 +0200
@@ -1,3 +1,13 @@
+gnome-keyring (3.4.1-5) unstable; urgency=low
+
+ * d/p/0001-schema-Update-description-for-gpg-cache-method.patch,
+ d/p/0002-gpg-agent-Hook-up-the-TTL-cache-option.patch,
+ d/p/0003-secret-store-Mark-a-secret-item-as-used-when-accesse.patch:
+ Properly expire caching of the GPG passphrases (Taken from upstream)
+ (Closes: #683655, CVE-2012-3466)
+
+ -- Laurent Bigonville <bigon@debian.org> Sun, 19 Aug 2012 22:01:53 +0200
+
gnome-keyring (3.4.1-4) unstable; urgency=low
* Add Depends on gcr (>= 3.4) for the SystemPrompter service which is
diff -Nru gnome-keyring-3.4.1/debian/control gnome-keyring-3.4.1/debian/control
--- gnome-keyring-3.4.1/debian/control 2012-05-24 00:43:59.000000000 +0200
+++ gnome-keyring-3.4.1/debian/control 2012-08-19 22:06:19.000000000 +0200
@@ -7,7 +7,7 @@
Section: gnome
Priority: optional
Maintainer: Josselin Mouette <joss@debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Jordi Mallach <jordi@debian.org>, Martin Pitt <mpitt@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Jordi Mallach <jordi@debian.org>, Laurent Bigonville <bigon@debian.org>, Martin Pitt <mpitt@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
Build-Depends: debhelper (>= 9),
cdbs,
ca-certificates,
diff -Nru gnome-keyring-3.4.1/debian/patches/0001-schema-Update-description-for-gpg-cache-method.patch gnome-keyring-3.4.1/debian/patches/0001-schema-Update-description-for-gpg-cache-method.patch
--- gnome-keyring-3.4.1/debian/patches/0001-schema-Update-description-for-gpg-cache-method.patch 1970-01-01 01:00:00.000000000 +0100
+++ gnome-keyring-3.4.1/debian/patches/0001-schema-Update-description-for-gpg-cache-method.patch 2012-08-19 14:29:37.000000000 +0200
@@ -0,0 +1,31 @@
+From 24dcc36fb999418b1d13f76bc6bee4c7f59a5ec0 Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw@gnome.org>
+Date: Wed, 8 Aug 2012 06:06:24 +0200
+Subject: [PATCH 1/3] schema: Update description for gpg-cache-method
+
+ * Document the various method strings that can be present here
+
+https://bugzilla.gnome.org/show_bug.cgi?id=681081
+---
+ schema/org.gnome.crypto.cache.gschema.xml | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/schema/org.gnome.crypto.cache.gschema.xml b/schema/org.gnome.crypto.cache.gschema.xml
+index 9a431eb..4547399 100644
+--- a/schema/org.gnome.crypto.cache.gschema.xml
++++ b/schema/org.gnome.crypto.cache.gschema.xml
+@@ -3,7 +3,10 @@
+ <key name="gpg-cache-method" type="s">
+ <default>'session'</default>
+ <summary>Cache Method</summary>
+- <description>The method to use for caching passphrases typed into the GPG agent.</description>
++ <description>The method to use for caching passphrases typed into the GPG agent.
++ Should be one of: 'always' caches permanently, 'session' caches until session end,
++ 'idle' caches until the not used for gpg-cache-ttl seconds, 'timeout' caches until
++ gpg-cache-ttl seconds.</description>
+ </key>
+ <key name="gpg-cache-ttl" type="i">
+ <default>300</default>
+--
+1.7.10.4
+
diff -Nru gnome-keyring-3.4.1/debian/patches/0002-gpg-agent-Hook-up-the-TTL-cache-option.patch gnome-keyring-3.4.1/debian/patches/0002-gpg-agent-Hook-up-the-TTL-cache-option.patch
--- gnome-keyring-3.4.1/debian/patches/0002-gpg-agent-Hook-up-the-TTL-cache-option.patch 1970-01-01 01:00:00.000000000 +0100
+++ gnome-keyring-3.4.1/debian/patches/0002-gpg-agent-Hook-up-the-TTL-cache-option.patch 2012-08-19 14:29:37.000000000 +0200
@@ -0,0 +1,99 @@
+From 51606f299e5ee9d48096db0a5957efe26cbf7cc3 Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw@gnome.org>
+Date: Wed, 8 Aug 2012 06:06:58 +0200
+Subject: [PATCH 2/3] gpg-agent: Hook up the TTL cache option
+
+ * So that when the gsettings gpg-cache-method is 'idle' or 'timeout'
+ we use gpg-cache-ttl to control how long the passphrase is cached
+ for.
+ * This is a regression from 3.3.x
+
+https://bugzilla.gnome.org/show_bug.cgi?id=681081
+---
+ daemon/gpg-agent/gkd-gpg-agent-ops.c | 40 +++++++++++++++++++++-------------
+ 1 file changed, 25 insertions(+), 15 deletions(-)
+
+diff --git a/daemon/gpg-agent/gkd-gpg-agent-ops.c b/daemon/gpg-agent/gkd-gpg-agent-ops.c
+index a0e8731..c8414fe 100644
+--- a/daemon/gpg-agent/gkd-gpg-agent-ops.c
++++ b/daemon/gpg-agent/gkd-gpg-agent-ops.c
+@@ -322,17 +322,6 @@ load_unlock_options (GcrPrompt *prompt)
+ g_free (method);
+ }
+
+-static void
+-save_unlock_options (GcrPrompt *prompt)
+-{
+- GSettings *settings;
+-
+- settings = gkd_gpg_agent_settings ();
+-
+- if (gcr_prompt_get_choice_chosen (prompt))
+- g_settings_set_string (settings, "gpg-cache-method", GCR_UNLOCK_OPTION_ALWAYS);
+-}
+-
+ static GcrPrompt *
+ open_password_prompt (GckSession *session,
+ const gchar *keyid,
+@@ -405,11 +394,14 @@ do_get_password (GckSession *session, const gchar *keyid, const gchar *errmsg,
+ const gchar *prompt_text, const gchar *description, gboolean confirm)
+ {
+ GckBuilder builder = GCK_BUILDER_INIT;
++ GSettings *settings;
+ GckAttributes *attrs;
+ gchar *password = NULL;
+ GcrPrompt *prompt;
+ gboolean chosen;
+ GError *error = NULL;
++ gint lifetime;
++ gchar *method;
+
+ g_assert (GCK_IS_SESSION (session));
+
+@@ -430,21 +422,39 @@ do_get_password (GckSession *session, const gchar *keyid, const gchar *errmsg,
+ }
+
+ if (password != NULL && keyid != NULL) {
++ settings = gkd_gpg_agent_settings ();
+
+ /* Load up the save options */
+ chosen = gcr_prompt_get_choice_chosen (prompt);
+
+- if (chosen)
++ if (chosen) {
++ g_settings_set_string (settings, "gpg-cache-method", GCR_UNLOCK_OPTION_ALWAYS);
+ gck_builder_add_string (&builder, CKA_G_COLLECTION, "login");
+- else
++
++ } else {
++ method = g_settings_get_string (settings, "gpg-cache-method");
++ lifetime = g_settings_get_int (settings, "gpg-cache-ttl");
++
++ if (g_strcmp0 (method, GCR_UNLOCK_OPTION_IDLE) == 0) {
++ gck_builder_add_boolean (&builder, CKA_GNOME_TRANSIENT, TRUE);
++ gck_builder_add_ulong (&builder, CKA_G_DESTRUCT_IDLE, lifetime);
++
++ } else if (g_strcmp0 (method, GCR_UNLOCK_OPTION_TIMEOUT) == 0) {
++ gck_builder_add_boolean (&builder, CKA_GNOME_TRANSIENT, TRUE);
++ gck_builder_add_ulong (&builder, CKA_G_DESTRUCT_AFTER, lifetime);
++
++ } else if (g_strcmp0 (method, GCR_UNLOCK_OPTION_SESSION)){
++ g_message ("Unsupported gpg-cache-method setting: %s", method);
++ }
++
+ gck_builder_add_string (&builder, CKA_G_COLLECTION, "session");
++ g_free (method);
++ }
+
+ /* Now actually save the password */
+ attrs = gck_attributes_ref_sink (gck_builder_end (&builder));
+ do_save_password (session, keyid, description, password, attrs);
+ gck_attributes_unref (attrs);
+-
+- save_unlock_options (prompt);
+ }
+
+ g_clear_object (&prompt);
+--
+1.7.10.4
+
diff -Nru gnome-keyring-3.4.1/debian/patches/0003-secret-store-Mark-a-secret-item-as-used-when-accesse.patch gnome-keyring-3.4.1/debian/patches/0003-secret-store-Mark-a-secret-item-as-used-when-accesse.patch
--- gnome-keyring-3.4.1/debian/patches/0003-secret-store-Mark-a-secret-item-as-used-when-accesse.patch 1970-01-01 01:00:00.000000000 +0100
+++ gnome-keyring-3.4.1/debian/patches/0003-secret-store-Mark-a-secret-item-as-used-when-accesse.patch 2012-08-19 14:29:37.000000000 +0200
@@ -0,0 +1,27 @@
+From 5dff623470b859e332dbe12afb0dc57b292832d2 Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw@gnome.org>
+Date: Wed, 8 Aug 2012 15:08:22 +0200
+Subject: [PATCH 3/3] secret-store: Mark a secret item as 'used' when accessed
+
+ * This makes the gpg-agent idle feature work correctly
+
+https://bugzilla.gnome.org/show_bug.cgi?id=681081
+---
+ pkcs11/secret-store/gkm-secret-item.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pkcs11/secret-store/gkm-secret-item.c b/pkcs11/secret-store/gkm-secret-item.c
+index d03c4a8..15791a9 100644
+--- a/pkcs11/secret-store/gkm-secret-item.c
++++ b/pkcs11/secret-store/gkm-secret-item.c
+@@ -224,6 +224,7 @@ gkm_secret_item_real_get_attribute (GkmObject *base, GkmSession *session, CK_ATT
+ identifier = gkm_secret_object_get_identifier (GKM_SECRET_OBJECT (self));
+ secret = gkm_secret_data_get_raw (sdata, identifier, &n_secret);
+ rv = gkm_attribute_set_data (attr, secret, n_secret);
++ gkm_object_mark_used (base);
+ g_object_unref (sdata);
+ return rv;
+
+--
+1.7.10.4
+
diff -Nru gnome-keyring-3.4.1/debian/patches/series gnome-keyring-3.4.1/debian/patches/series
--- gnome-keyring-3.4.1/debian/patches/series 2012-05-19 01:56:42.000000000 +0200
+++ gnome-keyring-3.4.1/debian/patches/series 2012-08-19 14:30:21.000000000 +0200
@@ -1 +1,4 @@
03_kfreebsd.patch
+0001-schema-Update-description-for-gpg-cache-method.patch
+0002-gpg-agent-Hook-up-the-TTL-cache-option.patch
+0003-secret-store-Mark-a-secret-item-as-used-when-accesse.patch
diff -Nru gtk+3.0-3.4.2/debian/changelog gtk+3.0-3.4.2/debian/changelog
--- gtk+3.0-3.4.2/debian/changelog 2012-06-30 17:02:47.000000000 +0200
+++ gtk+3.0-3.4.2/debian/changelog 2012-08-06 22:07:47.000000000 +0200
@@ -1,3 +1,26 @@
+gtk+3.0 (3.4.2-3) unstable; urgency=low
+
+ [ Josselin Mouette ]
+ * Update xrandr epoch.
+
+ [ Michael Biebl ]
+ * debian/libgtk-3-0.postrm.in: Drop "rm -rf /etc/gtk-3.0/" on purge since
+ this removes files owned by libgtk-3-common. Those bits were copied over
+ from the gtk+2.0 package but they are actually obsolete and no longer
+ required. Closes: #681198
+ * debian/patches/073_transparent_colors.patch: Handle transparent colors
+ better in GtkStyle emulation. Patch cherry-picked from upstream Git.
+ Closes: #669694
+ * debian/patches/070_revert-widget-set-up-signals-after-initializing.patch:
+ This patch was a temporary workaround for a bug in mutter which has been
+ fixed in version 3.4. It was not supposed to be shipped as part of wheezy,
+ so drop it again.
+ * If the NEWS or README file is larger than 4k in size append a .gz suffix
+ as dh_compress will compress those files. This avoids dangling symlinks.
+ Closes: #679754
+
+ -- Michael Biebl <biebl@debian.org> Mon, 06 Aug 2012 21:40:53 +0200
+
gtk+3.0 (3.4.2-2) unstable; urgency=low
* debian/patches/072_statusicon_icon_size.patch: Fix how we determine the
diff -Nru gtk+3.0-3.4.2/debian/control gtk+3.0-3.4.2/debian/control
--- gtk+3.0-3.4.2/debian/control 2012-06-30 17:10:26.000000000 +0200
+++ gtk+3.0-3.4.2/debian/control 2012-08-06 22:10:56.000000000 +0200
@@ -19,7 +19,7 @@
libx11-dev (>= 2:1.3.3-2),
libxext-dev (>= 2:1.1.1-3),
libxi-dev (>= 2:1.3-4),
- libxrandr-dev (>= 1:1.2.99),
+ libxrandr-dev (>= 2:1.2.99),
libxt-dev,
libxrender-dev (>= 1:0.9.5-2),
libxft-dev,
diff -Nru gtk+3.0-3.4.2/debian/control.in gtk+3.0-3.4.2/debian/control.in
--- gtk+3.0-3.4.2/debian/control.in 2012-06-30 17:12:45.000000000 +0200
+++ gtk+3.0-3.4.2/debian/control.in 2012-08-06 22:12:39.000000000 +0200
@@ -19,7 +19,7 @@
libx11-dev (>= 2:1.3.3-2),
libxext-dev (>= 2:1.1.1-3),
libxi-dev (>= 2:1.3-4),
- libxrandr-dev (>= 1:1.2.99),
+ libxrandr-dev (>= 2:1.2.99),
libxt-dev,
libxrender-dev (>= 1:0.9.5-2),
libxft-dev,
diff -Nru gtk+3.0-3.4.2/debian/libgtk-3-0-dbg.links.in gtk+3.0-3.4.2/debian/libgtk-3-0-dbg.links.in
--- gtk+3.0-3.4.2/debian/libgtk-3-0-dbg.links.in 2011-11-18 22:55:57.000000000 +0100
+++ gtk+3.0-3.4.2/debian/libgtk-3-0-dbg.links.in 2012-08-06 21:03:44.000000000 +0200
@@ -1,2 +1,2 @@
-usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@DEBUG_PKG@/NEWS.gz
-usr/share/doc/@COMMON_PKG@/README usr/share/doc/@DEBUG_PKG@/README
+usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@DEBUG_PKG@/@NEWS@
+usr/share/doc/@COMMON_PKG@/@README@ usr/share/doc/@DEBUG_PKG@/@README@
diff -Nru gtk+3.0-3.4.2/debian/libgtk-3-0.links.in gtk+3.0-3.4.2/debian/libgtk-3-0.links.in
--- gtk+3.0-3.4.2/debian/libgtk-3-0.links.in 2011-11-18 22:56:03.000000000 +0100
+++ gtk+3.0-3.4.2/debian/libgtk-3-0.links.in 2012-08-06 21:04:11.000000000 +0200
@@ -1,2 +1,2 @@
-usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@SHARED_PKG@/NEWS.gz
-usr/share/doc/@COMMON_PKG@/README usr/share/doc/@SHARED_PKG@/README
+usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@SHARED_PKG@/@NEWS@
+usr/share/doc/@COMMON_PKG@/@README@ usr/share/doc/@SHARED_PKG@/@README@
diff -Nru gtk+3.0-3.4.2/debian/libgtk-3-0.postrm.in gtk+3.0-3.4.2/debian/libgtk-3-0.postrm.in
--- gtk+3.0-3.4.2/debian/libgtk-3-0.postrm.in 2011-06-03 22:47:03.000000000 +0200
+++ gtk+3.0-3.4.2/debian/libgtk-3-0.postrm.in 2012-08-01 02:12:09.000000000 +0200
@@ -2,12 +2,6 @@
set -e
-case "$1" in
- purge)
- rm -rf /@CONFDIR@
- ;;
-esac
-
#DEBHELPER#
if [ -d /@MODULES_BASE_PATH@ ]; then
diff -Nru gtk+3.0-3.4.2/debian/libgtk-3-bin.links.in gtk+3.0-3.4.2/debian/libgtk-3-bin.links.in
--- gtk+3.0-3.4.2/debian/libgtk-3-bin.links.in 2011-11-24 18:13:48.000000000 +0100
+++ gtk+3.0-3.4.2/debian/libgtk-3-bin.links.in 2012-08-06 21:04:38.000000000 +0200
@@ -1,3 +1,3 @@
@LIBDIR@/@SHARED_PKG@/gtk-update-icon-cache-3.0 usr/bin/gtk-update-icon-cache-3.0
-usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@BIN_PKG@/NEWS.gz
-usr/share/doc/@COMMON_PKG@/README usr/share/doc/@BIN_PKG@/README
+usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@BIN_PKG@/@NEWS@
+usr/share/doc/@COMMON_PKG@/@README@ usr/share/doc/@BIN_PKG@/@README@
diff -Nru gtk+3.0-3.4.2/debian/libgtk-3-dev.links.in gtk+3.0-3.4.2/debian/libgtk-3-dev.links.in
--- gtk+3.0-3.4.2/debian/libgtk-3-dev.links.in 2011-11-18 22:56:16.000000000 +0100
+++ gtk+3.0-3.4.2/debian/libgtk-3-dev.links.in 2012-08-06 21:05:00.000000000 +0200
@@ -1,2 +1,2 @@
-usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@DEV_PKG@/NEWS.gz
-usr/share/doc/@COMMON_PKG@/README usr/share/doc/@DEV_PKG@/README
+usr/share/doc/@COMMON_PKG@/@NEWS@ usr/share/doc/@DEV_PKG@/@NEWS@
+usr/share/doc/@COMMON_PKG@/@README@ usr/share/doc/@DEV_PKG@/@README@
diff -Nru gtk+3.0-3.4.2/debian/patches/070_revert-widget-set-up-signals-after-initializing.patch gtk+3.0-3.4.2/debian/patches/070_revert-widget-set-up-signals-after-initializing.patch
--- gtk+3.0-3.4.2/debian/patches/070_revert-widget-set-up-signals-after-initializing.patch 2012-04-19 02:45:51.000000000 +0200
+++ gtk+3.0-3.4.2/debian/patches/070_revert-widget-set-up-signals-after-initializing.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-From 502d6cb9bc75370ed0692849c65c89d52e818a96 Mon Sep 17 00:00:00 2001
-From: Michael Biebl <biebl@debian.org>
-Date: Wed, 28 Mar 2012 06:10:17 +0200
-Subject: [PATCH] Revert "widget: Set up signals after initializing style
- context"
-
-This reverts commit 5d579811843f81db9866ac81afc5297f776cfb3b.
-
-This change breaks the window decorations in gnome-shell resp. mutter 3.2.
-It can be dropped again, once GNOME 3.4 is in unstable.
----
- gtk/gtkwidget.c | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-Index: gtk+-3.4.1/gtk/gtkwidget.c
-===================================================================
---- gtk+-3.4.1.orig/gtk/gtkwidget.c 2012-04-13 02:31:42.000000000 +0200
-+++ gtk+-3.4.1/gtk/gtkwidget.c 2012-04-15 20:55:33.278308259 +0200
-@@ -14119,6 +14119,9 @@
-
- gtk_style_context_set_direction (priv->context, gtk_widget_get_direction (widget));
-
-+ g_signal_connect (widget->priv->context, "changed",
-+ G_CALLBACK (style_context_changed), widget);
-+
- screen = gtk_widget_get_screen (widget);
- if (screen)
- gtk_style_context_set_screen (priv->context, screen);
-@@ -14127,9 +14130,6 @@
- if (priv->parent)
- gtk_style_context_set_parent (priv->context,
- gtk_widget_get_style_context (priv->parent));
--
-- g_signal_connect (widget->priv->context, "changed",
-- G_CALLBACK (style_context_changed), widget);
- }
-
- return widget->priv->context;
diff -Nru gtk+3.0-3.4.2/debian/patches/073_transparent_colors.patch gtk+3.0-3.4.2/debian/patches/073_transparent_colors.patch
--- gtk+3.0-3.4.2/debian/patches/073_transparent_colors.patch 1970-01-01 01:00:00.000000000 +0100
+++ gtk+3.0-3.4.2/debian/patches/073_transparent_colors.patch 2012-08-06 18:43:25.000000000 +0200
@@ -0,0 +1,33 @@
+From 72feb95edb6ab8c3fac27c0c32afeb2b2f61bd1c Mon Sep 17 00:00:00 2001
+From: Alexander Larsson <alexl@redhat.com>
+Date: Thu, 28 Jun 2012 19:30:24 +0000
+Subject: Handle transparent colors better in GtkStyle emulation
+
+We can't expose colors with alpha in the GtkStyle colors, since
+GdkColor has no alpha. Currently we throw away alpha completely,
+which fails very badly for completely transparent backgrounds,
+which now is the default for most widgets, as it typically
+end up with black-on-black.
+
+We handle this by falling back on the default/previous colors for
+transparent colors. This is is simple and avoids complete failure.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=671437
+
+(cherry picked from commit 10423726709539724be0ea19bed76ba4331af774)
+---
+diff --git a/gtk/deprecated/gtkstyle.c b/gtk/deprecated/gtkstyle.c
+index 5266368..16e3ce4 100644
+--- a/gtk/deprecated/gtkstyle.c
++++ b/gtk/deprecated/gtkstyle.c
+@@ -673,7 +673,7 @@ set_color (GtkStyle *style,
+ break;
+ }
+
+- if (color)
++ if (color && color->alpha > 0.01)
+ {
+ dest->pixel = 0;
+ dest->red = CLAMP ((guint) (color->red * 65535), 0, 65535);
+--
+cgit v0.9.0.2
diff -Nru gtk+3.0-3.4.2/debian/patches/series gtk+3.0-3.4.2/debian/patches/series
--- gtk+3.0-3.4.2/debian/patches/series 2012-06-30 16:45:16.000000000 +0200
+++ gtk+3.0-3.4.2/debian/patches/series 2012-08-06 20:18:31.000000000 +0200
@@ -8,6 +8,6 @@
044_tracker_fts.patch
060_ignore-random-icons.patch
061_multiarch_module_fallback.patch
-070_revert-widget-set-up-signals-after-initializing.patch
071_fix-installation-of-HTML-images.patch
072_statusicon_icon_size.patch
+073_transparent_colors.patch
diff -Nru gtk+3.0-3.4.2/debian/rules gtk+3.0-3.4.2/debian/rules
--- gtk+3.0-3.4.2/debian/rules 2012-05-21 08:37:11.000000000 +0200
+++ gtk+3.0-3.4.2/debian/rules 2012-08-06 21:16:26.000000000 +0200
@@ -49,6 +49,11 @@
DEBUG_PKG := $(SHARED_PKG)-dbg
EXAMPLES_PKG := gtk-$(APIVER)-examples
+# files larger than 4k in size will be compressed by dh_compress
+# so append a .gz suffix to avoid dangling symlinks
+NEWS := NEWS$(shell find -maxdepth 1 -size +4k -name NEWS -exec echo ".gz" \;)
+README := README$(shell find -maxdepth 1 -size +4k -name README -exec echo ".gz" \;)
+
DEB_DH_INSTALL_ARGS += --sourcedir=debian/install/shared
DEB_DH_INSTALL_ARGS_$(UDEB_PKG) += --sourcedir=debian/install/shared_udeb
@@ -107,6 +112,8 @@
-e 's#@CONFDIR@#$(CONFDIR)#g' \
-e "s#@MODULES_BASE_PATH@#$(MODULES_BASE_PATH)#g" \
-e "s#@OLD_MODULES_BASE_PATH@#$(OLD_MODULES_BASE_PATH)#g" \
+ -e "s#@NEWS@#$(NEWS)#g" \
+ -e "s#@README@#$(README)#g" \
$@.in > $@
clean:: debian/control
diff -Nru metacity-2.34.3/debian/changelog metacity-2.34.3/debian/changelog
--- metacity-2.34.3/debian/changelog 2012-05-30 12:33:47.000000000 +0200
+++ metacity-2.34.3/debian/changelog 2012-08-07 01:37:35.000000000 +0200
@@ -1,3 +1,15 @@
+metacity (1:2.34.3-3) unstable; urgency=low
+
+ [ Josselin Mouette ]
+ * 01_focus_new_window.patch: new patch from upstream bugzilla.
+ Correctly focus new windows even when they appear behind an â??always
+ on topâ?? window. Closes: #515577.
+
+ [ Michael Biebl ]
+ * Rebuild with xz compression for binary packages.
+
+ -- Michael Biebl <biebl@debian.org> Tue, 07 Aug 2012 01:37:33 +0200
+
metacity (1:2.34.3-2) unstable; urgency=low
* Upload to unstable.
diff -Nru metacity-2.34.3/debian/patches/01_focus_new_window.patch metacity-2.34.3/debian/patches/01_focus_new_window.patch
--- metacity-2.34.3/debian/patches/01_focus_new_window.patch 1970-01-01 01:00:00.000000000 +0100
+++ metacity-2.34.3/debian/patches/01_focus_new_window.patch 2012-06-23 22:06:07.000000000 +0200
@@ -0,0 +1,69 @@
+Debian #515577
+GNOME #534752
+
+--- a/src/core/window.c
++++ b/src/core/window.c
+@@ -2045,6 +2045,10 @@
+ windows_overlap (const MetaWindow *w1, const MetaWindow *w2)
+ {
+ MetaRectangle w1rect, w2rect;
++
++ if (w1->minimized || w2->minimized)
++ return FALSE;
++
+ meta_window_get_outer_rect (w1, &w1rect);
+ meta_window_get_outer_rect (w2, &w2rect);
+ return meta_rectangle_overlap (&w1rect, &w2rect);
+@@ -2099,6 +2103,7 @@
+ gboolean takes_focus_on_map;
+ gboolean place_on_top_on_map;
+ gboolean needs_stacking_adjustment;
++ gboolean will_be_covered;
+ MetaWindow *focus_window;
+ guint32 timestamp;
+
+@@ -2116,6 +2121,7 @@
+ did_show = FALSE;
+ window_state_on_map (window, &takes_focus_on_map, &place_on_top_on_map);
+ needs_stacking_adjustment = FALSE;
++ will_be_covered = window_would_be_covered (window);
+
+ meta_topic (META_DEBUG_WINDOW_STATE,
+ "Window %s %s focus on map, and %s place on top on map.\n",
+@@ -2136,7 +2142,7 @@
+
+ if ( focus_window != NULL && window->showing_for_first_time &&
+ ( (!place_on_top_on_map && !takes_focus_on_map) ||
+- window_would_be_covered (window) )
++ will_be_covered )
+ ) {
+ if (meta_window_is_ancestor_of_transient (focus_window, window))
+ {
+@@ -2220,21 +2226,21 @@
+ * in the stack when it doesn't overlap it confusingly places
+ * that new window below a lot of other windows.
+ */
+- if (overlap ||
++ if (!will_be_covered && (overlap ||
+ (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK &&
+- meta_prefs_get_raise_on_click ()))
++ meta_prefs_get_raise_on_click ())))
+ meta_window_stack_just_below (window, focus_window);
+
+- /* If the window will be obscured by the focus window, then the
+- * user might not notice the window appearing so set the
+- * demands attention hint.
++ /* If the window will be obscured by the focus window or a window set to
++ * always on top, then the user might not notice the window appearing so
++ * set the demands attention hint.
+ *
+ * We set the hint ourselves rather than calling
+ * meta_window_set_demands_attention() because that would cause
+ * a recalculation of overlap, and a call to set_net_wm_state()
+ * which we are going to call ourselves here a few lines down.
+ */
+- if (overlap)
++ if (overlap || will_be_covered)
+ window->wm_state_demands_attention = TRUE;
+ }
+
diff -Nru metacity-2.34.3/debian/patches/series metacity-2.34.3/debian/patches/series
--- metacity-2.34.3/debian/patches/series 2011-07-20 01:54:24.000000000 +0200
+++ metacity-2.34.3/debian/patches/series 2012-06-23 22:06:07.000000000 +0200
@@ -1 +1,2 @@
+01_focus_new_window.patch
03_gtop_error.patch
Attachment:
signature.asc
Description: OpenPGP digital signature