[hamradio-commits] [linpsk] 08/25: Imported Debian patch 0.8.1-4

[Iain R. Learmonth]

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

irl pushed a commit to branch master
in repository linpsk.

commit 0294335a39ef38251504dce3e013bb3ed8e2132e
Author: Joop Stakenborg <pa3aba at debian.org>
Date:   Wed Dec 26 11:50:04 2007 +0100

    Imported Debian patch 0.8.1-4
---
 debian/changelog   | 13 +++++++++++++
 debian/control     | 16 ++++++++--------
 debian/linpsk.menu |  2 +-
 debian/rules       |  2 +-
 patch              | 33 +++++++++++++++++++++++++++++++++
 5 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 487b9de..b8b455c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+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
diff --git a/debian/control b/debian/control
index 15fc645..d0d9b0b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: hamradio
 Priority: optional
 Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
 Uploaders: Jaime Robles <jaime at debian.org>, Joop Stakenborg <pa3aba at debian.org>, Patrick Ouellette <pouelle at debian.org>, Hamish Moffatt <hamish at debian.org>
-Build-Depends: debhelper (>> 4), libqt3-mt-dev (>> 3.1.0), fftw3-dev
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>> 4), libqt3-mt-dev (>> 3.1.0), libfftw3-dev
+Standards-Version: 3.7.2
 
 Package: linpsk
 Architecture: any
@@ -13,10 +13,10 @@ 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.
+   - 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 --git a/debian/linpsk.menu b/debian/linpsk.menu
index e4a8b38..e3eafc8 100644
--- a/debian/linpsk.menu
+++ b/debian/linpsk.menu
@@ -1,2 +1,2 @@
-?package(linpsk):needs="X11" section="Apps/Hamradio"\
+?package(linpsk):needs="X11" section="Applications/Amateur Radio"\
   title="linpsk" command="/usr/bin/linpsk"
diff --git a/debian/rules b/debian/rules
index dfe6f3c..ef30ffc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,7 @@ clean:
 	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 
 	dh_clean
 
diff --git a/patch b/patch
new file mode 100644
index 0000000..f7fbd3c
--- /dev/null
+++ b/patch
@@ -0,0 +1,33 @@
+--- csound.cpp.orig	2001-12-03 13:40:50.000000000 -0800
++++ csound.cpp	2004-12-06 09:21:49.000000000 -0800
+@@ -22,8 +22,9 @@
+ {
+ audioformat=AFMT_S16_LE; // 16 Bit little Endian
+ //audioformat=AFMT_U8;
++char *ratestr = getenv("AUDIORATE");
+ mode=0;	//Mono
+-speed=11025;
++speed=(ratestr ? atoi(ratestr) : 11025);
+ fragsize=BUF_SIZE;
+ started=FALSE;
+ 
+-------------------------------------------------------------------------------
+--- linpsk-0.7.1/linpsk/csound.cpp.orig	2003-05-02 09:48:11.000000000 -0700
++++ linpsk-0.7.1/linpsk/csound.cpp	2004-12-06 10:02:11.000000000 -0800
+@@ -25,6 +25,7 @@
+ 
+ CSound::CSound(int ptt = -1):Input(ptt)
+ {
++char *ratestr = getenv("AUDIORATE");
+ #ifdef LINPSK_FOR_MAC
+ audioformat=ESD_BITS16; // 16 Bit little Endian
+ mode=ESD_MONO;	//Mono
+@@ -32,7 +33,7 @@
+ audioformat=AFMT_S16_LE; // 16 Bit little Endian
+ mode=0;	//Mono
+ #endif
+-speed=11025;
++speed=(ratestr ? atoi(ratestr) : 11025);
+ fragsize=BUF_SIZE;
+ started=FALSE;
+ audio_buffer=0;

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