[hamradio-commits] [wwl] 09/11: DEP-5 and a watch file

[Iain Learmonth]

This is an automated email from the git hooks/post-receive script.

irl-guest pushed a commit to branch master
in repository wwl.

commit 615545866c5803f93ed16a5699bb603d035b5c6b
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Mon Aug 10 23:11:10 2015 +0100

    DEP-5 and a watch file
---
 debian/changelog |  7 +++++--
 debian/copyright | 64 +++++++++++++++++++++++++++++++++++---------------------
 debian/watch     |  3 +++
 3 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 24e72dd..3d56c86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
 wwl (1.3+db-2) UNRELEASED; urgency=medium
 
-  * Team upload.
-  * Acknowledge NMU.
+  * Acknowledge NMU
   * Bump compat level to 9
   * Source format changed to "3.0 (quilt)"
   * debian/control:
@@ -22,6 +21,10 @@ wwl (1.3+db-2) UNRELEASED; urgency=medium
   * debian/patches/remove-locator.patch:
     - Import the old changes into a quilt patch
     - Update the patch to print version 1.3 instead of version 1.0
+  * debian/copyright:
+    - Converted to DEP-5
+  * debian/watch:
+    - Watch file created
   
  -- Iain R. Learmonth <irl at fsfe.org>  Mon, 10 Aug 2015 22:02:24 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 5994c40..25509dd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,28 +1,44 @@
-This is the Debian GNU/Linux package of wwl.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: wwl
+Source: http://www.db.net/downloads/wwl+db-1.3.tgz
 
-wwl was downloaded from http://www.db.net/downloads, the program was
-originally written by Mirko Caserta <ik0zsn at amsat.org>, there is no code
-from the original (dead?) version of wwl.
+Files: *
+Copyright: (C) Diane Bruce <db at FreeBSD.ORG>
+License: Permissive
 
-This version comes with a new license, taken from wwl.c:
+Files: debian/*
+Copyright: (C) 2015 Iain R. Learmonth <irl at fsfe.org>
+License: BSD-3-clause
 
-/* This version by va3db db at db.net db at FreeBSD.org Oct 1 2007
- * rewritten completely. There were equator crossing bugs in the original
- * (dead) version of wwl on sunsite, so I rewrote it from scratch.
- *
- * wwl     -- Originally by IK0ZSN Mirko Caserta <ik0zsn at amsat.org>
- * There is no code from the original (dead?) version of wwl.
- *
- * The bearing/distance code is from Amateur Radio Software by John
- * Morris, GM4ANB.
- *
- * <db at FreeBSD.ORG> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this code, except you may not
- * license it under any form of the GPL.
- * A postcard or QSL card showing me you appreciate
- * this code would be nice. Diane Bruce va3db
- */
-
-The Debian packaging is (C) 2007, Joop Stakenborg <pa3aba at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+License: Permissive
+ <db at FreeBSD.ORG> wrote this file.  As long as you retain this notice you
+ can do whatever you want with this code, except you may not
+ license it under any form of the GPL.
+ A postcard or QSL card showing me you appreciate
+ this code would be nice. Diane Bruce va3db
 
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ . 
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ .
+ 3. Neither the name of the copyright holder nor the names of its contributors
+ may be used to endorse or promote products derived from this software without
+ specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..1f90adc
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+db// \
+http://www.db.net/downloads/ wwl\+db-(.*)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/wwl.git