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

Bug#685456: marked as done (Freeze exception for kde-gtk-config)

Your message dated Mon, 08 Oct 2012 15:24:57 +0200
with message-id <5072D429.5020105@dogguy.org>
and subject line Re: Bug#685456: Freeze exception for kde-gtk-config
has caused the Debian Bug report #685456,
regarding Freeze exception for kde-gtk-config
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.)


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

Dear release team,

Please consider a release exception for the package kde-gtk-config version 2.1-1.

In new upstream release only translations files were updated and one tiny patch
from debian package was accepted.

This upload fixes RC bug #678714 which had prevented automatic migration to
testing before freeze.

File in attachment was produced using command:

$ debdiff kde-gtk-config_2.0-3.dsc kde-gtk-config_2.1-1.dsc | \
    filterdiff -x '*/po/*' -x '*.desktop' > kde-gtk-config_2.0-3:2.1-1.diff

Best regards,
Boris

diff -Nru kde-gtk-config-2.0/debian/changelog kde-gtk-config-2.1/debian/changelog
--- kde-gtk-config-2.0/debian/changelog	2012-06-08 07:07:18.000000000 +0300
+++ kde-gtk-config-2.1/debian/changelog	2012-08-21 00:26:50.000000000 +0300
@@ -1,3 +1,16 @@
+kde-gtk-config (3:2.1-1) unstable; urgency=low
+
+  * Update to stable release 2.1.
+  * Deleted file debian/patches/fix-build-on-kfreebsd-and-hurd-i386:
+    accepted in upstream.
+  * Added file debian/patches/fix-loading-icons:
+    without this patch KDE-GTK-Config module scans ./ directory if option
+    gtk-icon-theme-name or option gtk-fallback-icon-theme is empty or invalid,
+    now first element from the list of found icon themes is used.
+    (Closes: #678714)
+
+ -- Boris Pek <tehnick-8@mail.ru>  Tue, 21 Aug 2012 00:22:23 +0300
+
 kde-gtk-config (3:2.0-3) unstable; urgency=low
 
   * Package moved to unstable after tests: no changes required.
diff -Nru kde-gtk-config-2.0/debian/patches/fix-build-on-kfreebsd-and-hurd-i386 kde-gtk-config-2.1/debian/patches/fix-build-on-kfreebsd-and-hurd-i386
--- kde-gtk-config-2.0/debian/patches/fix-build-on-kfreebsd-and-hurd-i386	2012-06-08 07:06:49.000000000 +0300
+++ kde-gtk-config-2.1/debian/patches/fix-build-on-kfreebsd-and-hurd-i386	1970-01-01 03:00:00.000000000 +0300
@@ -1,15 +0,0 @@
-Description: Fix build in Debian GNU/kFreeBSD and in Debian GNU/Hurd
-Author: Boris Pek <tehnick-8@mail.ru>
-Last-Update: 2012-06-06
-
---- a/gtk3proxies/preview3.c
-+++ b/gtk3proxies/preview3.c
-@@ -24,8 +24,6 @@
- #include <stdio.h>
- #include <assert.h>
- #include <stdlib.h>
--
--#include <sys/inotify.h>
- #include <string.h>
- 
- void printHelp()
diff -Nru kde-gtk-config-2.0/debian/patches/fix-loading-icons kde-gtk-config-2.1/debian/patches/fix-loading-icons
--- kde-gtk-config-2.0/debian/patches/fix-loading-icons	1970-01-01 03:00:00.000000000 +0300
+++ kde-gtk-config-2.1/debian/patches/fix-loading-icons	2012-08-21 00:26:50.000000000 +0300
@@ -0,0 +1,51 @@
+Description: Fix loading icons
+ Without this patch KDE-GTK-Config module scans ./ directory if option
+ gtk-icon-theme-name or option gtk-fallback-icon-theme is empty or invalid.
+ Now first element from the list of found icon themes is used.
+Bug-Debian: http://bugs.debian.org/678714
+Author: Boris Pek <tehnick-8@mail.ru>
+Last-Update: 2012-08-21
+
+--- a/src/gtkconfigkcmodule.cpp
++++ b/src/gtkconfigkcmodule.cpp
+@@ -200,7 +200,9 @@
+ {
+     label->setToolTip(iconName);
+     
+-    QString ret = IconThemesModel::findFilesRecursively(QStringList(iconName+".*"), theme);
++    QString ret;
++    if(!theme.isEmpty())
++        ret = IconThemesModel::findFilesRecursively(QStringList(iconName+".*"), theme);
+     if(!ret.isEmpty()) {
+         QPixmap p(ret);
+         Q_ASSERT(!p.isNull());
+@@ -208,7 +210,9 @@
+         return;
+     }
+     
+-    ret = IconThemesModel::findFilesRecursively(QStringList(iconName+".*"), fallback);
++    if(!fallback.isEmpty())
++        ret = IconThemesModel::findFilesRecursively(QStringList(iconName+".*"), fallback);
++    
+     if(!ret.isEmpty()) {
+         QPixmap p(ret);
+         Q_ASSERT(!p.isNull());
+@@ -401,10 +401,14 @@
+         appareance->gtk3Appearance()->installedThemesNames());
+     
+     //icons
+-    QString currentIcon = useConfig ? appareance->getIcon() : ui->cb_icon->currentText(),
+-            currentFallback = useConfig ? appareance->getIconFallback() : ui->cb_icon_fallback->currentText();
+-    ui->cb_icon->setCurrentIndex(ui->cb_icon->findData(currentIcon, IconThemesModel::DirNameRole));
+-    ui->cb_icon_fallback->setCurrentIndex(ui->cb_icon_fallback->findData(currentFallback, IconThemesModel::DirNameRole));
++    if (ui->cb_icon->count() > 0 && ui->cb_icon_fallback->count() > 0) {
++        QString currentIcon = useConfig ? appareance->getIcon() : ui->cb_icon->currentText(),
++                currentFallback = useConfig ? appareance->getIconFallback() : ui->cb_icon_fallback->currentText();
++        int currentIconIndex = ui->cb_icon->findData(currentIcon, IconThemesModel::DirNameRole),
++            currentFallbackIndex = ui->cb_icon_fallback->findData(currentFallback, IconThemesModel::DirNameRole);
++        ui->cb_icon->setCurrentIndex(currentIconIndex >= 0 ? currentFallbackIndex : 0);
++        ui->cb_icon_fallback->setCurrentIndex(currentFallbackIndex >= 0 ? currentFallbackIndex : 0);
++    }
+     
+     m_saveEnabled = wasenabled;
+ }
diff -Nru kde-gtk-config-2.0/debian/patches/series kde-gtk-config-2.1/debian/patches/series
--- kde-gtk-config-2.0/debian/patches/series	2012-06-08 07:06:49.000000000 +0300
+++ kde-gtk-config-2.1/debian/patches/series	2012-08-21 00:26:50.000000000 +0300
@@ -1,2 +1,2 @@
 mirgation-from-package-src:kcm-gtk
-fix-build-on-kfreebsd-and-hurd-i386
+fix-loading-icons
diff -Nru kde-gtk-config-2.0/gtk3proxies/preview3.c kde-gtk-config-2.1/gtk3proxies/preview3.c
--- kde-gtk-config-2.0/gtk3proxies/preview3.c	2012-03-05 20:02:20.000000000 +0200
+++ kde-gtk-config-2.1/gtk3proxies/preview3.c	2012-06-13 11:13:50.000000000 +0300
@@ -24,8 +24,6 @@
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
-
-#include <sys/inotify.h>
 #include <string.h>
 
 void printHelp()
diff -Nru kde-gtk-config-2.0/kde-gtk-config.desktop kde-gtk-config-2.1/kde-gtk-config.desktop
diff -Nru kde-gtk-config-2.0/po/ca/kde-gtk-config.po kde-gtk-config-2.1/po/ca/kde-gtk-config.po
diff -Nru kde-gtk-config-2.0/po/CMakeLists.txt kde-gtk-config-2.1/po/CMakeLists.txt
diff -Nru kde-gtk-config-2.0/po/de/kde-gtk-config.po kde-gtk-config-2.1/po/de/kde-gtk-config.po
diff -Nru kde-gtk-config-2.0/po/et/kde-gtk-config.po kde-gtk-config-2.1/po/et/kde-gtk-config.po
diff -Nru kde-gtk-config-2.0/po/fr/kde-gtk-config.po kde-gtk-config-2.1/po/fr/kde-gtk-config.po
diff -Nru kde-gtk-config-2.0/po/hu/kde-gtk-config.po kde-gtk-config-2.1/po/hu/kde-gtk-config.po
diff -Nru kde-gtk-config-2.0/po/km/CMakeLists.txt kde-gtk-config-2.1/po/km/CMakeLists.txt
diff -Nru kde-gtk-config-2.0/po/km/kde-gtk-config.po kde-gtk-config-2.1/po/km/kde-gtk-config.po
diff -Nru kde-gtk-config-2.0/po/pl/kde-gtk-config.po kde-gtk-config-2.1/po/pl/kde-gtk-config.po
diff -Nru kde-gtk-config-2.0/po/pt_BR/kde-gtk-config.po kde-gtk-config-2.1/po/pt_BR/kde-gtk-config.po
diff -Nru kde-gtk-config-2.0/po/ru/kde-gtk-config.po kde-gtk-config-2.1/po/ru/kde-gtk-config.po
diff -Nru kde-gtk-config-2.0/po/sk/CMakeLists.txt kde-gtk-config-2.1/po/sk/CMakeLists.txt
diff -Nru kde-gtk-config-2.0/po/sk/kde-gtk-config.po kde-gtk-config-2.1/po/sk/kde-gtk-config.po

--- End Message ---
--- Begin Message --- 
On 18/09/2012 00:21, Boris Pek wrote:
> Hi,
> 
> Updated package (version 3:2.1-1) was uploaded 11 days ago [1] and was built
> fine [2]. And there are no new bug reports.
> 
> So unblock this version of package please.
> 
> While Wheezy is not released yet, some users already faced with problem that
> kde-config-gtk-style is absent in testing [3].
> 

Freeze-exception granted (based on the fact that it was already present
in Squeeze, the RC bug is fixed and it's been a month in Unstable
without new issues).

Kind regards,

-- 
Mehdi Dogguy مهدي الدڤي

--- End Message ---
Reply to: