[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#781395: marked as done (unblock (pre-approval): mate-control-center/1.8.3+dfsg1-2)

Your message dated Mon, 06 Apr 2015 20:25:08 +0200
with message-id <5522CF84.3090607@thykier.net>
and subject line Re: Bug#781395: unblock (pre-approval): mate-control-center/1.8.3+dfsg1-2
has caused the Debian Bug report #781395,
regarding unblock (pre-approval): mate-control-center/1.8.3+dfsg1-2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
781395: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=781395
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please consider unblocking planned upload of package mate-control-center.

+  * debian/patches (i18n fixes):
+    + Add 0003_fix-i18n-category-names.patch. Fix i18n names of Settings /
+      System sub-categories in MATE control center window. (Closes: #780580).
+    + Add 0004_fix-set-preferred-apps-in-some-locales.patch. Fix missing preferred
+      applications launcher for Russion and Ukranian locale in common tasks
+      section. (Closes: #781303).
+    + Add 2002_fix-common-tasks-section-for-German-locale.patch. Fix translation
+      of items in the "Common Tasks" section of MATE's control center.

-> Fix several i18n issues in the MATE control center main window.

+  * debian/patches (functionality fixes):
+    + Add 0005_fix-desktop-item-launching.patch. In libslab: do not reap child
+      when launching desktop items. (Closes: #781247).

-> Don't double fork applications launched via .desktop file. Fixes .desktop launching
containing pkexec calls in certain situations.

+  * debian/control:
+    + Switch to versioned D (mate-control-center): mate-desktop (>= 1.8.1+dfsg1-3).
+      (required by new patch 0005_fix-desktop-item-launching.patch).

-> This updated package revisions requires mate-desktop 1.8.1+dfsg1-3 to
be accepted for jessie, as well.

light+love,
Mike

unblock mate-control-center/1.8.3+dfsg1-2

-- 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 mate-control-center-1.8.3+dfsg1/debian/changelog mate-control-center-1.8.3+dfsg1/debian/changelog
--- mate-control-center-1.8.3+dfsg1/debian/changelog	2014-10-22 23:05:07.000000000 +0200
+++ mate-control-center-1.8.3+dfsg1/debian/changelog	2015-03-28 15:17:04.000000000 +0100
@@ -1,3 +1,22 @@
+mate-control-center (1.8.3+dfsg1-2) unstable; urgency=medium
+
+  * debian/patches (i18n fixes):
+    + Add 0003_fix-i18n-category-names.patch. Fix i18n names of Settings /
+      System sub-categories in MATE control center window. (Closes: #780580).
+    + Add 0004_fix-set-preferred-apps-in-some-locales.patch. Fix missing preferred
+      applications launcher for Russion and Ukranian locale in common tasks
+      section. (Closes: #781303).
+    + Add 2002_fix-common-tasks-section-for-German-locale.patch. Fix translation
+      of items in the "Common Tasks" section of MATE's control center.
+  * debian/patches (functionality fixes):
+    + Add 0005_fix-desktop-item-launching.patch. In libslab: do not reap child
+      when launching desktop items. (Closes: #781247).
+  * debian/control:
+    + Switch to versioned D (mate-control-center): mate-desktop (>= 1.8.1+dfsg1-3).
+      (required by new patch 0005_fix-desktop-item-launching.patch).
+
+ -- Mike Gabriel <sunweaver@debian.org>  Sat, 28 Mar 2015 15:16:54 +0100
+
 mate-control-center (1.8.3+dfsg1-1) unstable; urgency=medium
 
   [ Vangelis Mouhtsis ]
diff -Nru mate-control-center-1.8.3+dfsg1/debian/control mate-control-center-1.8.3+dfsg1/debian/control
--- mate-control-center-1.8.3+dfsg1/debian/control	2014-10-06 23:57:54.000000000 +0200
+++ mate-control-center-1.8.3+dfsg1/debian/control	2015-03-28 14:29:50.000000000 +0100
@@ -57,7 +57,7 @@
          caja-common (>= 1.8.0),
          mate-settings-daemon,
          mate-menus,
-         mate-desktop,
+         mate-desktop (>= 1.8.1+dfsg1-3),
          mate-icon-theme,
          desktop-file-utils,
          gsettings-desktop-schemas,
diff -Nru mate-control-center-1.8.3+dfsg1/debian/patches/0003_fix-i18n-category-names.patch mate-control-center-1.8.3+dfsg1/debian/patches/0003_fix-i18n-category-names.patch
--- mate-control-center-1.8.3+dfsg1/debian/patches/0003_fix-i18n-category-names.patch	1970-01-01 01:00:00.000000000 +0100
+++ mate-control-center-1.8.3+dfsg1/debian/patches/0003_fix-i18n-category-names.patch	2015-03-28 14:22:05.000000000 +0100
@@ -0,0 +1,52 @@
+From 5ebc88406f51fe36bfb03319f1d4fb5ed8888b55 Mon Sep 17 00:00:00 2001
+From: rezso <rezso@rezso.net>
+Date: Sun, 25 Jan 2015 17:13:08 +0100
+Subject: [PATCH] Use MATE's own .directory files in matecc
+
+First: Personal.directory, InternetAndNetwork.directory, Hardware.directory and System.directory shipped by gnome-menus, which is causes an unwanted gnome-menus dependency.
+Second: because of different gettext domains, the translations are unused.
+---
+ shell/matecc.menu | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/shell/matecc.menu b/shell/matecc.menu
+index b0beba5..a99fdf7 100644
+--- a/shell/matecc.menu
++++ b/shell/matecc.menu
+@@ -46,7 +46,7 @@
+   <!-- Personal category -->
+   <Menu>
+     <Name>Personal</Name>
+-    <Directory>Personal.directory</Directory>
++    <Directory>mate-personal.directory</Directory>
+     <Include>
+       <And>
+         <Category>Settings</Category>
+@@ -62,7 +62,7 @@
+   <!-- Internet and Network category -->
+   <Menu>
+     <Name>Internet and Network</Name>
+-    <Directory>InternetAndNetwork.directory</Directory>
++    <Directory>mate-internet-and-network.directory</Directory>
+     <Include>
+       <And>
+         <Category>Settings</Category>
+@@ -74,7 +74,7 @@
+   <!-- Hardware category -->
+   <Menu>
+     <Name>Hardware</Name>
+-    <Directory>Hardware.directory</Directory>
++    <Directory>mate-hardware.directory</Directory>
+     <Include>
+       <And>
+         <Category>Settings</Category>
+@@ -86,7 +86,7 @@
+   <!-- System category -->
+   <Menu>
+     <Name>System</Name>
+-    <Directory>System.directory</Directory>
++    <Directory>mate-system.directory</Directory>
+     <Include>
+       <And>
+         <Category>Settings</Category>
+
diff -Nru mate-control-center-1.8.3+dfsg1/debian/patches/0004_fix-set-preferred-apps-in-some-locales.patch mate-control-center-1.8.3+dfsg1/debian/patches/0004_fix-set-preferred-apps-in-some-locales.patch
--- mate-control-center-1.8.3+dfsg1/debian/patches/0004_fix-set-preferred-apps-in-some-locales.patch	1970-01-01 01:00:00.000000000 +0100
+++ mate-control-center-1.8.3+dfsg1/debian/patches/0004_fix-set-preferred-apps-in-some-locales.patch	2015-03-28 14:22:05.000000000 +0100
@@ -0,0 +1,26 @@
+Index: mate-control-center-1.8.3+dfsg1/po/ru.po
+===================================================================
+--- mate-control-center-1.8.3+dfsg1.orig/po/ru.po
++++ mate-control-center-1.8.3+dfsg1/po/ru.po
+@@ -31,7 +31,7 @@ msgstr ""
+ msgid ""
+ "[ 'Change Theme;mate-appearance-properties.desktop', 'Set Preferred "
+ "Applications;mate-default-applications-properties.desktop' ]"
+-msgstr "[ 'Изменить тему;mate-appearance-properties.desktop', 'Выставить предпочтительные приложения;mate-default-applications.desktop']"
++msgstr "[ 'Изменить тему;mate-appearance-properties.desktop', 'Выставить предпочтительные приложения;mate-default-applications-properties.desktop']"
+ 
+ #: ../org.mate.control-center.gschema.xml.in.in.h:2
+ msgid "Task names and associated .desktop files"
+Index: mate-control-center-1.8.3+dfsg1/po/uk.po
+===================================================================
+--- mate-control-center-1.8.3+dfsg1.orig/po/uk.po
++++ mate-control-center-1.8.3+dfsg1/po/uk.po
+@@ -28,7 +28,7 @@ msgstr ""
+ msgid ""
+ "[ 'Change Theme;mate-appearance-properties.desktop', 'Set Preferred "
+ "Applications;mate-default-applications-properties.desktop' ]"
+-msgstr "[ 'Змінити тему;mate-appearance-properties.desktop', 'Виставити бажані додатки;mate-default-applications.desktop']"
++msgstr "[ 'Змінити тему;mate-appearance-properties.desktop', 'Виставити бажані додатки;mate-default-applications-properties.desktop']"
+ 
+ #: ../org.mate.control-center.gschema.xml.in.in.h:2
+ msgid "Task names and associated .desktop files"
diff -Nru mate-control-center-1.8.3+dfsg1/debian/patches/0005_fix-desktop-item-launching.patch mate-control-center-1.8.3+dfsg1/debian/patches/0005_fix-desktop-item-launching.patch
--- mate-control-center-1.8.3+dfsg1/debian/patches/0005_fix-desktop-item-launching.patch	1970-01-01 01:00:00.000000000 +0100
+++ mate-control-center-1.8.3+dfsg1/debian/patches/0005_fix-desktop-item-launching.patch	2015-03-28 14:25:05.000000000 +0100
@@ -0,0 +1,23 @@
+From e1ba5271d8ef3b80e81e8d3f4469fe76d46d6c68 Mon Sep 17 00:00:00 2001
+From: Monsta <monsta@inbox.ru>
+Date: Wed, 25 Mar 2015 15:25:08 +0300
+Subject: [PATCH] libslab: do not reap child when launching desktop items
+
+should be used after https://github.com/mate-desktop/mate-desktop/pull/167 is applied
+---
+ libslab/slab-mate-util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libslab/slab-mate-util.c b/libslab/slab-mate-util.c
+index a4527dc..2acf9d0 100644
+--- a/libslab/slab-mate-util.c
++++ b/libslab/slab-mate-util.c
+@@ -127,7 +127,7 @@ open_desktop_item_exec (MateDesktopItem * desktop_item)
+ 	if (!desktop_item)
+ 		return FALSE;
+ 
+-	mate_desktop_item_launch (desktop_item, NULL, MATE_DESKTOP_ITEM_LAUNCH_ONLY_ONE, &error);
++	mate_desktop_item_launch (desktop_item, NULL, MATE_DESKTOP_ITEM_LAUNCH_ONLY_ONE | MATE_DESKTOP_ITEM_LAUNCH_DO_NOT_REAP_CHILD, &error);
+ 
+ 	if (error)
+ 	{
diff -Nru mate-control-center-1.8.3+dfsg1/debian/patches/2002_fix-common-tasks-section-for-German-locale.patch mate-control-center-1.8.3+dfsg1/debian/patches/2002_fix-common-tasks-section-for-German-locale.patch
--- mate-control-center-1.8.3+dfsg1/debian/patches/2002_fix-common-tasks-section-for-German-locale.patch	1970-01-01 01:00:00.000000000 +0100
+++ mate-control-center-1.8.3+dfsg1/debian/patches/2002_fix-common-tasks-section-for-German-locale.patch	2015-03-28 15:10:22.000000000 +0100
@@ -0,0 +1,14 @@
+Description: Quotation mark fix in German translation file.
+Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
+
+--- a/po/de.po
++++ b/po/de.po
+@@ -40,7 +40,7 @@
+ msgid ""
+ "[ 'Change Theme;mate-appearance-properties.desktop', 'Set Preferred "
+ "Applications;mate-default-applications-properties.desktop' ]"
+-msgstr "[ »Thema ändern;mate-appearance-properties.desktop«, »Bevorzugte Anwendungen einstellen;mate-default-applications-properties.desktop« ]"
++msgstr "[ 'Thema ändern;mate-appearance-properties.desktop', 'Bevorzugte Anwendungen einstellen;mate-default-applications-properties.desktop' ]"
+ 
+ #: ../org.mate.control-center.gschema.xml.in.in.h:2
+ msgid "Task names and associated .desktop files"
diff -Nru mate-control-center-1.8.3+dfsg1/debian/patches/series mate-control-center-1.8.3+dfsg1/debian/patches/series
--- mate-control-center-1.8.3+dfsg1/debian/patches/series	2014-10-22 23:01:20.000000000 +0200
+++ mate-control-center-1.8.3+dfsg1/debian/patches/series	2015-03-28 15:08:32.000000000 +0100
@@ -1,4 +1,8 @@
 0001_fix-NEWS-1.8.3.patch
 0002_initialize-mouse-focus-checkbox.patch
+0003_fix-i18n-category-names.patch
+0004_fix-set-preferred-apps-in-some-locales.patch
+0005_fix-desktop-item-launching.patch
 1005_rename-libslab-to-libmate-slab0.patch
 2001_omit-gfdl-licensed-help-files.patch
+2002_fix-common-tasks-section-for-German-locale.patch

--- End Message ---
--- Begin Message --- 
On 2015-04-06 11:58, Mike Gabriel wrote:
> Control: tags -1 - moreinfo
> 
> ----- Original message -----
>> [...]
>>
>> Approved, provided it is uploaded in time to reach testing before the
>> quiet period (i.e. it is in testing before the 18th of April).
>>
> 
> Uploaded and accepted in unstable.
> 
> light+love,
> Mike
> 

Unblocked, thanks.

~Niels

--- End Message ---
Reply to: