From 55c2ad951cc05a2f395ce6b24c1fd5ff69b91992 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Wed, 11 Nov 2015 20:54:38 +0100 Subject: [PATCH] fix control to prepare migration to 0.10 remove debian/menu --- debian/.gitignore | 3 +-- debian/changelog | 33 +++++++++++++---------- debian/control | 56 +++++++++++++++++++--------------------- debian/copyright | 6 +---- debian/lintian-overrides | 5 ++-- debian/menu | 4 --- 6 files changed, 50 insertions(+), 57 deletions(-) delete mode 100644 debian/menu diff --git a/debian/.gitignore b/debian/.gitignore index 580a6dd..5837773 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,4 +1,5 @@ /*~ +/*swp /*.debhelper /*.log /*.substvars @@ -6,5 +7,3 @@ /lxqt-config/ /lxqt-config-dbg/ -/lxqt-config-qt5/ -/lxqt-config-qt5-dbg/ diff --git a/debian/changelog b/debian/changelog index 712aaf3..f5dc0c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,26 +1,31 @@ +lxqt-config (0.9.0+20150806-2) unstable; urgency=medium + + * Fixed .gitignore, removed outdated entries + * Fixed debian/control sorting and removed outdated versions. + + -- Alf Gaida Wed, 11 Nov 2015 20:51:11 +0100 + lxqt-config (0.9.0+20150806-1) unstable; urgency=medium [ Alf Gaida ] * Initial release. (Closes: #747597) - * added watch file. + * Added watch file. * Imported Upstream version 0.8.0. - * bump standards to 3.9.6. - * drop build dependency libegl1-mesa-dev, bug in Qt 5.3.0 is fixed. + * Bump standards to 3.9.6. + * Drop build dependency libegl1-mesa-dev, bug in Qt 5.3.0 is fixed. * Min Qt version 5.3.2. * Min liblxqt-qt5-0-dev version 0.8.0. - * mangled symbols added. - * lintian-overrides added. - * patch some desktop files. - * new release 0.9.0 drop not needed patches cleanup debian $foo add + * Mangled symbols added. + * Added intian-overrides. + * Patch some desktop files. + * New release 0.9.0 drop not needed patches cleanup debian $foo add source/options. * Some cleanup in debian $foo. - * removed breaks and replaces. - * fixes in copyright. - * removed debian/symbols. - * add link --as-needed to rules to avoid warnings at build time. - * licenses hopefully fixed. - * breaks and replaces removed. - * rules improved, link --as-needed not used symbols removed. + * Removed breaks and replaces. + * Fixes in copyright. + * Removed debian/symbols. + * Added link --as-needed to rules to avoid warnings at build time. + * Fixed licenses. [ Andrew Lee (李健秋) ] * Merging upstream version 0.9.0+20150806. diff --git a/debian/control b/debian/control index 0987c0f..2dad7ba 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: debhelper (>= 9), + cmake (>= 3.0.2), + 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 e8a7c8a..5f0a5e2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -37,7 +37,7 @@ 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+ @@ -174,7 +174,3 @@ License: WTFPL-2 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION . 0. You just DO WHAT THE FUCK YOU WANT TO. - - - - diff --git a/debian/lintian-overrides b/debian/lintian-overrides index 1803809..7dbf7b1 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -1,11 +1,12 @@ -# 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 diff --git a/debian/menu b/debian/menu deleted file mode 100644 index 3c20c7e..0000000 --- a/debian/menu +++ /dev/null @@ -1,4 +0,0 @@ -?package(lxqt-config):needs="X11" \ - section="Applications/System/Administration"\ - title="LXQt settings center" \ - command="/usr/bin/lxqt-config"