From 6974c3ff81fe7e90772e73630dfca384a59bf900 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sun, 22 Feb 2015 20:31:11 +0100 Subject: [PATCH] Some cleanup in debian $foo .gitignore moved to ./debian fixed maintainer fields fixed vcs fields fixed LGPL --- .gitignore | 1 - debian/.gitignore | 7 +++++++ debian/control | 9 +++++---- debian/copyright | 39 ++++++++++++++++++--------------------- 4 files changed, 30 insertions(+), 26 deletions(-) delete mode 100644 .gitignore create mode 100644 debian/.gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index ee4c926..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/test diff --git a/debian/.gitignore b/debian/.gitignore new file mode 100644 index 0000000..b4cce7d --- /dev/null +++ b/debian/.gitignore @@ -0,0 +1,7 @@ +/*.debhelper +/*.log +/*.substvars +/files + +/obconf-qt/ +/obconf-qt5/ diff --git a/debian/control b/debian/control index 4e9b09c..b60d333 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,10 @@ Source: obconf-qt Section: utils 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), @@ -14,8 +15,8 @@ Build-Depends: qttools5-dev-tools (>= 5.3.2), Standards-Version: 3.9.6 Homepage: https://github.com/lxde/obconf-qt -#Vcs-Git: git://anonscm.debian.org/collab-maint/obconf-qt.git -#Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/obconf-qt.git;a=summary +Vcs-Git: git://anonscm.debian.org/pkg-lxqt/obconf-qt.git +Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/obconf-qt.git Package: obconf-qt Architecture: any diff --git a/debian/copyright b/debian/copyright index 57896cf..3f806f6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -10,33 +10,30 @@ Files: debian/* Copyright: 2013-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. - . - 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". \ No newline at end of file