[hamradio-commits] [linpsk] 14/25: Imported Debian patch 1.2-1
Iain R. Learmonth
irl at moszumanska.debian.org
Fri Apr 15 14:02:38 UTC 2016
This is an automated email from the git hooks/post-receive script.
irl pushed a commit to branch master
in repository linpsk.
commit a903e3e01d68a5e19fa60f042137b104e34fbf6f
Merge: d1dd819 cd0aec9
Author: Iain R. Learmonth <irl at fsfe.org>
Date: Mon May 4 19:37:23 2015 +0100
Imported Debian patch 1.2-1
ChangeLog | 9 +-
README | 10 +-
debian/changelog | 24 +
debian/compat | 2 +-
debian/control | 22 +-
debian/copyright | 30 +-
debian/dirs | 1 +
debian/linpsk.desktop | 3 +-
debian/linpsk.install | 3 +
debian/linpsk.menu | 2 +-
debian/patches/demowave.patch | 13 -
debian/patches/ftbfs-clang.patch | 71 +
debian/patches/gcc-4.6.patch | 24 -
debian/patches/qt4.patch | 152 --
debian/patches/series | 4 +-
debian/patches/typo.patch | 15 +-
debian/rules | 62 +-
debian/watch | 2 +-
gui/.directory | 3 -
gui/addmacro.cpp | 83 +-
gui/addmacro.h | 33 +-
gui/addmacro.ui | 446 ++--
gui/controlpanel.cpp | 98 +
gui/controlpanel.h | 50 +
gui/controlpanel.ui | 122 +
{src => gui}/crxdisplay.cpp | 218 +-
{src => gui}/crxdisplay.h | 89 +-
gui/crxdisplay.ui | 336 +++
src/crecording.cpp => gui/ctxdisplay.cpp | 61 +-
src/crecording.h => gui/ctxdisplay.h | 37 +-
gui/ctxdisplay.ui | 119 +
gui/deletemacro.cpp | 85 +-
gui/deletemacro.h | 27 +-
gui/deletemacro.ui | 325 +--
gui/editmacro.cpp | 91 +-
gui/editmacro.h | 27 +-
gui/editmacro.ui | 89 +-
gui/generalsettings.cpp | 105 +-
gui/generalsettings.h | 2 +
gui/generalsettings.ui | 315 ++-
gui/gui.pro | 50 +-
{src => gui}/linpsk.cpp | 590 ++---
{src => gui}/linpsk.h | 57 +-
gui/linpsk.ui | 658 +++++
gui/macrocontrol.cpp | 105 +
gui/{editmacro.h => macrocontrol.h} | 47 +-
gui/macrocontrol.ui | 130 +
gui/qsodata.cpp | 117 +-
gui/qsodata.h | 54 +-
gui/qsodata.ui | 3929 ++++++++++++++++--------------
gui/renamemacro.cpp | 40 +-
gui/renamemacro.h | 23 +-
gui/spectrumdisplay.cpp | 159 ++
{src => gui}/spectrumdisplay.h | 46 +-
gui/spectrumdisplay.ui | 211 ++
gui/txwindow.cpp | 194 ++
gui/{editmacro.h => txwindow.h} | 54 +-
gui/txwindow.ui | 110 +
linpsk.pro | 21 +-
src/cdemodulator.cpp | 5 -
src/cdemodulator.h | 7 +-
src/cledbutton.cpp | 2 -
src/constants.h | 286 ++-
src/controlpanel.cpp | 76 -
src/controlpanel.h | 43 -
src/cpskdemodulator.cpp | 271 +--
src/crxchannel.cpp | 4 +
src/crxchannel.h | 5 +-
src/crxwindow.cpp | 48 +-
src/crxwindow.h | 9 +-
src/csound.cpp | 96 +-
src/csound.h | 1 +
src/csquelch.cpp | 40 +-
src/csquelch.h | 2 +-
src/ctrigger.cpp | 68 -
src/ctxbuffer.cpp | 20 +-
src/ctxbuffer.h | 1 +
src/ctxwindow.cpp | 292 ---
src/ctxwindow.h | 71 -
src/frequencyselect.cpp | 2 +-
src/frequencyselect.h | 1 -
src/macros.cpp | 259 --
src/macros.h | 61 -
src/macrowindow.cpp | 135 -
src/macrowindow.h | 53 -
src/mfskdemodulator.cpp | 3 -
src/parameter.cpp | 14 +-
src/parameter.h | 12 +-
src/processlogdata.cpp | 23 +-
src/pskmodulator.cpp | 4 +-
src/pskmodulator.h | 1 -
src/rttydemodulator.cpp | 0
src/rttydemodulator.h | 0
src/spectrumdisplay.cpp | 354 ---
src/spectrumwindow.cpp | 194 ++
src/spectrumwindow.h | 57 +
src/src.pro | 58 +-
src/tabwidget.cpp | 11 +
src/tabwidget.h | 19 +
src/waterfallwindow.cpp | 89 +
src/{ctrigger.h => waterfallwindow.h} | 56 +-
src/waveinput.cpp | 19 +-
gui/editmacro.h => templates/cpp | 36 -
gui/editmacro.h => templates/h | 36 -
104 files changed, 7181 insertions(+), 5468 deletions(-)
diff --cc debian/changelog
index 3470f02,0000000..87b68ad
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,106 -1,0 +1,130 @@@
++linpsk (1.2-1) unstable; urgency=medium
++
++ * Team upload.
++ * Acknowledge NMU.
++ * New upstream version (Closes: #773755):
++ * debian/watch:
++ - Now checks for alternative archive extensions.
++ * debian/control:
++ - Reformatted with cme.
++ - Bump standards version to 3.9.6.
++ - Removed version from build dependency on libqt4-dev.
++ - Removed old incorrect Vcs-* fields and added new Vcs-* fields for the
++ pkg-hamradio git.
++ * debian/rules:
++ - Streamline using modern dh command.
++ * Refreshed patches:
++ - Removed demowave.patch - now included upstream.
++ - Removed qt4.patch - no longer relevant.
++ - Removed gcc-4.6.patch - no longer relevant.
++ - Refreshed typo.patch - typos have moved.
++ - Included ftbfs-clang.patch (Closes: #753272).
++
++ -- Iain R. Learmonth <irl at fsfe.org> Mon, 04 May 2015 19:37:23 +0100
++
+linpsk (1.1-1.1) unstable; urgency=low
+
+ * NMU.
+ * Apply patch from Ubuntu / Matthias Klose:
+ - Fix FTBFS with g++-4.6. Closes: #624967, LP: #770983.
+
+ -- gregor herrmann <gregoa at debian.org> Sat, 01 Oct 2011 14:08:23 +0200
+
+linpsk (1.1-1) unstable; urgency=low
+
+ * Move to alsa sound system (Closes: #575243)
+ * Move to qt4 packaging
+ * Add menu & desktop entries
+ * Update standards revision to 3.9.1
+ * Update to 3.0 (quilt) for patch management.
+ * Update to debhelper 7
+ * Correct spelling error in messages.
+
+ -- Jerry Stueve <k4int at arrl.net> Sat, 21 Aug 2010 20:00:00 +0000
+
+linpsk (0.8.1-4.1) unstable; urgency=low
+
+ * Retiring - remove myself from the uploaders list.
+
+ -- Joop Stakenborg <pa3aba at debian.org> Sun, 15 Nov 2009 13:33:13 +0000
+
+linpsk (0.8.1-4) unstable; urgency=low
+
+ * Make aptitude render the description nicely. Closes: #389051.
+ * Looking at #284488 I found that the source has changed to much
+ to be able to apply the supplied patch. Please re-submit against
+ recent source code or contact upstream. Closes: #284488.
+ * Menu transition.
+ * Update standards version.
+ * Lintian fixes.
+ * Change build dependencies to include libfftw3-dev, not fftw3-dev.
+
+ -- Joop Stakenborg <pa3aba at debian.org> Wed, 26 Dec 2007 11:50:04 +0100
+
+linpsk (0.8.1-3) unstable; urgency=low
+
+ * Apply patch to src/portaudio/pa_unix_oss.c to allow compilation
+ on GNU/kFreeBSD; thanks to Aurelien Jarno for the patch
+ (closes: #336914)
+ * Added debian/watch file to look for new upstream versions
+
+ -- Hamish Moffatt <hamish at debian.org> Sun, 19 Mar 2006 23:53:34 +1100
+
+linpsk (0.8.1-2) unstable; urgency=low
+
+ * Rebuild for g++ transition / link with libqt3, not libqt3c102
+ (closes: #327304)
+ * Update standards revision to 3.6.2
+
+ -- Hamish Moffatt <hamish at debian.org> Sat, 10 Sep 2005 10:33:30 +0000
+
+linpsk (0.8.1-1) unstable; urgency=low
+
+ * New upstream release 0.8.1
+ * Modified upstream configure.in to support FHS-compliant Qt
+ installation! (ie /usr/include/qt3, not /usr/lib/qt3/include) :-(
+ * Re-autotools with autoconf2.59 and automake-1.9
+ * linpsk is no longer a Debian-native package (dsc/tar.gz)
+ * Now maintained by the debian-hams group
+ * Switch to debhelper 4
+
+ -- Hamish Moffatt <hamish at debian.org> Sun, 10 Apr 2005 18:17:27 +1000
+
+linpsk (0.7.1-1) unstable; urgency=low
+
+ * New upstream 0.7.1
+ * now compiles with g++3, Qt3 (closes: #198541)
+
+ -- Bruce Walker <w1bw at debian.org> Mon, 22 Sep 2003 15:56:30 -0400
+
+linpsk (0.6.2-3) unstable; urgency=low
+
+ * Now let's put config.sub and config.guess in the right place :-)
+ * (closes: #132077)
+
+ -- Bruce Walker <bruce at w1bw.org> Wed, 6 Feb 2002 11:43:38 -0500
+
+linpsk (0.6.2-2) unstable; urgency=low
+
+ * Incorporate latest config.sub and config.guess (closes: #132077)
+
+ -- Bruce Walker <bruce at w1bw.org> Mon, 4 Feb 2002 10:39:11 -0500
+
+linpsk (0.6.2-1) unstable; urgency=low
+
+ * Upstream 0.6.2
+ * Maintainer now <w1bw at debian.org>
+
+ -- Bruce Walker <w1bw at debian.org> Fri, 1 Feb 2002 13:44:51 -0500
+
+linpsk (0.6.1-1) unstable; urgency=low
+
+ * Initial Release.
+ * Debianized...modified makefiles to remove demo sound file
+ * references (not included); docs install handled in debian/docs.
+
+ -- Bruce Walker <bruce at w1bw.org> Sun, 9 Dec 2001 22:32:01 -0500
+
+Local variables:
+mode: debian-changelog
+End:
diff --cc debian/compat
index 7ed6ff8,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 5
++9
diff --cc debian/control
index 252885d,0000000..93686dc
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,26 -1,0 +1,32 @@@
+Source: linpsk
++Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
++Uploaders: Jaime Robles <jaime at debian.org>,
++ Patrick Ouellette <pouelle at debian.org>,
++ Hamish Moffatt <hamish at debian.org>,
++ Jerry Stueve <k4int at arrl.net>
+Section: hamradio
+Priority: optional
- Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
- Uploaders: Jaime Robles <jaime at debian.org>, Patrick Ouellette <pouelle at debian.org>,
- Hamish Moffatt <hamish at debian.org>, Jerry Stueve <k4int at arrl.net>
++Build-Depends: debhelper (>> 9),
++ libqt4-dev,
++ libasound2-dev,
++ libfftw3-dev
++Standards-Version: 3.9.6
++Vcs-Browser: http://anonscm.debian.org/cgit/pkg-hamradio/linpsk.git
++Vcs-Git: http://anonscm.debian.org/git/pkg-hamradio/linpsk.git
+Homepage: http://linpsk.sourceforge.net/
- Build-Depends: debhelper (>> 7), libqt4-dev (>> 4.4.0), libasound2-dev, libfftw3-dev
- Standards-Version: 3.9.1
- Vcs-Svn: https://linpsk.svn.sourceforge.net/svnroot/linpsk
- Vcs-Browser: http://linpsk.svn.sourceforge.net/
+
+Package: linpsk
+Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}
++Depends: ${shlibs:Depends},
++ ${misc:Depends}
+Description: program for operating PSK31/RTTY modes with X GUI
+ linpsk is a program for operating on amateur radio digital modes.
+ linpsk currently supports BPSK, QPSK, and RTTY modes,
+ and it provides an X user interface. linpsk's main features are:
+ - simultaneous decoding of up to four channels
+ - different digital modes may be mixed
+ - trigger text can be defined on each channel
+ - each channel can be logged to a file
+ - user-defined macros and two files for larger texts
+ - spectrum and waterfall displays, both scalable in the frequency domain.
+ At the Moment RTTY only supports 45 baud and 1.5 stopbits.
diff --cc debian/copyright
index 630ea9c,0000000..46a1268
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,16 -1,0 +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 --cc debian/dirs
index e772481,0000000..8fa061d
mode 100644,000000..100644
--- a/debian/dirs
+++ b/debian/dirs
@@@ -1,1 -1,0 +1,2 @@@
+usr/bin
++usr/share/applications
diff --cc debian/linpsk.desktop
index 8a45e6f,0000000..aee5da3
mode 100644,000000..100644
--- a/debian/linpsk.desktop
+++ b/debian/linpsk.desktop
@@@ -1,9 -1,0 +1,10 @@@
+[Desktop Entry]
+Name=Linpsk
+GenericName=Amateur Radio Digital Modem
+Comment=Amateur Radio Sound Card Communications
+Exec=linpsk
+Icon=linpsk
+Terminal=false
+Type=Application
- Categories=Network;HamRadio;
++Categories=Network;HamRadio
++Keywords=Ham Radio;PSK31;Modem
diff --cc debian/linpsk.install
index 0000000,0000000..52a4507
new file mode 100644
--- /dev/null
+++ b/debian/linpsk.install
@@@ -1,0 -1,0 +1,3 @@@
++debian/linpsk.desktop usr/share/applications
++images/linpsk.png usr/share/pixmaps
++debian/linpsk.xpm usr/share/pixmaps
diff --cc debian/linpsk.menu
index efd1745,0000000..e328f95
mode 100644,000000..100644
--- a/debian/linpsk.menu
+++ b/debian/linpsk.menu
@@@ -1,2 -1,0 +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 --cc debian/patches/ftbfs-clang.patch
index 0000000,0000000..8cf0fc1
new file mode 100644
--- /dev/null
+++ b/debian/patches/ftbfs-clang.patch
@@@ -1,0 -1,0 +1,71 @@@
++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 @@
++
++ using namespace std;
++ extern Parameter settings;
++-CSound::CSound ( int ptt = -1 ) : Input ( ptt )
+++CSound::CSound ( int ptt ) : Input ( ptt )
++ {
++ started = false;
++ output = false;
++--- linpsk.orig/src/csound.h
+++++ linpsk/src/csound.h
++@@ -37,7 +37,7 @@
++ class CSound : public Input
++ {
++ public:
++- CSound ( int ptt );
+++ CSound ( int ptt = -1 );
++ ~CSound();
++ virtual bool open_Device_write ( QString * );
++ virtual bool open_Device_read ( QString * );
++--- linpsk.orig/src/textinput.cpp
+++++ linpsk/src/textinput.cpp
++@@ -22,7 +22,7 @@
++ extern Parameter settings;
++ extern int errno;
++
++-TextInput::TextInput ( int ptt = -1 ) : Input ( ptt )
+++TextInput::TextInput ( int ptt ) : Input ( ptt )
++ {
++ }
++ TextInput::~TextInput()
++--- linpsk.orig/src/textinput.h
+++++ linpsk/src/textinput.h
++@@ -29,7 +29,7 @@
++ {
++ Q_OBJECT
++ public:
++- TextInput ( int ptt );
+++ TextInput ( int ptt = -1 );
++ ~TextInput();
++
++ /** Opens the Device for writting **/
++--- linpsk.orig/src/waveinput.cpp
+++++ linpsk/src/waveinput.cpp
++@@ -19,7 +19,7 @@
++
++ extern Parameter settings;
++
++-WaveInput::WaveInput(int ptt = -1): Input(ptt)
+++WaveInput::WaveInput(int ptt): Input(ptt)
++ {
++ EightBits=false;
++ }
++--- linpsk.orig/src/waveinput.h
+++++ linpsk/src/waveinput.h
++@@ -31,7 +31,7 @@
++ {
++ Q_OBJECT
++ public:
++- WaveInput ( int ptt );
+++ WaveInput ( int ptt = -1 );
++ ~WaveInput();
++ /** Opens the Device for writting **/
++ bool open_Device_write ( QString * );
diff --cc debian/patches/series
index 13ab5ec,0000000..63db1fc
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,2 @@@
- demowave.patch
- qt4.patch
+typo.patch
- gcc-4.6.patch
++ftbfs-clang.patch
diff --cc debian/patches/typo.patch
index 4a5c68e,0000000..740409c
mode 100644,000000..100644
--- a/debian/patches/typo.patch
+++ b/debian/patches/typo.patch
@@@ -1,23 -1,0 +1,24 @@@
- Correct spelling error identified as bad combination of German & English.
- Submitted to upstream author.
++Description: Fix some typos
++Author: Iain R. Learmonth <irl at fsfe.org>
++Last-Update: 2015-05-04
+
- --- a/src/linpsk.cpp
- +++ b/src/linpsk.cpp
- @@ -482,7 +482,7 @@
++--- 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;
+ }
- @@ -533,7 +533,7 @@
++@@ -403,7 +403,7 @@
+ }
- if ( Sound <= 0 )
++ 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;
+ }
diff --cc debian/rules
index 77f2159,0000000..8ee0708
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,60 -1,0 +1,10 @@@
+#!/usr/bin/make -f
- # Uncomment this to turn on verbose mode.
- export DH_VERBOSE=1
+
- APPNAME := linpsk
- builddir:
- mkdir -p builddir
++%:
++ dh $@
+
- builddir/Makefile: builddir
- cd builddir && qmake-qt4 PREFIX=/usr ../$(APPNAME).pro
++override_dh_auto_install:
++ dh_auto_install
++ mv debian/linpsk/usr/local/bin/linpsk debian/linpsk/usr/bin
++ rm -rf debian/linpsk/usr/local
+
- build: build-stamp
-
- build-stamp: builddir/Makefile
- dh_testdir
- # Add here commands to compile the package.
- cd builddir && $(MAKE)
- touch $@
-
- clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- # Add here commands to clean up after the build process.
- rm -rf builddir
- dh_clean
- install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- # Add here commands to install the package into debian/linpsk
- cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/$(APPNAME) install
-
- # Build architecture-independent files here.
- binary-indep: build install
- # We have nothing to do by default.
-
- # Build architecture-dependent files here.
- binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs --link-doc=linpsk
- dh_installchangelogs ChangeLog
- dh_installexamples
- dh_installman
- dh_installmenu
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
- binary: binary-indep binary-arch
- .PHONY: build clean binary-indep binary-arch binary install configure
diff --cc debian/watch
index 539e85e,0000000..4271153
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,2 @@@
+version=3
- http://sf.net/linpsk/linpsk-(\d.*)\.tar\.gz
++http://sf.net/linpsk/linpsk-(\d.*)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/linpsk.git
More information about the pkg-hamradio-commits
mailing list