[hamradio-commits] [linpsk] 10/25: Imported Debian patch 1.1-1
Iain R. Learmonth
irl at moszumanska.debian.org
Fri Apr 15 14:02:34 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 86db14154e0685ce8a077408f63c24e9a3c0348b
Merge: 1e0486b 9b6b4c5
Author: Jerry Stueve <k4int at arrl.net>
Date: Sat Aug 21 20:00:00 2010 +0000
Imported Debian patch 1.1-1
AUTHORS | 1 -
ChangeLog | 22 +
INSTALL | 167 -
Makefile.am | 5 -
Makefile.in | 618 -
NEWS | 0
README | 12 +
TODO | 0
acinclude.m4 | 240 -
aclocal.m4 | 6779 -----------
asoundrc | 22 +
config.guess | 1459 ---
config.h.in | 58 -
config.sub | 1549 ---
configure | 21606 ----------------------------------
configure.in | 13 -
debian/AUTHORS | 1 +
debian/README.Debian | 2 +
debian/README.source | 5 +
debian/changelog | 12 +
debian/compat | 2 +-
debian/control | 16 +-
debian/copyright | 2 +-
debian/docs | 4 +-
debian/linpsk.desktop | 9 +
debian/linpsk.menu | 2 +-
debian/linpsk.xpm | 41 +
debian/patches/demowave.patch | 13 +
debian/patches/qt4.patch | 152 +
debian/patches/series | 3 +
debian/patches/typo.patch | 23 +
debian/rules | 55 +-
debian/source/format | 1 +
depcomp | 441 -
gui/.directory | 3 +
gui/addmacro.cpp | 91 +
gui/addmacro.h | 60 +
gui/addmacro.ui | 383 +
gui/addrxwindow.cpp | 55 +
gui/addrxwindow.h | 52 +
gui/addrxwindow.ui | 247 +
gui/deletemacro.cpp | 87 +
gui/deletemacro.h | 53 +
gui/deletemacro.ui | 292 +
gui/editmacro.cpp | 72 +
gui/editmacro.h | 55 +
gui/editmacro.ui | 165 +
gui/generalsettings.cpp | 180 +
gui/generalsettings.h | 53 +
gui/generalsettings.ui | 512 +
gui/gui.pro | 48 +
gui/modemenu.cpp | 104 +
gui/modemenu.h | 54 +
gui/modemenu.ui | 344 +
gui/qsodata.cpp | 425 +
gui/qsodata.h | 80 +
gui/qsodata.ui | 1883 +++
gui/renamemacro.cpp | 61 +
gui/renamemacro.h | 53 +
gui/renamemacro.ui | 227 +
linpsk.png => images/linpsk.png | Bin
install-sh | 276 -
linpsk.pro | 23 +
ltmain.sh | 6495 ----------
missing | 336 -
mkinstalldirs | 111 -
patch | 33 -
src/Makefile.am | 57 -
src/Makefile.in | 696 --
src/addrxwindow.h | 62 -
src/application.qrc | 5 +
src/bpskdemodulator.cpp | 2 +-
src/bpskdemodulator.h | 1 +
src/bpskmodulator.cpp | 107 +-
src/cdemodulator.cpp | 8 +-
src/cdemodulator.h | 3 +-
src/cledbutton.cpp | 22 +-
src/cledbutton.h | 2 +-
src/constants.h | 18 +-
src/controlpanel.cpp | 39 +-
src/controlpanel.h | 5 +-
src/cpskdemodulator.cpp | 322 +-
src/cpskdemodulator.h | 18 +-
src/crecording.cpp | 12 +-
src/crecording.h | 9 +-
src/crxchannel.cpp | 337 +-
src/crxchannel.h | 2 +-
src/crxdisplay.cpp | 575 +-
src/crxdisplay.h | 149 +-
src/crxwindow.cpp | 376 +-
src/crxwindow.h | 85 +-
src/csound.cpp | 698 +-
src/csound.h | 60 +-
src/csquelch.cpp | 344 +-
src/csquelch.h | 20 +-
src/ctrigger.cpp | 24 +-
src/ctrigger.h | 6 +-
src/ctxbuffer.cpp | 10 +-
src/ctxbuffer.h | 4 +-
src/ctxdisplay.cpp | 25 +-
src/ctxdisplay.h | 19 +-
src/ctxfunctions.cpp | 94 -
src/ctxfunctions.h | 55 -
src/ctxwindow.cpp | 382 +-
src/ctxwindow.h | 5 +-
src/deinterleaver.cpp | 66 +-
src/deinterleaver.h | 12 +-
src/deletemacro.h | 66 -
src/editmacro.h | 69 -
src/feccoder.cpp | 6 +-
src/feccoder.h | 2 +-
src/fircoeffs.h | 5 +-
src/frequencyselect.cpp | 38 +-
src/frequencyselect.h | 5 +-
src/fskdemodulator.cpp | 175 -
src/fskdemodulator.h | 62 -
src/fskmodulator.cpp | 11 +-
src/fskmodulator.h | 8 +-
src/input.cpp | 22 +-
src/input.h | 54 +-
src/interfaces/Makefile.am | 65 -
src/interfaces/Makefile.in | 494 -
src/interfaces/addmacro.h | 85 -
src/interfaces/addmacro.ui | 538 -
src/interfaces/addmacro.ui.h | 58 -
src/interfaces/addrxwindow.h | 62 -
src/interfaces/addrxwindow.ui | 264 -
src/interfaces/addrxwindow.ui.h | 25 -
src/interfaces/deletemacro.h | 66 -
src/interfaces/deletemacro.ui | 293 -
src/interfaces/deletemacro.ui.h | 77 -
src/interfaces/editmacro.h | 69 -
src/interfaces/editmacro.ui | 245 -
src/interfaces/editmacro.ui.h | 58 -
src/interfaces/generalsettings.h | 97 -
src/interfaces/generalsettings.ui | 720 --
src/interfaces/generalsettings.ui.h | 181 -
src/interfaces/modemenu.h | 70 -
src/interfaces/modemenu.ui | 416 -
src/interfaces/modemenu.ui.h | 66 -
src/interfaces/qsodata.h | 90 -
src/interfaces/qsodata.ui | 860 --
src/interfaces/qsodata.ui.h | 179 -
src/interfaces/renamemacro.h | 65 -
src/interfaces/renamemacro.ui | 257 -
src/interfaces/renamemacro.ui.h | 46 -
src/interleaver.cpp | 53 +-
src/interleaver.h | 12 +-
src/linpsk.cpp | 1717 ++-
src/linpsk.h | 42 +-
src/macros.cpp | 365 +-
src/macros.h | 16 +-
src/macrowindow.cpp | 221 +-
src/macrowindow.h | 31 +-
src/main.cpp | 23 +-
src/mfskdemodulator.cpp | 322 +-
src/mfskdemodulator.h | 80 +-
src/mfskmodulator.cpp | 159 +-
src/mfskmodulator.h | 4 +-
src/modemenu.cpp | 159 -
src/parameter.cpp | 50 +-
src/parameter.h | 27 +-
src/portaudio/Makefile.am | 6 -
src/portaudio/Makefile.in | 471 -
src/portaudio/pa_convert.c | 470 -
src/portaudio/pa_host.h | 191 -
src/portaudio/pa_lib.c | 833 --
src/portaudio/pa_trace.c | 83 -
src/portaudio/pa_trace.h | 67 -
src/portaudio/pa_unix.c | 1122 --
src/portaudio/pa_unix.h | 141 -
src/portaudio/pa_unix_oss.c | 468 -
src/portaudio/portaudio.h | 468 -
src/processlogdata.cpp | 150 +
src/processlogdata.h | 62 +
src/pskmodulator.cpp | 1074 +-
src/qpskdemodulator.cpp | 8 +-
src/qsodata.cpp | 237 -
src/qsoinfo.cpp | 35 -
src/qsoinfo.h | 45 -
src/readonlystringlistmodel.cpp | 35 +
src/readonlystringlistmodel.h | 41 +
src/rttydemodulator.cpp | 984 +-
src/rttydemodulator.h | 52 +-
src/rttymodulator.cpp | 2 +-
src/spectrumdisplay.cpp | 500 +-
src/spectrumdisplay.h | 29 +-
src/src.pro | 130 +
src/textinput.cpp | 142 +-
src/textinput.h | 42 +-
src/viterbi.cpp | 8 +-
src/viterbi.h | 7 +-
src/viterbisoft.cpp | 953 ++
src/viterbisoft.h | 75 +
src/waveinput.cpp | 12 +-
src/waveinput.h | 56 +-
stamp-h | 1 -
stamp-h.in | 1 -
198 files changed, 12359 insertions(+), 56876 deletions(-)
diff --cc debian/AUTHORS
index 0000000,0000000..a0d07f8
new file mode 100644
--- /dev/null
+++ b/debian/AUTHORS
@@@ -1,0 -1,0 +1,1 @@@
++Volker Schroer, DL1KSV
diff --cc debian/README.Debian
index 0edd8e6,0000000..6d4c5fc
mode 100644,000000..100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@@ -1,6 -1,0 +1,8 @@@
+linpsk for Debian
+-----------------
+
+The sound files for the "Demo" mode are not incuded in this distribution.
+
+ -- Bruce Walker <bruce at w1bw.org>, Sun, 9 Dec 2001 22:32:01 -0500
++
++Add example asoundrc file for appending to user's .asoundrc in home directory.
diff --cc debian/README.source
index 0000000,0000000..9dc3fca
new file mode 100644
--- /dev/null
+++ b/debian/README.source
@@@ -1,0 -1,0 +1,5 @@@
++This package uses quilt to manage all modifications to the upstream
++source. Changes are stored in the source package as diffs in
++debian/patches and applied during the build.
++
++See /usr/share/doc/quilt/README.source for a detailed explanation.
diff --cc debian/changelog
index 38b86cf,0000000..4920bb7
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,86 -1,0 +1,98 @@@
++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 b8626c4,0000000..7ed6ff8
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 4
++5
diff --cc debian/control
index 57f3256,0000000..252885d
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,22 -1,0 +1,26 @@@
+Source: linpsk
+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>
- Build-Depends: debhelper (>> 4), libqt3-mt-dev (>> 3.1.0), libfftw3-dev
- Standards-Version: 3.7.2
++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>
++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}
- Description: Program for operating PSK31/RTTY modes with X GUI
- linpsk is a program for operating on amateur radio digital modes.
++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 def6aaa,0000000..630ea9c
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,16 -1,0 +1,16 @@@
+This package was debianized by Bruce Walker <w1bw at debian.org> on
+Sun, 9 Dec 2001 22:32:01 -0500.
+
+It was downloaded from linpsk.sourceforge.net.
+
+Upstream Author: Volker Schroer <dl1ksv at gmx.de>
+
+Copyright:
- This software is copyright (c) 2000-2001 by Volker Schroer
++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.
+
+
diff --cc debian/docs
index 62deb04,0000000..c974164
mode 100644,000000..100644
--- a/debian/docs
+++ b/debian/docs
@@@ -1,1 -1,0 +1,3 @@@
- AUTHORS
++debian/AUTHORS
++README
++asoundrc
diff --cc debian/linpsk.desktop
index 0000000,0000000..8a45e6f
new file mode 100644
--- /dev/null
+++ b/debian/linpsk.desktop
@@@ -1,0 -1,0 +1,9 @@@
++[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;
diff --cc debian/linpsk.menu
index e3eafc8,0000000..efd1745
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" command="/usr/bin/linpsk"
++ title="linpsk" description="Digital mode terminal" icon="linpsk.xpm" command="/usr/bin/linpsk"
diff --cc debian/linpsk.xpm
index 0000000,0000000..cee0de2
new file mode 100644
--- /dev/null
+++ b/debian/linpsk.xpm
@@@ -1,0 -1,0 +1,41 @@@
++/* XPM */
++static char *linpsk[] = {
++/* columns rows colors chars-per-pixel */
++"32 32 3 1",
++" c #000000",
++". c #00C000",
++"X c #FFFFFF",
++/* pixels */
++"................................",
++"................................",
++"................................",
++"................................",
++".....XX...........XXXXXX........",
++"....XXXX........XXXXXXXXXX......",
++"...XXXXXX......XXXXXXXXXXXX.....",
++"...XXXXXX......XXXXXXXXXXXX.....",
++"..XXXXXXXX....XXXXXXXXXXXXXX....",
++"..XXXXXXXX...XXXXXXXXXXXXXXXX...",
++".XXXXXXXXXX..XXXXXXXXXXXXXXXX...",
++".XXXXXXXXXX.XXXXXXXXXXXXXXXXXX.X",
++"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
++".XXXXXXXXXX.XXXXXXXXXXXXXXXXXX.X",
++".XXXXXXXXXX.XXXXXXXXXXXXXXXXXX.X",
++"..XXXXXXXX...XXXXXXXXXXXXXXXX...",
++"..XXXXXXXX....XXXXXXXXXXXXXX....",
++"...XXXXXX......XXXXXXXXXXXX.....",
++"...XXXXXX......XXXXXXXXXXXX.....",
++"....XXXX........XXXXXXXXXX......",
++".....XX...........XXXXXX........",
++"................................",
++"................................",
++"................................",
++".... ... . .. . .. . .. ....",
++".... ... . .. . .. . ... . .....",
++".... ... . . . .. .. .. ......",
++".... ... . . . .... . ......",
++".... ... . .. . ...... . . .....",
++".... . . .. . .... .. .. ....",
++"................................",
++"................................"
++};
diff --cc debian/patches/demowave.patch
index 0000000,0000000..8ec36f0
new file mode 100644
--- /dev/null
+++ b/debian/patches/demowave.patch
@@@ -1,0 -1,0 +1,13 @@@
++Found while troubleshooting. Already in upstream VCS.
++
++--- linpsk-1.1.orig/src/waveinput.cpp 2010-06-04 12:48:07.000000000 -0400
+++++ linpsk-1.1/src/waveinput.cpp 2010-06-04 12:48:07.000000000 -0400
++@@ -48,7 +48,7 @@
++ bool WaveInput::open_Device_read(QString *errorstring)
++ {
++ char header[5];
++- unsigned char header1[3];
+++ unsigned char header1[4];
++ char c;
++ QString s;
++ int i;
diff --cc debian/patches/qt4.patch
index 0000000,0000000..4a80d5a
new file mode 100644
--- /dev/null
+++ b/debian/patches/qt4.patch
@@@ -1,0 -1,0 +1,152 @@@
++Origin: qt4 make
++Description: QT4 has different qmake than previous version.
++ This patch has been created by dpkg-source during the package build.
++ * Move to qt4 packaging
++ .
++ The person named in the Author field signed this changelog entry.
++Author: Jerry Stueve <k4int at arrl.net>
++Bug-Debian: http://bugs.debian.org/575243
++Last-Update: <2010-06-04>
++
++--- linpsk-1.1.orig/linpsk.pro
+++++ linpsk-1.1/linpsk.pro
++@@ -1,3 +1,9 @@
+++QMAKEVERSION = $$[QMAKE_VERSION]
+++ISQT4 = $$find(QMAKEVERSION, ^[2-9])
+++isEmpty( ISQT4 ) {
+++error("Use the qmake include with Qt4.4 or greater, on Debian that is qmake-qt4");
+++}
+++
++ CONFIG += warn_on \
++ qt \
++ thread \
++@@ -17,7 +23,5 @@ QT += network
++
++ TEMPLATE = subdirs
++
++-LIBS += gui/libgui.a
+++LIBS += bin/libgui.a
++
++-TARGETDEPS += gui/libgui.a \
++-src/../bin/linpsk
++--- linpsk-1.1.orig/src/src.pro
+++++ linpsk-1.1/src/src.pro
++@@ -92,10 +92,9 @@ CONFIG += warn_on \
++ thread \
++ qt \
++ debug
++-TARGET = ../bin/linpsk
+++TARGET = linpsk
++ RESOURCES = application.qrc
++-DESTDIR = .
++-
+++DESTDIR = ../bin
++
++
++ QMAKE_CXXFLAGS_DEBUG += -g3 \
++@@ -103,17 +102,16 @@ QMAKE_CXXFLAGS_DEBUG += -g3 \
++ QMAKE_CXXFLAGS_RELEASE += -O2
++
++
++-
++ QT += network
++
++-INCLUDEPATH += ../gui
+++INCLUDEPATH += ../gui $$OUT_PWD/../gui
++
++-LIBS += ../gui/libgui.a \
+++LIBS += ../bin/libgui.a \
++ -L/usr/lib64 \
++ -L/usr/lib \
++ -lasound \
++ -lfftw3
++-TARGETDEPS += ../gui/libgui.a
+++TARGETDEPS += ../bin/libgui.a
++
++ DISTFILES += ../README ../COPYING \
++ ../ChangeLog \
++@@ -121,10 +119,35 @@ DISTFILES += ../README ../COPYING \
++ ../images/linpsk.png
++
++
+++CONFIG -= debug
++
++-INSTALLS += target
+++ unix {
+++ #VARIABLES
+++ isEmpty(PREFIX) {
+++ PREFIX = /usr/local
+++ }
+++BINDIR = $$PREFIX/bin
+++DATADIR =$$PREFIX/share
++
++-target.path = /usr/local/bin
+++DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"
++
++-CONFIG -= debug
+++INSTALLS += target desktop iconxpm icon26 icon48 icon64
+++
+++ target.path =$$BINDIR
+++
+++ desktop.path = $$DATADIR/applications
+++ desktop.files += ../debian/$${TARGET}.desktop
+++
+++ iconxpm.path = $$DATADIR/pixmaps
+++ iconxpm.files += ../debian/$${TARGET}.xpm
+++
+++ icon26.path = $$DATADIR/icons/hicolor/26x26/apps
+++ icon26.files += ../data/26x26/$${TARGET}.png
+++
+++ icon48.path = $$DATADIR/icons/hicolor/48x48/apps
+++ icon48.files += ../data/48x48/$${TARGET}.png
+++
+++ icon64.path = $$DATADIR/icons/hicolor/64x64/apps
+++ icon64.files += ../data/64x64/$${TARGET}.png
++
+++}
++--- linpsk-1.1.orig/gui/gui.pro
+++++ linpsk-1.1/gui/gui.pro
++@@ -11,7 +11,8 @@ CONFIG += build_all \
++ staticlib \
++ debug
++
++-DESTDIR = .
+++DESTDIR = ../bin
+++INSTALLS -= target
++
++ SOURCES += generalsettings.cpp \
++ addmacro.cpp \
++@@ -46,3 +47,33 @@ QT += network
++
++ INCLUDEPATH += ../src
++
+++ unix {
+++ #VARIABLES
+++ isEmpty(PREFIX) {
+++ PREFIX = /usr/local
+++ }
+++BINDIR = $$PREFIX/bin
+++DATADIR =$$PREFIX/share
+++
+++DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"
+++
+++INSTALLS += desktop iconxpm icon26 icon48 icon64
+++
+++ target.path =$$BINDIR
+++
+++ desktop.path = $$DATADIR/applications/hildon
+++ desktop.files += $${TARGET}.desktop
+++
+++ iconxpm.path = $$DATADIR/pixmap
+++ iconxpm.files += ../data/maemo/$${TARGET}.xpm
+++
+++ icon26.path = $$DATADIR/icons/hicolor/26x26/apps
+++ icon26.files += ../data/26x26/$${TARGET}.png
+++
+++ icon48.path = $$DATADIR/icons/hicolor/48x48/apps
+++ icon48.files += ../data/48x48/$${TARGET}.png
+++
+++ icon64.path = $$DATADIR/icons/hicolor/64x64/apps
+++ icon64.files += ../data/64x64/$${TARGET}.png
+++
+++}
diff --cc debian/patches/series
index 0000000,0000000..4019edb
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,3 @@@
++demowave.patch
++qt4.patch
++typo.patch
diff --cc debian/patches/typo.patch
index 0000000,0000000..4a5c68e
new file mode 100644
--- /dev/null
+++ b/debian/patches/typo.patch
@@@ -1,0 -1,0 +1,23 @@@
++Correct spelling error identified as bad combination of German & English.
++Submitted to upstream author.
++
++--- a/src/linpsk.cpp
+++++ b/src/linpsk.cpp
++@@ -482,7 +482,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 @@
++ }
++ if ( Sound <= 0 )
++ {
++- 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 ef30ffc,0000000..77f2159
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,75 -1,0 +1,60 @@@
+#!/usr/bin/make -f
+# Uncomment this to turn on verbose mode.
- #export DH_VERBOSE=1
++export DH_VERBOSE=1
+
- configure: configure-stamp
- configure-stamp:
- dh_testdir
- ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-qtdir=/usr
++APPNAME := linpsk
++builddir:
++ mkdir -p builddir
+
- touch configure-stamp
++builddir/Makefile: builddir
++ cd builddir && qmake-qt4 PREFIX=/usr ../$(APPNAME).pro
+
- build: configure-stamp build-stamp
- build-stamp:
- dh_testdir
- $(MAKE)
++build: build-stamp
+
- #/usr/bin/docbook-to-man debian/linpsk.sgml > linpsk.1
- touch 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 configure-stamp
-
++ rm -f build-stamp
+ # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
-
++ rm -rf builddir
+ dh_clean
-
+install: build
+ dh_testdir
+ dh_testroot
- dh_clean -k
++ dh_prep
+ dh_installdirs
+
- # Add here commands to install the package into debian/linpsk.
- $(MAKE) install DESTDIR=$(CURDIR)/debian/linpsk
- # Remove unwanted static libraries
- rm -rf debian/linpsk/usr/lib/*.a
++ # 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_installdebconf
- dh_installdocs
++ dh_installdocs --link-doc=linpsk
++ dh_installchangelogs ChangeLog
+ dh_installexamples
- dh_installmenu
- # dh_installlogrotate
- # dh_installemacsen
- # dh_installpam
- # dh_installmime
- # dh_installinit
- # dh_installcron
+ dh_installman
- dh_installinfo
- dh_installchangelogs ChangeLog
++ dh_installmenu
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
- # dh_makeshlibs
+ dh_installdeb
- # dh_perl
+ 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/source/format
index 0000000,0000000..163aaf8
new file mode 100644
--- /dev/null
+++ b/debian/source/format
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)
--
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