[SCM] kde-gtk-config packaging branch, master, updated. 0b5d9f716c07195709100119203c42f3603b7830
Maximiliano Curia
maxy at moszumanska.debian.org
Sat Feb 14 08:29:43 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kde-gtk-config.git;a=commitdiff;h=0765223
The following commit has been merged in the master branch:
commit 0765223dc0427a8086805d28c1819871fd1650ba
Author: Harald Sitter <sitter at kde.org>
Date: Tue Jan 13 10:37:56 2015 +0100
New upstream release
* New upstream release
* Bump dh compat to 9
* Switch to autpkgtest since tests require fonts.
* Drop all patches, no longer applicable due to kf5 port.
---
debian/changelog | 9 +++++
debian/compat | 2 +-
debian/control | 29 +++++++++-----
debian/copyright | 4 +-
debian/kde-config-gtk-style-preview.install | 4 +-
debian/kde-config-gtk-style.install | 9 ++---
debian/patches/fix-desktop-file.patch | 40 --------------------
debian/patches/fix-loading-config-options.patch | 44 ----------------------
.../migration-from-package-src:kcm-gtk.patch | 27 -------------
debian/patches/series | 3 --
debian/rules | 17 +--------
debian/tests/control | 4 ++
debian/tests/testsuite | 10 +++++
debian/tests/testsuite.xsession | 8 ++++
14 files changed, 60 insertions(+), 150 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 938957d..3f3580e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+kde-gtk-config (4:5.1.95-0ubuntu1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ * Bump dh compat to 9
+ * Switch to autpkgtest since tests require fonts.
+ * Drop all patches, no longer applicable due to kf5 port.
+
+ -- Harald Sitter <sitter at kde.org> Tue, 13 Jan 2015 10:12:58 +0100
+
kde-gtk-config (3:2.2.1-1) unstable; urgency=low
* Update to stable release 2.2.1.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 7f9a294..5a186ea 100644
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,28 @@
Source: kde-gtk-config
Section: kde
Priority: optional
-Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Boris Pek <tehnick-8 at mail.ru>
-Build-Depends: debhelper (>= 8), cmake,
- kdelibs5-dev, pkg-kde-tools, libgtk2.0-dev, libgtk-3-dev
-Homepage: https://projects.kde.org/projects/extragear/base/kde-gtk-config
-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kde-gtk-config.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/kde-gtk-config.git
-Standards-Version: 3.9.4
+Build-Depends: cmake,
+ debhelper (>= 8),
+ extra-cmake-modules,
+ libgtk-3-dev,
+ libgtk2.0-dev,
+ libkf5archive-dev,
+ libkf5configwidgets-dev,
+ libkf5i18n-dev,
+ libkf5kcmutils-dev,
+ libkf5newstuff-dev,
+ pkg-kde-tools
+Homepage: https://projects.kde.org/projects/kde/workspace/kde-gtk-config
+Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/kde-gtk-config.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/plasma/kde-gtk-config.git
+Standards-Version: 3.9.6
+XS-Testsuite: autopkgtest
Package: kde-config-gtk-style
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: kde-config-gtk-style-preview
Description: KDE configuration module for GTK+ 2.x and GTK+ 3.x styles selection
Configuration dialog to adapt GTK+ applications appearance to your taste
@@ -28,9 +38,8 @@ Description: KDE configuration module for GTK+ 2.x and GTK+ 3.x styles selection
Package: kde-config-gtk-style-preview
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: kde-config-gtk-style
-Breaks: kde-config-gtk-style (<< 3:2.1.1-1~exp1~)
Description: KDE configuration module for GTK+ 2.x and GTK+ 3.x styles selection (extras)
Configuration dialog to adapt GTK+ applications appearance to your taste
under KDE. Among its many features, it lets you:
diff --git a/debian/copyright b/debian/copyright
index 344bea1..fa42005 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,7 +21,7 @@ License: GPL-2 or GPL-3+
published by the Free Software Foundation; either version 2 of
the License or (at your option) version 3 or any later version
accepted by the membership of KDE e.V. (or its successor approved
- by the membership of KDE e.V.), which shall act as a proxy
+ by the membership of KDE e.V.), which shall act as a proxy
defined in Section 14 of version 3 of the license.
.
This program is distributed in the hope that it will be useful,
@@ -55,7 +55,7 @@ License: LGPL-2.1 or LGPL-3+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
.
- You should have received a copy of the GNU Lesser General Public
+ You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licenses/>.
Files: cmake/modules/FindGTK*.cmake
diff --git a/debian/kde-config-gtk-style-preview.install b/debian/kde-config-gtk-style-preview.install
index 8e0a518..59d6530 100644
--- a/debian/kde-config-gtk-style-preview.install
+++ b/debian/kde-config-gtk-style-preview.install
@@ -1,2 +1,2 @@
-usr/lib/kde4/libexec/gtk_preview
-usr/lib/kde4/libexec/gtk3_preview
+usr/lib/*/libexec/gtk3_preview
+usr/lib/*/libexec/gtk_preview
diff --git a/debian/kde-config-gtk-style.install b/debian/kde-config-gtk-style.install
index 5961101..9a96778 100644
--- a/debian/kde-config-gtk-style.install
+++ b/debian/kde-config-gtk-style.install
@@ -1,5 +1,4 @@
-usr/lib/kde4/kcm_cgc.so
-usr/lib/kde4/libexec/reload_gtk_apps
-usr/share/icons
-usr/share/kde4
-usr/share/locale
+etc/
+usr/lib/*/libexec/reload_gtk_apps
+usr/lib/*/qt5/plugins/kcm_kdegtkconfig.so
+usr/share/
diff --git a/debian/patches/fix-desktop-file.patch b/debian/patches/fix-desktop-file.patch
deleted file mode 100644
index 789ab12..0000000
--- a/debian/patches/fix-desktop-file.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Fix desktop file
- There are such errors in original desktop file:
- 1) kde-gtk-config.desktop: hint: value "Qt;KDE;X-KDE-settings-looknfeel;" for
- key "Categories" in group "Desktop Entry" does not contain a registered
- main category; application might only show up in a "catch-all" section of
- the application menu
- 2) kde-gtk-config.desktop: error: key "Categories" is present in group
- "Desktop Entry", but the type is "Service" while this key is only valid
- for type "Application"
- 3) kde-gtk-config.desktop: error: key "Exec" is present in group "Desktop
- Entry", but the type is "Service" while this key is only valid for type
- "Application"
- Use desktop-file-validate tool to check.
- .
- Also there is a strange bug with displaying icon in KDE 4.8.4 and
- SystemSettings 1.0: if icon name begins from "kde-" then K-menu icon is shown
- no matter what characters are in the end. That is why kde-gtk-config is
- renamed to gtkconfig.
-Author: Boris Pek <tehnick-8 at mail.ru>
-Last-Update: 2013-05-21
-Forwarded: no
-
---- a/kde-gtk-config.desktop
-+++ b/kde-gtk-config.desktop
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Categories=Qt;KDE;X-KDE-settings-looknfeel;
- Comment=Configuration of the style of GTK applications
- Comment[ca]=Configuració de l'estil de les aplicacions GTK
- Comment[cs]=Nastavení stylu aplikací GTK
-@@ -33,8 +32,7 @@
- Comment[x-test]=xxConfiguration of the style of GTK applicationsxx
- Comment[zh_CN]=GTK 应用程序风格配置
- Comment[zh_TW]=設定 GTK 應用程式的樣式
--Exec=kcmshell4 kde-gtk-config
--Icon=kde-gtk-config
-+Icon=gtkconfig
- Name=GTK
- Name[ca]=GTK
- Name[cs]=GTK
diff --git a/debian/patches/fix-loading-config-options.patch b/debian/patches/fix-loading-config-options.patch
deleted file mode 100644
index 1b8533f..0000000
--- a/debian/patches/fix-loading-config-options.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Fix loading of config options
-Bug-Debian: http://bugs.debian.org/708169
-Author: Boris Pek <tehnick-8 at mail.ru>
-Last-Update: 2013-05-21
-Forwarded: no
-
---- a/src/abstractappearance.cpp
-+++ b/src/abstractappearance.cpp
-@@ -48,7 +48,8 @@
- {
- QMap<QString, QString> ret;
- QTextStream flow(device);
-- for(QString line = flow.readLine(); !flow.atEnd(); line = flow.readLine()) {
-+ for(QString line; !flow.atEnd(); ) {
-+ line = flow.readLine();
- if(valueRx.exactMatch(line))
- ret[valueRx.cap(1)] = valueRx.cap(2);
- else if(line.startsWith("include \"")) {
---- a/src/appearancegtk2.cpp
-+++ b/src/appearancegtk2.cpp
-@@ -108,8 +108,8 @@
- flow << "gtk-icon-theme-name=\""<< m_settings["icon"] << "\"
";
- flow << "gtk-fallback-icon-theme=\"" << m_settings["icon_fallback"] << "\"
";
- flow << "gtk-toolbar-style=" << m_settings["toolbar_style"] << "
";
-- flow << "gtk-menu-images=" << m_settings["show_icons_buttons"] << "
";
-- flow << "gtk-button-images=" << m_settings["show_icons_menus"] << "
";
-+ flow << "gtk-menu-images=" << m_settings["show_icons_menus"] << "
";
-+ flow << "gtk-button-images=" << m_settings["show_icons_buttons"] << "
";
-
- //we're done with the ~/.gtk-2.0 file
- gtkrc.close();
---- a/src/appearancegtk3.cpp
-+++ b/src/appearancegtk3.cpp
-@@ -69,8 +69,8 @@
- flow3 << "gtk-icon-theme-name="<< m_settings["icon"] << "
";
- flow3 << "gtk-fallback-icon-theme=" << m_settings["icon_fallback"] << "
";
- flow3 << "gtk-toolbar-style=" << m_settings["toolbar_style"] << "
";
-- flow3 << "gtk-menu-images=" << m_settings["show_icons_buttons"] << "
";
-- flow3 << "gtk-button-images=" << m_settings["show_icons_menus"] << "
";
-+ flow3 << "gtk-menu-images=" << m_settings["show_icons_menus"] << "
";
-+ flow3 << "gtk-button-images=" << m_settings["show_icons_buttons"] << "
";
-
- return true;
- }
diff --git a/debian/patches/migration-from-package-src:kcm-gtk.patch b/debian/patches/migration-from-package-src:kcm-gtk.patch
deleted file mode 100644
index 5dd308b..0000000
--- a/debian/patches/migration-from-package-src:kcm-gtk.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Migration from package src:kcm-gtk
- This patch provides smooth migration from package src:kcm-gtk to new
- package src:kde-gtk-config. Old configuration file ~/.gtkrc-2.0-kde
- is moved to ~/.gtkrc-2.0.
-Author: Boris Pek <tehnick-8 at mail.ru>
-Last-Update: 2013-05-19
-
---- a/src/gtkconfigkcmodule.cpp
-+++ b/src/gtkconfigkcmodule.cpp
-@@ -72,6 +72,17 @@
- ui->cb_icon->setModel(m_iconsModel);
- ui->cb_icon_fallback->setModel(m_iconsModel);
-
-+ QFile oldConfigFile(QDir::homePath()+"/.gtkrc-2.0-kde");
-+ QFile newConfigFile(QDir::homePath()+"/.gtkrc-2.0");
-+ if(oldConfigFile.exists()) {
-+ newConfigFile.remove();
-+ if( !oldConfigFile.rename(newConfigFile.fileName()) )
-+ kDebug() << "Could not rename old config: " + oldConfigFile.fileName();
-+ else
-+ kDebug() << "Old config " + oldConfigFile.fileName() +
-+ "was successfully renamed to " + newConfigFile.fileName();
-+ }
-+
- m_tempGtk2Preview = KGlobal::dirs()->saveLocation("tmp", "gtkrc-2.0", false);
- m_tempGtk3Preview = KGlobal::dirs()->saveLocation("tmp", ".config/gtk-3.0/settings.ini", false);
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c0e2bd0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-migration-from-package-src:kcm-gtk.patch
-fix-loading-config-options.patch
-fix-desktop-file.patch
diff --git a/debian/rules b/debian/rules
index 386a984..a1760e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,5 @@
#!/usr/bin/make -f
-CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
-CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
-export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
-
-%:
- dh $@ --parallel
-
-override_dh_install:
- mv debian/tmp/usr/share/icons/hicolor/48x48/apps/kde-gtk-config.png \
- debian/tmp/usr/share/icons/hicolor/48x48/apps/gtkconfig.png
- dh_install
-
-get-orig-source:
- uscan --noconf --verbose --force-download --rename --download-current-version
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
.PHONY: override_dh_auto_test
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..7f4efe0
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,4 @@
+Tests: testsuite
+Depends: @builddeps@, build-essential,
+ xvfb, xauth, dbus-x11, openbox, ttf-oxygen-font-family
+Restrictions: rw-build-tree
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
new file mode 100644
index 0000000..00220b9
--- /dev/null
+++ b/debian/tests/testsuite
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ -d /usr/lib/ccache ]; then
+ export PATH="/usr/lib/ccache:$PATH"
+fi
+debian/rules clean 2>&1
+dpkg-source --before-build .
+debian/rules build 2>&1
+xvfb-run -a --server-args="-screen 0 1024x768x24+32" \
+ dbus-launch --exit-with-session debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
new file mode 100755
index 0000000..a2aff32
--- /dev/null
+++ b/debian/tests/testsuite.xsession
@@ -0,0 +1,8 @@
+#!/bin/sh
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
+[ -e debian/tests.home ] || mkdir debian/tests.home
+HOME=debian/tests.home openbox &
+sleep 5
+HOME=debian/tests.home dh_auto_test
+rm -rf debian/home/tests.home
--
kde-gtk-config packaging
More information about the pkg-kde-commits
mailing list