[hamradio-commits] [linpsk] 04/05: Fixing lintian issues

[Iain Learmonth]

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

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

commit 88c5a6d42ba8d5885beb2fdc4be1f96c2f75421b
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Mon May 4 18:58:07 2015 +0100

    Fixing lintian issues
    
     * Fix typo with patch (it had moved)
     * Add patch descriptions
     * Updates for desktop, menu and icons
     * DEP-5 copyright
---
 debian/copyright                 | 30 ++++++++++++++++++------------
 debian/linpsk.desktop            |  3 ++-
 debian/linpsk.install            |  1 +
 debian/linpsk.menu               |  2 +-
 debian/patches/ftbfs-clang.patch |  5 +++++
 debian/patches/series            |  1 +
 debian/patches/typo.patch        | 24 ++++++++++++++++++++++++
 7 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 630ea9c..46a1268 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,22 @@
-This package was debianized by Bruce Walker <w1bw at debian.org> on
-Sun,  9 Dec 2001 22:32:01 -0500.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: linpsk
+Source: http://linpsk.sourceforge.net/
 
-It was downloaded from linpsk.sourceforge.net.
-
-Upstream Author: Volker Schroer <dl1ksv at gmx.de>
+Files: *
+Copyright: (C) 2000-2012 by Volker Schroer <dl1ksv at gmx.de>
+License: GPL-2+
 
+Files: debian/*
 Copyright:
-This software is copyright (c) 2000-2010 by Volker Schroer
-
-You are free to distribute this software under the terms of the GNU
-General Public License.  On Debian systems, the complete text of the
-GNU General Public License can be found in the file
-/usr/share/common-licenses/GPL.
-
+ (C) 2015 Iain R. Learmonth <irl at fsfe.org>
+ (C) 2010 Jerry Stueve <k4int at arrl.net>
+ (C) 2007-2009 Joop Stakenborg <pa3aba at debian.org>
+ (C) 2005-2006 Hamish Moffatt <hamish at debian.org>
+ (C) 2001-2003 Bruce Walker <w1bw at debian.org>
+License: GPL-2+
 
+License: GPL-2+
+ You are free to distribute this software under the terms of the GNU
+ General Public License.  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.
diff --git a/debian/linpsk.desktop b/debian/linpsk.desktop
index 8a45e6f..aee5da3 100644
--- a/debian/linpsk.desktop
+++ b/debian/linpsk.desktop
@@ -6,4 +6,5 @@ Exec=linpsk
 Icon=linpsk
 Terminal=false
 Type=Application
-Categories=Network;HamRadio;
+Categories=Network;HamRadio
+Keywords=Ham Radio;PSK31;Modem
diff --git a/debian/linpsk.install b/debian/linpsk.install
index 262560b..52a4507 100644
--- a/debian/linpsk.install
+++ b/debian/linpsk.install
@@ -1,2 +1,3 @@
 debian/linpsk.desktop	usr/share/applications
 images/linpsk.png	usr/share/pixmaps
+debian/linpsk.xpm	usr/share/pixmaps
diff --git a/debian/linpsk.menu b/debian/linpsk.menu
index efd1745..e328f95 100644
--- a/debian/linpsk.menu
+++ b/debian/linpsk.menu
@@ -1,2 +1,2 @@
 ?package(linpsk):needs="X11" section="Applications/Amateur Radio"\
-  title="linpsk" description="Digital mode terminal" icon="linpsk.xpm" command="/usr/bin/linpsk"
+  title="linpsk" description="Digital mode terminal" icon="/usr/share/pixmaps/linpsk.xpm" command="/usr/bin/linpsk"
diff --git a/debian/patches/ftbfs-clang.patch b/debian/patches/ftbfs-clang.patch
index 0200841..8cf0fc1 100644
--- a/debian/patches/ftbfs-clang.patch
+++ b/debian/patches/ftbfs-clang.patch
@@ -1,3 +1,8 @@
+Description: Fix FTBFS with Clang instead of GCC
+Author: Alexander <sanek23994 at gmail.com>
+Reviewed-by: Iain R. Learmonth <irl at fsfe.org>
+Last-Update: 2015-05-04
+
 --- linpsk.orig/src/csound.cpp
 +++ linpsk/src/csound.cpp
 @@ -21,7 +21,7 @@
diff --git a/debian/patches/series b/debian/patches/series
index d8897f3..63db1fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+typo.patch
 ftbfs-clang.patch
diff --git a/debian/patches/typo.patch b/debian/patches/typo.patch
new file mode 100644
index 0000000..740409c
--- /dev/null
+++ b/debian/patches/typo.patch
@@ -0,0 +1,24 @@
+Description: Fix some typos
+Author: Iain R. Learmonth <irl at fsfe.org>
+Last-Update: 2015-05-04
+
+--- linpsk.orig/gui/linpsk.cpp
++++ linpsk/gui/linpsk.cpp
+@@ -352,7 +352,7 @@
+   RxDisplay->stop_process_loop();
+   if ( settings.ActChannel == 0 )
+   {
+-    QMessageBox::critical ( 0, " Programm Error! LinPsk", "No active Channel available" );
++    QMessageBox::critical ( 0, " Program Error! LinPsk", "No active Channel available" );
+     TxDisplay->TxFunctions->setStatus ( UNDEF );
+     return;
+   }
+@@ -403,7 +403,7 @@
+   }
+   if ( Sound <= NULL )
+   {
+-    QMessageBox::critical ( 0, " Programm Error! LinPsk", "Could not create Sound Device for Output" );
++    QMessageBox::critical ( 0, " Program Error! LinPsk", "Could not create Sound Device for Output" );
+     TxDisplay->TxFunctions->setStatus ( ON );
+     return;
+   }

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