summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Weingärtner <timo@tiwe.de>2014-02-19 11:51:32 +0100
committerTimo Weingärtner <timo@tiwe.de>2014-02-19 13:34:46 +0100
commit75b9402b6acab095f8f14b378e643571eddb49a4 (patch)
tree0e553efc09ae75a2abce2c50d1e5320265be6346
parentb26cbce1ae22bdae9c4fcff6d64779d9c270fa79 (diff)
downloadopenssh-known-hosts-75b9402b6acab095f8f14b378e643571eddb49a4.tar.gz
Packaging changes for new upstream version
* License now GPL3+ * README removed * add lintian override for manpage * add Build-Depends: pandoc
-rw-r--r--debian/control2
-rw-r--r--debian/copyright12
-rw-r--r--debian/openssh-known-hosts.docs1
-rw-r--r--debian/openssh-known-hosts.lintian-overrides2
4 files changed, 9 insertions, 8 deletions
diff --git a/debian/control b/debian/control
index 19c19fc..62717fa 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: openssh-known-hosts
Section: net
Priority: extra
Maintainer: Timo Weingärtner <timo@tiwe.de>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7), pandoc
Standards-Version: 3.9.4
Homepage: https://github.com/tiwe-de/openssh-known-hosts
Vcs-Git: git://github.com/tiwe-de/openssh-known-hosts.git -b debian
diff --git a/debian/copyright b/debian/copyright
index 50b148d..0d37ebc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,16 +5,16 @@ Source: https://github.com/tiwe-de/openssh-known-hosts
Files: *
Copyright: 2009-2013, Timo Weingärtner
-License: GPL2+
+License: GPL3+
Files: debian/*
Copyright: 2009-2013, Timo Weingärtner
-License: GPL2+
+License: GPL3+
-License: GPL2+
+License: GPL3+
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
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
.
This program is distributed in the hope that it will be useful,
@@ -26,5 +26,5 @@ License: GPL2+
along with this program. If not, see <http://www.gnu.org/licenses/>
.
On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in the file
- "/usr/share/common-licenses/GPL-2".
+ Public License version 3 can be found in the file
+ "/usr/share/common-licenses/GPL-3".
diff --git a/debian/openssh-known-hosts.docs b/debian/openssh-known-hosts.docs
deleted file mode 100644
index e845566..0000000
--- a/debian/openssh-known-hosts.docs
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/debian/openssh-known-hosts.lintian-overrides b/debian/openssh-known-hosts.lintian-overrides
new file mode 100644
index 0000000..adf1d80
--- /dev/null
+++ b/debian/openssh-known-hosts.lintian-overrides
@@ -0,0 +1,2 @@
+# long line contains long string, warning not avoidable
+openssh-known-hosts: manpage-has-errors-from-man usr/share/man/man8/update-openssh-known-hosts.8.gz 34: warning [p 1, 5.0i]: cannot adjust line