[hamradio-commits] [wsjtx] 09/09: Updates for Qt 5
Iain R. Learmonth
irl at moszumanska.debian.org
Sun Oct 18 21:48:33 UTC 2015
This is an automated email from the git hooks/post-receive script.
irl pushed a commit to branch master
in repository wsjtx.
commit 71c717edc92fa771c857b3c2e5ed65f523f68f90
Author: Iain R. Learmonth <irl at debian.org>
Date: Sun Oct 18 20:53:55 2015 +0100
Updates for Qt 5
---
debian/control | 9 +-
debian/copyright | 285 +-------------------------
debian/patches/0006-cmake-modifications.patch | 32 +++
debian/patches/series | 1 +
debian/rules | 3 +-
5 files changed, 50 insertions(+), 280 deletions(-)
diff --git a/debian/control b/debian/control
index e488a14..e651bd6 100644
--- a/debian/control
+++ b/debian/control
@@ -6,13 +6,19 @@ Section: hamradio
Priority: optional
Build-Depends: debhelper (>= 8.0.0),
qtbase5-dev,
+ qtmultimedia5-dev,
+ libqt5serialport5-dev,
+ libqt5opengl5-dev,
+ cmake,
gfortran,
hardening-wrapper,
libfftw3-dev,
libhamlib-dev,
libqwt-dev,
libsamplerate0-dev,
- portaudio19-dev (>= 19+svn20111121-1~)
+ portaudio19-dev (>= 19+svn20111121-1~),
+ python-all,
+ asciidoc
Standards-Version: 3.9.6
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-hamradio/wsjtx.git
Vcs-Git: git://anonscm.debian.org/pkg-hamradio/wsjtx.git
@@ -22,6 +28,7 @@ Package: wsjtx
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
+ ${python:Depends},
libhamlib-utils
Description: weak-signal amateur radio communications
wsjtx is designed to facilitate Amateur Radio communication under extreme
diff --git a/debian/copyright b/debian/copyright
index 5831eb4..7fc3927 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,281 +1,10 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
Upstream-Name: wsjtx
-Source: http://www.physics.princeton.edu/pulsar/K1JT/wsjtx-1.5.0.tgz
+Upstream-Maintainer: Joe Taylor <k1jt at arrl.net>
+Upstream-Source: http://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html
Files: *
-Copyright: 2001-2013 by Joseph H. Taylor, Jr., K1JT
-License: GPL-2+
-
-Files: debian/*
-Copyright: 2013 John T. Nogatch <jnogatch at gmail.com>
-License: GPL-2+
-
-Files: lib/char.h lib/decode_rs.c lib/encode_rs.c lib/fano232.f90 lib/init_rs.c lib/int.h lib/rs.h
-Copyright: 2002, Phil Karn KA9Q
-License: GPL
-
-Files: lib/vit216.c
-Copyright: 1999 Phil Karn, KA9Q
-License: GPL
-
-Files: lib/tstrig.h
-Copyright: 2000-2010, Stephane Fillod
-License: GPL-2+
-
-Files: rigclass.h rigclass.cpp
-Copyright: 2001-2003 Stephane Fillod
-License: LGPL-2.1+
-
-Files: plotter.h plotter.cpp
-Copyright: 2010 Moe Wheatley
-License: BSD-2-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- .
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
- .
- THIS SOFTWARE IS PROVIDED BY Moe Wheatley ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL Moe Wheatley OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- .
- The views and conclusions contained in the software and documentation
- are those of the authors and should not be interpreted as representing
- official policies, either expressed or implied, of Moe Wheatley.
-
-Files: PSKReporter.h
-Copyright: 2008 Philip Gladstone
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-License: GPL
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 1, or (at your option)
- any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA
- .
- On Debian systems, the complete text of the GNU General
- Public License can be found in "/usr/share/common-licenses/GPL".
-
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License can be found in "/usr/share/common-licenses/GPL-2".
-
-License: LGPL-2.1+
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
- .
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
- .
- This version of the GNU Lesser General Public License incorporates
- the terms and conditions of version 3 of the GNU General Public
- License, supplemented by the additional permissions listed below.
- .
- 0. Additional Definitions.
- .
- As used herein, "this License" refers to version 3 of the GNU Lesser
- General Public License, and the "GNU GPL" refers to version 3 of the GNU
- General Public License.
- .
- "The Library" refers to a covered work governed by this License,
- other than an Application or a Combined Work as defined below.
- .
- An "Application" is any work that makes use of an interface provided
- by the Library, but which is not otherwise based on the Library.
- Defining a subclass of a class defined by the Library is deemed a mode
- of using an interface provided by the Library.
- .
- A "Combined Work" is a work produced by combining or linking an
- Application with the Library. The particular version of the Library
- with which the Combined Work was made is also called the "Linked
- Version".
- .
- The "Minimal Corresponding Source" for a Combined Work means the
- Corresponding Source for the Combined Work, excluding any source code
- for portions of the Combined Work that, considered in isolation, are
- based on the Application, and not on the Linked Version.
- .
- The "Corresponding Application Code" for a Combined Work means the
- object code and/or source code for the Application, including any data
- and utility programs needed for reproducing the Combined Work from the
- Application, but excluding the System Libraries of the Combined Work.
- .
- 1. Exception to Section 3 of the GNU GPL.
- .
- You may convey a covered work under sections 3 and 4 of this License
- without being bound by section 3 of the GNU GPL.
- .
- 2. Conveying Modified Versions.
- .
- If you modify a copy of the Library, and, in your modifications, a
- facility refers to a function or data to be supplied by an Application
- that uses the facility (other than as an argument passed when the
- facility is invoked), then you may convey a copy of the modified
- version:
- .
- a) under this License, provided that you make a good faith effort to
- ensure that, in the event an Application does not supply the
- function or data, the facility still operates, and performs
- whatever part of its purpose remains meaningful, or
- .
- b) under the GNU GPL, with none of the additional permissions of
- this License applicable to that copy.
- .
- 3. Object Code Incorporating Material from Library Header Files.
- .
- The object code form of an Application may incorporate material from
- a header file that is part of the Library. You may convey such object
- code under terms of your choice, provided that, if the incorporated
- material is not limited to numerical parameters, data structure
- layouts and accessors, or small macros, inline functions and templates
- (ten or fewer lines in length), you do both of the following:
- .
- a) Give prominent notice with each copy of the object code that the
- Library is used in it and that the Library and its use are
- covered by this License.
- .
- b) Accompany the object code with a copy of the GNU GPL and this license
- document.
- .
- 4. Combined Works.
- .
- You may convey a Combined Work under terms of your choice that,
- taken together, effectively do not restrict modification of the
- portions of the Library contained in the Combined Work and reverse
- engineering for debugging such modifications, if you also do each of
- the following:
- .
- a) Give prominent notice with each copy of the Combined Work that
- the Library is used in it and that the Library and its use are
- covered by this License.
- .
- b) Accompany the Combined Work with a copy of the GNU GPL and this license
- document.
- .
- c) For a Combined Work that displays copyright notices during
- execution, include the copyright notice for the Library among
- these notices, as well as a reference directing the user to the
- copies of the GNU GPL and this license document.
- .
- d) Do one of the following:
- .
- 0) Convey the Minimal Corresponding Source under the terms of this
- License, and the Corresponding Application Code in a form
- suitable for, and under terms that permit, the user to
- recombine or relink the Application with a modified version of
- the Linked Version to produce a modified Combined Work, in the
- manner specified by section 6 of the GNU GPL for conveying
- Corresponding Source.
- .
- 1) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (a) uses at run time
- a copy of the Library already present on the user's computer
- system, and (b) will operate properly with a modified version
- of the Library that is interface-compatible with the Linked
- Version.
- .
- e) Provide Installation Information, but only if you would otherwise
- be required to provide such information under section 6 of the
- GNU GPL, and only to the extent that such information is
- necessary to install and execute a modified version of the
- Combined Work produced by recombining or relinking the
- Application with a modified version of the Linked Version. (If
- you use option 4d0, the Installation Information must accompany
- the Minimal Corresponding Source and Corresponding Application
- Code. If you use option 4d1, you must provide the Installation
- Information in the manner specified by section 6 of the GNU GPL
- for conveying Corresponding Source.)
- .
- 5. Combined Libraries.
- .
- You may place library facilities that are a work based on the
- Library side by side in a single library together with other library
- facilities that are not Applications and are not covered by this
- License, and convey such a combined library under terms of your
- choice, if you do both of the following:
- .
- a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities,
- conveyed under the terms of this License.
- .
- b) Give prominent notice with the combined library that part of it
- is a work based on the Library, and explaining where to find the
- accompanying uncombined form of the same work.
- .
- 6. Revised Versions of the GNU Lesser General Public License.
- .
- The Free Software Foundation may publish revised and/or new versions
- of the GNU Lesser General Public License from time to time. Such new
- versions will be similar in spirit to the present version, but may
- differ in detail to address new problems or concerns.
- .
- Each version is given a distinguishing version number. If the
- Library as you received it specifies that a certain numbered version
- of the GNU Lesser General Public License "or any later version"
- applies to it, you have the option of following the terms and
- conditions either of that published version or of any later version
- published by the Free Software Foundation. If the Library as you
- received it does not specify a version number of the GNU Lesser
- General Public License, you may choose any version of the GNU Lesser
- General Public License ever published by the Free Software Foundation.
- .
- If the Library as you received it specifies that a proxy can decide
- whether future versions of the GNU Lesser General Public License shall
- apply, that proxy's public statement of acceptance of any version is
- permanent authorization for you to choose that version for the
- Library.
+Copyright: Copyright (C) 2001-2014 by Joe Taylor, K1JT.
+License: GPL v3
+ The full text of the GPL is distributed in
+ /usr/share/common-licenses/GPL-3 on Debian systems.
diff --git a/debian/patches/0006-cmake-modifications.patch b/debian/patches/0006-cmake-modifications.patch
new file mode 100644
index 0000000..55dab34
--- /dev/null
+++ b/debian/patches/0006-cmake-modifications.patch
@@ -0,0 +1,32 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -697,6 +697,7 @@
+ # Widgets finds its own dependencies.
+ find_package (Qt5Widgets 5 REQUIRED)
+ find_package (Qt5Multimedia 5 REQUIRED)
++find_package (Qt5SerialPort 5 REQUIRED)
+
+ if (WIN32)
+ add_definitions (-DQT_NEEDS_QTMAIN)
+@@ -923,8 +924,8 @@
+ add_dependencies (wsjtx manpages)
+ endif (NOT WSJT_SKIP_MANPAGES)
+ if (NOT APPLE)
+- add_subdirectory (debian)
+- add_dependencies (wsjtx debian)
++ #add_subdirectory (debian)
++ #add_dependencies (wsjtx debian)
+ endif (NOT APPLE)
+ endif (UNIX)
+
+--- a/wsjtx.pro
++++ b/wsjtx.pro
+@@ -13,7 +13,7 @@
+ VERSION = "Not for Release"
+ TEMPLATE = app
+ DEFINES = QT5
+-QMAKE_CXXFLAGS += -std=c++11
++QMAKE_CXXFLAGS += -std=c++11 $$system(pkg-config --cflags-only-I Qt5SerialPort)
+ DEFINES += PROJECT_MANUAL="'\"http://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc/wsjtx-main.html\"'"
+
+ isEmpty (DESTDIR) {
diff --git a/debian/patches/series b/debian/patches/series
index 1ca433d..080dce9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
0003-no-escape-buildroot.patch
0004-inherit-cflags-fflags.patch
0005-fix-fortran-includes.patch
+0006-cmake-modifications.patch
diff --git a/debian/rules b/debian/rules
index a97f5a2..153de77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,8 @@ export DEB_BUILD_HARDENING_BINDNOW=1
override_dh_auto_configure:
echo "running debian/rules/override_dh_auto_configure"
- qmake-qt4
+ cmake .
+ qmake -qt=5
override_dh_auto_build:
echo "running debian/rules/override_dh_auto_build"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/wsjtx.git
More information about the pkg-hamradio-commits
mailing list