tags 624967 + pending thanks Dear maintainer, I've prepared an NMU for linpsk (versioned as 1.1-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Cat Power: Empty Shell
diff -Nru linpsk-1.1/debian/changelog linpsk-1.1/debian/changelog
--- linpsk-1.1/debian/changelog 2010-08-22 03:24:17.000000000 +0200
+++ linpsk-1.1/debian/changelog 2011-10-01 14:08:40.000000000 +0200
@@ -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@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 -Nru linpsk-1.1/debian/patches/gcc-4.6.patch linpsk-1.1/debian/patches/gcc-4.6.patch
--- linpsk-1.1/debian/patches/gcc-4.6.patch 1970-01-01 01:00:00.000000000 +0100
+++ linpsk-1.1/debian/patches/gcc-4.6.patch 2011-10-01 14:10:04.000000000 +0200
@@ -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@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 -Nru linpsk-1.1/debian/patches/series linpsk-1.1/debian/patches/series
--- linpsk-1.1/debian/patches/series 2010-08-19 15:48:30.000000000 +0200
+++ linpsk-1.1/debian/patches/series 2011-10-01 14:07:37.000000000 +0200
@@ -1,3 +1,4 @@
demowave.patch
qt4.patch
typo.patch
+gcc-4.6.patch
Attachment:
signature.asc
Description: Digital signature