[hamradio-commits] [xastir] 01/02: Apply suggested changes from John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>

Wed Apr 1 12:50:14 UTC 2015

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

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

commit 359acd44561e3e2e3856807e70603dae6d34741d
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Wed Apr 1 13:38:50 2015 +0100

    Apply suggested changes from John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>
---
 debian/changelog | 36 ++++++++++++++++++++++++++----------
 debian/control   |  1 -
 debian/copyright | 49 ++++++++++++++++++++++++-------------------------
 debian/rules     |  1 -
 4 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d3f77fa..ce88b30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,29 @@
 xastir (2.0.6-1) unstable; urgency=medium
 
-  * Update to new upstream version (Closes: #761837)
-  * Update to 3.9.6 packaging standard.
-  * Update to compat level 9.
-  * Update to debhelper >= 9.
-  * Changed priority to optional.
-  * Corrected Maintainer: line in control file.
-  * Package source now maintained in Hamradio Maintainers' git VCS.
+  * New upstream release. (Closes: #761837)
+  * debian/control:
+    - Bump Standards-Version to 3.9.6, no changes required.
+    - Bump version dependency on debhelper to >= 9.
+    - Change priority to optional.
+    - Use proper maintainer name for the Debian Hamradio Maintainers.
+    - Add myself to Uploaders, remove Hamish Moffatt <hamish at debian.org>
+      and Colin Tuckley <colint at debian.org>.
+    - Set Vcs-* fields to new repository at anonscm.debian.org.
+    - Move python from Suggests to Recommends.
+    - Drop wget, gpsman, gpsmanshp, x11-utils from Suggests.
+    - Add dirwolf | soundmodem to Suggests.
+  * debian/compat:
+    - Bump to level 9.
+  * debian/copyright:
+    - Rewrite to copyright format 1.0.
+  * debian/patches:
+    - Refresh geotiff_directory.patch.
+    - Refresh link.patch.
+    - Refresh simple_db.patch.
+  * debian/rules:
+    - Streamline using modern dh command.
+  * debian/xastir.docs:
+    - Add file; includes AUTHORS, various READMEs, FAQ, NEWS and UPGRADE.
 
  -- Iain R. Learmonth <irl at fsfe.org>  Fri, 21 Nov 2014 20:48:10 +0000
 
@@ -121,7 +138,7 @@ xastir (1.9.4-3) unstable; urgency=low
 
 xastir (1.9.4-2) unstable; urgency=low
 
-  * Depend on xfontsel binary (x11-utils package), both for building 
+  * Depend on xfontsel binary (x11-utils package), both for building
     and running.
   * Add patch from CVS to work around unavailable xfontsel binary.
 
@@ -392,7 +409,7 @@ xastir (1.1.0-2) unstable; urgency=low
 
 xastir (1.1.0-1) unstable; urgency=low
 
-  * New upstream version; thanks for John Laur <johnl at blurbco.com> 
+  * New upstream version; thanks for John Laur <johnl at blurbco.com>
     for the patch from 1.0.0 to 1.1.0
   * xastir is now compiled with lots of optional libraries which
     allow more map formats to be read and other features.
@@ -448,4 +465,3 @@ xastir (0.3.0-1) unstable; urgency=low
   * Initial release
 
  -- Hamish Moffatt <hamish at debian.org>  Sun, 26 Mar 2000 19:52:27 +1000
-
diff --git a/debian/control b/debian/control
index edb1805..7c83960 100644
--- a/debian/control
+++ b/debian/control
@@ -18,4 +18,3 @@ Description: X Amateur Station Tracking and Information Reporting
  Xastir is an APRS client for X. APRS is the Automatic Position Reporting
  System, a system where objects report their position (usually obtained from
  GPS) on the air; Xastir displays this information graphically.
-
diff --git a/debian/copyright b/debian/copyright
index 16868db..809e2b1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,8 +4,8 @@ Source: http://www.sourceforge.net/projects/xastir/
 
 Files: *
 Copyright:
- © 1999-2000 Frank Giannandrea
- © 2000-2012 The Xastir Group
+ (C) 1999-2000 Frank Giannandrea
+ (C) 2000-2012 The Xastir Group
 License: GPL-2+
 
 Files:
@@ -15,7 +15,7 @@ Files:
  scripts/track-get.pl
  scripts/waypoint-get.pl
 Copyright:
- © 2000-2012 Curt Mills, WE7U <curt.we7u at gmail.com>
+ (C) 2000-2012 Curt Mills, WE7U <curt.we7u at gmail.com>
 License: GPL-2+
 
 Files:
@@ -25,15 +25,15 @@ Files:
  src/io-mmap.c
  src/io.h
 Copyright:
- © 2002 Daniel Egnor
- © 2004-2012 The Xastir Group
+ (C) 2002 Daniel Egnor
+ (C) 2004-2012 The Xastir Group
 License: GPL-2+
 
 Files:
  scripts/icontable.pl
  scripts/mapblast2geo.pl
  scripts/update_langfile.pl
-Copyright: © 2001 Rolf Bleher <mailto at dk7in.de>
+Copyright: (C) 2001 Rolf Bleher <mailto at dk7in.de>
 License: GPL-2+
 
 Files:
@@ -43,53 +43,53 @@ Files:
  src/hashtable_itr.h
  src/hashtable_private.h
 Copyright:
- © 2002, 2004 Christopher Clark <christopher.clark at cl.cam.ac.uk>
- © 2004-2012 The Xastir Group
+ (C) 2002, 2004 Christopher Clark <christopher.clark at cl.cam.ac.uk>
+ (C) 2004-2012 The Xastir Group
 License: GPL-2+
 
 Files:
  scripts/object2shp.pl
  scripts/pos2shp.pl
-Copyright: © 2006-2012 Tom Russo
+Copyright: (C) 2006-2012 Tom Russo
 License: GPL-2+
 
 Files:
  src/festival.c
  src/festival.h
 Copyright:
- © 1999 Centre for Speech Technology Research, University of Edinburgh
- © 2000-2012 The Xastir Group
+ (C) 1999 Centre for Speech Technology Research, University of Edinburgh
+ (C) 2000-2012 The Xastir Group
 License: Expat
 
 Files: scripts/Xastir_tigerpoly.py
 Copyright:
- © 2003 Frank Warmerdam <warmerdam at pobox.com>
- © 2004-2012 The Xastir Group
+ (C) 2003 Frank Warmerdam <warmerdam at pobox.com>
+ (C) 2004-2012 The Xastir Group
 License: Expat2
 
 Files: src/snprintf.c
 Copyright:
- © 2000-2012 The Xastir Group
- © 1995 Patrick Powell
+ (C) 2000-2012 The Xastir Group
+ (C) 1995 Patrick Powell
 License: GPL-2+
 
 Files:
  src/rotated.c
  src/rotated.h
 Copyright:
- © 1993  Alan Richardson (mppa3 at uk.ac.sussex.syma)
- © 2000-2012  The Xastir Group
+ (C) 1993  Alan Richardson (mppa3 at uk.ac.sussex.syma)
+ (C) 2000-2012  The Xastir Group
 License: MIT
 
 Files: debian/*
 Copyright:
- © 2007-2008 Hamish Moffatt <hamish at debian.org>
- © 2008-2009 Joop Stakenborg <pa3aba at debian.org>
- © 2008 Gerfried Fuchs <rhonda at debian.at>
- © 2011 Jerry Stueve <k4int at arrl.net>
- © 2013 Luk Claes <luk at debian.org>
- © 2014 Colin Tuckley <colint at debian.org>
- © 2014-2015 Iain R. Learmonth <irl at fsfe.org>
+ (C) 2007-2008 Hamish Moffatt <hamish at debian.org>
+ (C) 2008-2009 Joop Stakenborg <pa3aba at debian.org>
+ (C) 2008 Gerfried Fuchs <rhonda at debian.at>
+ (C) 2011 Jerry Stueve <k4int at arrl.net>
+ (C) 2013 Luk Claes <luk at debian.org>
+ (C) 2014 Colin Tuckley <colint at debian.org>
+ (C) 2014-2015 Iain R. Learmonth <irl at fsfe.org>
 License: GPL-2+
 
 License: GPL-2+
@@ -167,4 +167,3 @@ License: Expat2
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
-
diff --git a/debian/rules b/debian/rules
index 1e100c4..b86e421 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,4 +22,3 @@ clean:
 	-rm -f src/callpass/Makefile
 	-rm -f config.log config.cache summary.log
 	dh_clean
-

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

