[SCM] kstars packaging branch, master, updated. debian/16.08.3-1-81-g6423b1c
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Nov 21 15:09:23 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kstars.git;a=commitdiff;h=865c577
The following commit has been merged in the master branch:
commit 865c5779d1307b8dea50c89a93d8411efbda3c6e
Author: Jonathan Riddell <jr at jriddell.org>
Date: Wed Jul 6 15:45:04 2016 +0100
lintian tidying, wrap-and-sort
---
debian/control | 14 ++++--------
debian/copyright | 49 +++++++++++++++++++----------------------
debian/kstars.lintian-overrides | 1 +
3 files changed, 28 insertions(+), 36 deletions(-)
diff --git a/debian/control b/debian/control
index f804def..7619dcc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,7 @@ Source: kstars
Section: kde
Priority: optional
Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Pino Toscano <pino at debian.org>,
- Maximiliano Curia <maxy at debian.org>
+Uploaders: Pino Toscano <pino at debian.org>, Maximiliano Curia <maxy at debian.org>
Build-Depends: astrometry.net,
cmake (>= 2.8.12~),
debhelper (>= 9),
@@ -49,14 +48,9 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kstars.git
Package: kstars
Architecture: any
Section: science
-Depends: kstars-data (= ${source:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Suggests: khelpcenter,
- konqueror
-Recommends: astrometry.net,
- indi-bin,
- xplanet
+Depends: kstars-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Suggests: khelpcenter, konqueror
+Recommends: astrometry.net, indi-bin, xplanet
Breaks: kstars-data (<= 4:16.04)
Replaces: kstars-data (<= 4:16.04)
Description: desktop planetarium for KDE
diff --git a/debian/copyright b/debian/copyright
index 3a22914..5951440 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,7 @@ Upstream-Name: kstars
Source: http://projects.kde.org/projects/kde/kdeedu/kstars
Files: *
+ debian/*
Copyright: 2008-2014, Akarsh Simha
2008, Akarsh Simha, Thomas Kabelmann
2012, Andrew Stepanenko
@@ -47,7 +48,25 @@ Copyright: 2008-2014, Akarsh Simha
Till Credner and Sven Kohle
2008, Akarsh Simha <akarshsimha at gmail.com>
2004, Jason Harris and Clemens (?)
+ 2011-2012, Pino Toscano <pino at debian.org>
+ 2011, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
License: GPL-2+
+ 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 <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete texts of the GNU General Public Licenses
+ version 2 and 3 can be found in `/usr/share/common-licenses/GPL-2' and
+ `/usr/share/common-licenses/GPL-3'.
Files: cmake/modules/*
Copyright: 2006-2013, Jasem Mutlaq <mutlaqja at ikarustech.com>
@@ -142,6 +161,8 @@ License: LGPL-3+
Files: kstars/fitsviewer/bayer.c
kstars/fitsviewer/bayer.h
+Copyright: Damien Douxchamps
+ Frederic Devernay
License: LGPL-2.1+
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -153,9 +174,8 @@ License: LGPL-2.1+
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
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU Lesser General Public License
+ along with QRecentFilesMenu. If not, see <http://www.gnu.org/licenses/>.
.
On Debian systems, the complete text of the GNU Lesser General Public License
version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
@@ -176,11 +196,6 @@ Files: kstars/data/clines.dat
Copyright: 2004, Jason Harris and Clemens
License: GPL-2
-Files: debian/*
-Copyright: 2011-2012, Pino Toscano <pino at debian.org>
- 2011, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-License: GPL-2+
-
License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -217,21 +232,3 @@ License: GFDL-NIV-1.2+
License: GPL-2
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: GPL-2+
- 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 <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete texts of the GNU General Public Licenses
- version 2 and 3 can be found in `/usr/share/common-licenses/GPL-2' and
- `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/kstars.lintian-overrides b/debian/kstars.lintian-overrides
new file mode 100644
index 0000000..d062eac
--- /dev/null
+++ b/debian/kstars.lintian-overrides
@@ -0,0 +1 @@
+kstars: desktop-entry-contains-unknown-key usr/share/applications/org.kde.kstars.desktop:217 Patterns
--
kstars packaging
More information about the pkg-kde-commits
mailing list