[hamradio-commits] [linpsk] 12/25: Imported Debian patch 1.1-1.1

[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 d1dd819ee283f12666a6238cedea1b86af2b4b0e
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Oct 1 14:08:23 2011 +0200

    Imported Debian patch 1.1-1.1
---
 debian/changelog             |  8 ++++++++
 debian/patches/gcc-4.6.patch | 24 ++++++++++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4920bb7..3470f02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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)
diff --git a/debian/patches/gcc-4.6.patch b/debian/patches/gcc-4.6.patch
new file mode 100644
index 0000000..539ccb8
--- /dev/null
+++ b/debian/patches/gcc-4.6.patch
@@ -0,0 +1,24 @@
+Description: Fix FTBFS with g++-4.6.
+Origin: http://launchpadlibrarian.net/80358432/linpsk_1.1-1_1.1-1ubuntu1.diff.gz
+Author: Matthias Klose <doko at ubuntu.com>
+Bug-Debian: http://bugs.debian.org/624967
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/770983
+
+--- linpsk-1.1.orig/src/linpsk.cpp
++++ linpsk-1.1/src/linpsk.cpp
+@@ -685,12 +685,14 @@ void LinPSK::setRxMode()
+     Menu.setParameter ( *Param );
+   if ( Menu.exec() != 0 )
+   {
++    ExtraParameter mParam;
+     Mode rxmode = ( Mode ) Menu.selectedMode();
+     settings.ActChannel->setMode ( rxmode );
+     RxDisplay->RxFreq->setAfcDisplayMode ( settings.ActChannel->AfcProperties() );
+     RxDisplay->RxFreq->setAfcMode ( settings.ActChannel->getAfcMode() );
+     Control->Display->setPhasePointer ( settings.ActChannel->getPhasePointer() );
+-    settings.ActChannel->setParameter ( Extra, &Menu.getParameter() );
++    mParam = Menu.getParameter();
++    settings.ActChannel->setParameter ( Extra, &mParam );
+   }
+   if ( settings.ActChannel != 0 )
+     switch ( settings.ActChannel->getModulationType() )
diff --git a/debian/patches/series b/debian/patches/series
index 4019edb..13ab5ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 demowave.patch
 qt4.patch
 typo.patch
+gcc-4.6.patch

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