[hamradio-commits] [linpsk] 01/05: Removed patches no longer relevant
Iain Learmonth
irl-guest at moszumanska.debian.org
Mon May 4 19:17:02 UTC 2015
This is an automated email from the git hooks/post-receive script.
irl-guest pushed a commit to branch master
in repository linpsk.
commit 750e6bf6667587966ecd54211bb247df3108aaa2
Author: Iain R. Learmonth <irl at fsfe.org>
Date: Mon May 4 17:12:08 2015 +0100
Removed patches no longer relevant
---
debian/changelog | 7 +-
debian/patches/gcc-4.6.patch | 24 -------
debian/patches/qt4.patch | 152 -------------------------------------------
debian/patches/series | 3 -
debian/patches/typo.patch | 23 -------
5 files changed, 5 insertions(+), 204 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d00e927..6fa78ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-linpsk (1.2) UNRELEASED; urgency=medium
+linpsk (1.2-1) UNRELEASED; urgency=medium
- * Acknowledge NMU
* Team upload
+ * Acknowledge NMU
* New upstream version (Closes: #773755):
* debian/watch:
- Now checks for alternative archive extensions
@@ -11,6 +11,9 @@ linpsk (1.2) UNRELEASED; urgency=medium
- Removed version from build dependency on libqt4-dev
* Refreshed patches:
- Removed demowave.patch - now included upstream
+ - Removed qt4.patch - no longer relevant
+ - Removed typo.patch - no longer relevant
+ - Removed gcc-4.6.patch - no longer relevant
-- Iain R. Learmonth <irl at fsfe.org> Sun, 03 May 2015 20:29:26 +0100
diff --git a/debian/patches/gcc-4.6.patch b/debian/patches/gcc-4.6.patch
deleted file mode 100644
index 539ccb8..0000000
--- a/debian/patches/gcc-4.6.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/qt4.patch b/debian/patches/qt4.patch
deleted file mode 100644
index 4a80d5a..0000000
--- a/debian/patches/qt4.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-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 --git a/debian/patches/series b/debian/patches/series
index ce07e7d..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +0,0 @@
-qt4.patch
-typo.patch
-gcc-4.6.patch
diff --git a/debian/patches/typo.patch b/debian/patches/typo.patch
deleted file mode 100644
index 4a5c68e..0000000
--- a/debian/patches/typo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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;
- }
--
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