From 1f64c4812ee705a247d1e7b70577b52d976adf8e Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Wed, 2 Sep 2015 19:11:04 +0200 Subject: [PATCH] Cherry-picked upstream version 0.9.0+20150829. Removed debian/patches, fixed upstream Fixed .gitignore Fixed and sorted copyright cme fix dpkg-control Fixed spelling in lintian-overrides --- debian/changelog | 12 +++++--- debian/control | 56 ++++++++++++++++------------------ debian/copyright | 65 ++++++++++++++++++++++++++-------------- debian/lintian-overrides | 5 ++-- 4 files changed, 78 insertions(+), 60 deletions(-) diff --git a/debian/changelog b/debian/changelog index 381a307..dbf4ef9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -lxqt-config (0.9.0+20150806-2) UNRELEASED; urgency=medium +lxqt-config (0.9.0+20150829-1) unstable; urgency=medium - * .gitignore fixed - * some whitespaces fixed in copyright + * Cherry-picked upstream 0.9.0+20150829 + * Removed debian/patches, fixed upstream + * .gitignore fixed + * Fixed and sorted copyright + * cme fix dpkg-control + * Fixed spelling in lintian-overrides - -- Alf Gaida Sun, 23 Aug 2015 22:28:08 +0200 + -- Alf Gaida Wed, 02 Sep 2015 19:10:19 +0200 lxqt-config (0.9.0+20150806-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 0987c0f..94fc7a3 100644 --- a/debian/control +++ b/debian/control @@ -1,38 +1,35 @@ Source: lxqt-config +Maintainer: LXQt Packaging Team +Uploaders: Alf Gaida , + ChangZhuo Chen (陳昌倬) , + Andrew Lee (李健秋) , + Yukiharu YABUKI Section: x11 Priority: optional -Maintainer: LXQt Packaging Team -Uploaders: - Alf Gaida , - ChangZhuo Chen (陳昌倬) , - Andrew Lee (李健秋) , - Yukiharu YABUKI -Build-Depends: - cmake (>= 3.0.2), - debhelper (>= 9), - libkf5windowsystem-dev (>= 5.5.0), - liblxqt0-dev (>= 0.9.0), - libqt5svg5-dev, - libqt5x11extras5-dev (>= 5.3.2), - libqt5xdg-dev (>= 1.1.0), - libx11-dev, - libxcursor-dev, - libxfixes-dev, - pkg-config, - qtbase5-private-dev, - qttools5-dev (>= 5.3.2), - qttools5-dev-tools (>= 5.3.2), - zlib1g-dev, +Build-Depends: cmake (>= 3.0.2), + debhelper (>= 9), + libkf5windowsystem-dev, + liblxqt0-dev, + libqt5svg5-dev, + libqt5x11extras5-dev, + libqt5xdg-dev, + libx11-dev, + libxcursor-dev, + libxfixes-dev, + pkg-config, + qtbase5-private-dev, + qttools5-dev, + qttools5-dev-tools, + zlib1g-dev Standards-Version: 3.9.6 -Homepage: https://github.com/lxde/lxqt-config -Vcs-Git: git://anonscm.debian.org/pkg-lxqt/lxqt-config.git Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/lxqt-config.git +Vcs-Git: git://anonscm.debian.org/pkg-lxqt/lxqt-config.git +Homepage: https://github.com/lxde/lxqt-config Package: lxqt-config Architecture: any -Depends: - ${misc:Depends}, - ${shlibs:Depends}, +Depends: ${misc:Depends}, + ${shlibs:Depends} Description: LXQt system settings center The LXQt system settings center . @@ -42,9 +39,8 @@ Package: lxqt-config-dbg Architecture: any Section: debug Priority: extra -Depends: - ${misc:Depends}, - lxqt-config (= ${binary:Version}), +Depends: ${misc:Depends}, + lxqt-config (= ${binary:Version}) Description: LXQt system settings center (debug) The LXQt system settings center . diff --git a/debian/copyright b/debian/copyright index 2ef6c48..ad6411c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -19,42 +19,61 @@ Copyright: 2007, 2009 Rafael Fernández López 2007 John Tapsell License: LGPL-2.0+ -Files: liblxqt-config-cursor/cfgfile.h liblxqt-config-cursor/main.cpp - liblxqt-config-cursor/selectwnd.h liblxqt-config-cursor/main.h - liblxqt-config-cursor/selectwnd.cpp liblxqt-config-cursor/xcr/xcrtheme.h - liblxqt-config-cursor/xcr/xcrxcur.cpp liblxqt-config-cursor/xcr/xcrxcur.h - liblxqt-config-cursor/xcr/xcrthemefx.cpp liblxqt-config-cursor/xcr/xcrthemefx.h - liblxqt-config-cursor/xcr/xcrimg.h liblxqt-config-cursor/xcr/xcrthemexp.cpp - liblxqt-config-cursor/xcr/xcrtheme.cpp liblxqt-config-cursor/xcr/xcrthemexp.h - liblxqt-config-cursor/xcr/xcrimg.cpp +Files: liblxqt-config-cursor/cfgfile.h + liblxqt-config-cursor/main.cpp + liblxqt-config-cursor/main.h + liblxqt-config-cursor/selectwnd.cpp + liblxqt-config-cursor/selectwnd.h + liblxqt-config-cursor/xcr/xcrimg.cpp + liblxqt-config-cursor/xcr/xcrimg.h + liblxqt-config-cursor/xcr/xcrtheme.cpp + liblxqt-config-cursor/xcr/xcrtheme.h + liblxqt-config-cursor/xcr/xcrthemefx.cpp + liblxqt-config-cursor/xcr/xcrthemefx.h + liblxqt-config-cursor/xcr/xcrthemexp.cpp + liblxqt-config-cursor/xcr/xcrthemexp.h + liblxqt-config-cursor/xcr/xcrxcur.cpp + liblxqt-config-cursor/xcr/xcrxcur.h Copyright: Ketmar License: WTFPL-2 -Files: liblxqt-config-cursor/thememodel.h liblxqt-config-cursor/itemdelegate.cpp - liblxqt-config-cursor/crtheme.h liblxqt-config-cursor/thememodel.cpp - liblxqt-config-cursor/crtheme.cpp liblxqt-config-cursor/itemdelegate.h +Files: liblxqt-config-cursor/itemdelegate.cpp + liblxqt-config-cursor/itemdelegate.h + liblxqt-config-cursor/crtheme.cpp + liblxqt-config-cursor/crtheme.h + liblxqt-config-cursor/thememodel.cpp + liblxqt-config-cursor/thememodel.h Copyright: 2006-2007 Fredrik Höglund License: GPL-3.0+ Files: liblxqt-config-cursor/previewwidget.cpp - liblxqt-config-cursor/previewwidget.h + liblxqt-config-cursor/previewwidget.h Copyright: 2003-2007 Fredrik Höglund License: GPL-2.0+ -Files: lxqt-config-input/lxqt-config-input.cpp lxqt-config-input/mouseconfig.cpp - lxqt-config-input/mouseconfig.h lxqt-config-input/keyboardconfig.h - lxqt-config-input/keyboardconfig.cpp +Files: lxqt-config-input/keyboardconfig.cpp + lxqt-config-input/keyboardconfig.h + lxqt-config-input/lxqt-config-input.cpp + lxqt-config-input/mouseconfig.cpp + lxqt-config-input/mouseconfig.h Copyright: 2013-2014 Hong Jen Yee (PCMan) License: GPL-2.0+ -Files: lxqt-config-monitor/monitor.h lxqt-config-monitor/main.cpp - lxqt-config-monitor/monitorwidget.cpp lxqt-config-monitor/monitorwidget.h - lxqt-config-monitor/main.h lxqt-config-monitor/xrandr.cpp - lxqt-config-monitor/monitor.cpp lxqt-config-monitor/monitorsettingsdialog.cpp - lxqt-config-monitor/quickoptions.cpp - lxqt-config-monitor/monitorsettingsdialog.h lxqt-config-monitor/quickoptions.h - lxqt-config-monitor/savesettings.h lxqt-config-monitor/monitorpicture.h - lxqt-config-monitor/xrandr.h lxqt-config-monitor/savesettings.cpp +Files: lxqt-config-monitor/main.cpp + lxqt-config-monitor/main.h + lxqt-config-monitor/monitor.cpp + lxqt-config-monitor/monitor.h + lxqt-config-monitor/monitorwidget.cpp + lxqt-config-monitor/monitorwidget.h + lxqt-config-monitor/monitorpicture.h + lxqt-config-monitor/monitorsettingsdialog.cpp + lxqt-config-monitor/monitorsettingsdialog.h + lxqt-config-monitor/quickoptions.cpp + lxqt-config-monitor/quickoptions.h + lxqt-config-monitor/savesettings.cpp + lxqt-config-monitor/savesettings.h + lxqt-config-monitor/xrandr.cpp + lxqt-config-monitor/xrandr.h Copyright: 2014 P.L. Lucas 2014 Hong Jen Yee (PCMan) License: GPL-2.0+ diff --git a/debian/lintian-overrides b/debian/lintian-overrides index 1803809..ed65680 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -1,14 +1,13 @@ -# there will be no manpages in a foreseable future +# there will be no man-pages in a foreseeable future lxqt-config: binary-without-manpage usr/bin/lxqt-config-appearance lxqt-config: binary-without-manpage usr/bin/lxqt-config-file-associations lxqt-config: binary-without-manpage usr/bin/lxqt-config-input lxqt-config: binary-without-manpage usr/bin/lxqt-config-monitor lxqt-config: binary-without-manpage usr/bin/lxqt-config -# not a bug, LXQt has not reached freedesktop yet +# not a bug, LXQt has not reached free-desktop yet lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-appearance.desktop lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-file-associations.desktop lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-input.desktop lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-monitor.desktop lxqt-config: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config.desktop -