diff -Nru d-rats-0.3.3/debian/changelog d-rats-0.3.3/debian/changelog --- d-rats-0.3.3/debian/changelog 2014-02-23 04:17:36.000000000 +0000 +++ d-rats-0.3.3/debian/changelog 2015-05-09 01:48:44.000000000 +0000 @@ -1,3 +1,21 @@ +d-rats (0.3.3-4ubuntu1) wily; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/control: Depend on python-glade2 to fix crash upon opening. + + -- Logan Rosen Sat, 09 May 2015 02:48:06 +0100 + +d-rats (0.3.3-4) unstable; urgency=medium + + * Add debian/watch file thanks to irl (Closes: #781605) + * Bump standards version to 3.9.6 + * dm-upload-allowed removed as obsolete + * build depend on dh-python instead of obsolete python-support + * Fix various minor lintian warnings for desktop files + * update debian/copyright to dep-5 + + -- Colin Tuckley Tue, 05 May 2015 11:14:00 +0100 + d-rats (0.3.3-3ubuntu1) trusty; urgency=medium * Depend on python-glade2 to fix crash upon opening (LP: #917204). @@ -29,3 +47,4 @@ * Ready for initial debian upload (Closes: 589107) -- Steve Conklin Fri, 18 Feb 2011 18:17:24 -0600 + diff -Nru d-rats-0.3.3/debian/control d-rats-0.3.3/debian/control --- d-rats-0.3.3/debian/control 2014-02-23 04:17:38.000000000 +0000 +++ d-rats-0.3.3/debian/control 2015-05-09 01:48:56.000000000 +0000 @@ -3,10 +3,9 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Hamradio Maintainers -Uploaders: Steve Conklin , Kamal Mostafa -DM-Upload-Allowed: yes -Build-Depends: debhelper (>= 7.0.50~), python-support, python (>=2.6) -Standards-Version: 3.9.2 +Uploaders: Steve Conklin , Colin Tuckley +Build-Depends: debhelper (>= 7.0.50~), dh-python, python (>=2.6.6-3~) +Standards-Version: 3.9.6 Homepage: http://www.d-rats.com/ Package: d-rats diff -Nru d-rats-0.3.3/debian/copyright d-rats-0.3.3/debian/copyright --- d-rats-0.3.3/debian/copyright 2011-09-28 18:16:29.000000000 +0000 +++ d-rats-0.3.3/debian/copyright 2015-05-05 19:11:46.000000000 +0000 @@ -1,38 +1,32 @@ -This work was packaged for Debian by: - - Steve Conklin AI4QR on Wed, 14 Jul 2010 16:26:40 -0500 - -It was downloaded from: - - http://www.d-rats.com/ - -Upstream Author: - - Dan Smith +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: d-rats +Source: http://www.d-rats.com/ +Files: * Copyright: + (C) 2008, 2009, 2010, 2011 Dan Smith +License: GPL-3+ - Copyright (C) 2008, 2009, 2010, 2011 Dan Smith +Files: debian/* +Copyright: + (C) 2014 Colin Tuckley + (C) 2011 Steve Conklin +License: GPL-3+ -License: +License: GPL-3+ 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 3 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 . - -On Debian systems, the complete text of the GNU General -Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. - -The Debian packaging is: - - Copyright (C) 2010 Steve Conklin - and is licensed under the GPL version 3, see above. + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. diff -Nru d-rats-0.3.3/debian/patches/05-desktops.patch d-rats-0.3.3/debian/patches/05-desktops.patch --- d-rats-0.3.3/debian/patches/05-desktops.patch 1970-01-01 00:00:00.000000000 +0000 +++ d-rats-0.3.3/debian/patches/05-desktops.patch 2015-05-05 09:09:44.000000000 +0000 @@ -0,0 +1,43 @@ +Fix minor desktop lintian warnings +--- a/share/d-rats_repeater.desktop ++++ b/share/d-rats_repeater.desktop +@@ -1,6 +1,5 @@ + [Desktop Entry] + Version=1.0 +-Encoding=UTF-8 + Type=Application + Exec=d-rats_repeater + Icon=d-rats2 +@@ -11,3 +10,4 @@ + Name=D-RATS Repeater + Comment=D-RATS Repeater + GenericName=D-RATS Repeater ++Keywords=D-Star +--- a/share/d-rats_mapdownloader.desktop ++++ b/share/d-rats_mapdownloader.desktop +@@ -1,6 +1,5 @@ + [Desktop Entry] + Version=1.0 +-Encoding=UTF-8 + Type=Application + Exec=d-rats_mapdownloader + Icon=d-rats2 +@@ -11,3 +10,4 @@ + Name=D-RATS Map Downloader + Comment=D-RATS Map Downloader + GenericName=D-RATS Map Downloader ++Keywords=D-Star +--- a/share/d-rats.desktop ++++ b/share/d-rats.desktop +@@ -1,6 +1,5 @@ + [Desktop Entry] + Version=1.0 +-Encoding=UTF-8 + Type=Application + Exec=d-rats + Icon=d-rats2 +@@ -11,3 +10,4 @@ + Name=D-RATS + Comment=D-STAR Communication Tool + GenericName=D-STAR Communication Tool ++Keywords=D-Star diff -Nru d-rats-0.3.3/debian/patches/series d-rats-0.3.3/debian/patches/series --- d-rats-0.3.3/debian/patches/series 2011-09-28 17:11:56.000000000 +0000 +++ d-rats-0.3.3/debian/patches/series 2015-05-05 19:11:46.000000000 +0000 @@ -2,3 +2,4 @@ 02-remove-lzhuf-functionality.patch 03-remove-COPYING-installation.patch 04-add-check-for-module-dirs.patch +05-desktops.patch diff -Nru d-rats-0.3.3/debian/rules d-rats-0.3.3/debian/rules --- d-rats-0.3.3/debian/rules 2011-09-28 17:06:16.000000000 +0000 +++ d-rats-0.3.3/debian/rules 2015-05-05 19:11:46.000000000 +0000 @@ -5,4 +5,4 @@ #export DH_VERBOSE=1 %: - dh $@ + dh $@ --with python2 diff -Nru d-rats-0.3.3/debian/watch d-rats-0.3.3/debian/watch --- d-rats-0.3.3/debian/watch 1970-01-01 00:00:00.000000000 +0000 +++ d-rats-0.3.3/debian/watch 2015-05-05 08:29:42.000000000 +0000 @@ -0,0 +1,2 @@ +version=3 +http://d-rats.danplanet.com/download/v(\d.*)/d-rats-(\d.*)\.tar\.gz