Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package marco + * debian/patches: + + Add 0006_correct-name-for-missing-icon.patch. Use correct name for + missing icon. (Closes: #778824). -> Fix crashes if marco tries to load incorrect missing icon. As discussed with Niels in private mails, I have already uploaded this package. NOTE: other than the previous unblock request for marco/1.8.2+dfsg1-5, this package does not contain any glib-2.43 related patchwork. light+love, Mike unblock marco/1.8.2+dfsg1-5 -- System Information: Debian Release: 8.0 APT prefers stable APT policy: (990, 'stable'), (500, 'testing-updates'), (500, 'testing-proposed-updates'), (500, 'testing') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: sysvinit (via /sbin/init)
diff -Nru marco-1.8.2+dfsg1/debian/changelog marco-1.8.2+dfsg1/debian/changelog --- marco-1.8.2+dfsg1/debian/changelog 2015-03-09 06:00:01.000000000 +0100 +++ marco-1.8.2+dfsg1/debian/changelog 2015-03-09 06:04:33.000000000 +0100 @@ -1,3 +1,11 @@ +marco (1.8.2+dfsg1-5) unstable; urgency=medium + + * debian/patches: + + Add 0006_correct-name-for-missing-icon.patch. Use correct name for + missing icon. (Closes: #778824). + + -- Mike Gabriel <sunwea...@debian.org> Mon, 09 Mar 2015 05:54:08 +0100 + marco (1.8.2+dfsg1-4) unstable; urgency=medium * debian/patches: diff -Nru marco-1.8.2+dfsg1/debian/patches/0006_correct-name-for-missing-icon.patch marco-1.8.2+dfsg1/debian/patches/0006_correct-name-for-missing-icon.patch --- marco-1.8.2+dfsg1/debian/patches/0006_correct-name-for-missing-icon.patch 1970-01-01 01:00:00.000000000 +0100 +++ marco-1.8.2+dfsg1/debian/patches/0006_correct-name-for-missing-icon.patch 2015-03-09 06:00:30.000000000 +0100 @@ -0,0 +1,32 @@ +From 429ec1ec0f4e890bac3550db41d13bb07398a952 Mon Sep 17 00:00:00 2001 +From: monsta <mon...@inbox.ru> +Date: Fri, 20 Feb 2015 13:25:24 +0300 +Subject: [PATCH] ui: use correct name for missing icon + +--- + src/ui/ui.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ui/ui.c b/src/ui/ui.c +index c170adb..ce860ca 100644 +--- a/src/ui/ui.c ++++ b/src/ui/ui.c +@@ -846,7 +846,7 @@ meta_ui_get_default_window_icon (MetaUI *ui) + NULL); + else + default_icon = gtk_icon_theme_load_icon (theme, +- "gtk-missing-image", ++ "image-missing", + META_ICON_WIDTH, + 0, + NULL); +@@ -881,7 +881,7 @@ meta_ui_get_default_mini_icon (MetaUI *ui) + NULL); + else + default_icon = gtk_icon_theme_load_icon (theme, +- "gtk-missing-image", ++ "image-missing", + META_MINI_ICON_WIDTH, + 0, + NULL); + diff -Nru marco-1.8.2+dfsg1/debian/patches/series marco-1.8.2+dfsg1/debian/patches/series --- marco-1.8.2+dfsg1/debian/patches/series 2015-03-09 06:00:15.000000000 +0100 +++ marco-1.8.2+dfsg1/debian/patches/series 2015-03-09 06:00:30.000000000 +0100 @@ -3,4 +3,5 @@ 0003_no-shadows-to-ARGB-windows.patch 0004_dont-switch-workspace-when-switching-to-sticky-window.patch 0005_fix-resizing-csd-windows.patch +0006_correct-name-for-missing-icon.patch 2001_omit-gfdl-licensed-theme-documentation.patch
