From aff302446b8f36c72c2857058fa3f5af1bda7521 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sun, 22 Feb 2015 19:06:22 +0100 Subject: [PATCH] Some cleanup in debian $foo .gitignore moved to ./debian fixed maintainer fields fixed vcs fields fixed LGPL simplified debian/rules --- .gitignore | 2 -- debian/.gitignore | 9 +++++++++ debian/control | 9 +++++---- debian/copyright | 42 ++++++++++++++++++------------------------ debian/rules | 5 +---- 5 files changed, 33 insertions(+), 34 deletions(-) delete mode 100644 .gitignore create mode 100644 debian/.gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 513eaeb..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build -*.kdev4 diff --git a/debian/.gitignore b/debian/.gitignore new file mode 100644 index 0000000..12e9087 --- /dev/null +++ b/debian/.gitignore @@ -0,0 +1,9 @@ +/*.debhelper +/*.log +/*.substvars +/files + +/lxqt-panel/ +/lxqt-panel-dbg/ +/lxqt-panel-qt5/ +/lxqt-panel-qt5-dbg/ diff --git a/debian/control b/debian/control index 3898484..91242da 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,10 @@ Source: lxqt-panel Section: x11 Priority: optional -Maintainer: Debian LXQt Maintainers +Maintainer: LXQt Packaging Team Uploaders: - Alf Gaida + Alf Gaida , + ChangZhuo Chen (陳昌倬) , Build-Depends: cmake (>= 3.0.2), debhelper (>= 9), @@ -35,8 +36,8 @@ Build-Depends: qttools5-dev-tools (>= 5.3.2), Standards-Version: 3.9.6 Homepage: https://github.com/lxde/lxqt-panel -#Vcs-Git: git://anonscm.debian.org/collab-maint/lxqt-panel.git -#Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/lxqt-panel.git;a=summary +Vcs-Git: git://anonscm.debian.org/collab-maint/lxqt-panel.git +Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/lxqt-panel.git;a=summary Package: lxqt-panel Architecture: any diff --git a/debian/copyright b/debian/copyright index c9972cb..5d263c8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -11,36 +11,30 @@ Files: debian/* Copyright: 2014-2015 Alf Gaida License: LGPL-2.1+ -License: GPL-2.0+ - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see - . - On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - License: LGPL-2.1+ - This package is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public + This program or library is free software; you can redistribute it + and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. . - This package is distributed in the hope that it will be useful, + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of 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 General Public License - along with this program. If not, see . - . On Debian systems, the complete text of the GNU Lesser General - Public License can be found in "/usr/share/common-licenses/LGPL-2.1". \ No newline at end of file + Public License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1". + + License: GPL-2.0+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in "/usr/share/common-licenses/GPL-2". diff --git a/debian/rules b/debian/rules index 6b65d1d..5bbba38 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) %: - dh ${@} --buildsystem cmake --parallel + dh ${@} --buildsystem cmake --parallel --dbg-package=lxqt-panel-dbg override_dh_auto_install: @@ -13,6 +13,3 @@ override_dh_auto_install: override_dh_auto_configure: dh_auto_configure -- -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) - -override_dh_strip: - dh_strip --dbg-package=lxqt-panel-dbg