[hamradio-commits] [qsstv] 04/05: Updated so build isn't dependent on metapackage Fixed a missed spelling error in upstream

[Dave Hibberd]

This is an automated email from the git hooks/post-receive script.

hibby-guest pushed a commit to branch master
in repository qsstv.

commit 68f891a5d8e1afdc4904db37bd7e9e9109ad77a7
Author: Hibby <d at vehibberd.com>
Date:   Wed Jun 1 21:36:27 2016 +0100

    Updated so build isn't dependent on metapackage
    Fixed a missed spelling error in upstream
---
 debian/control                           | 2 +-
 debian/patches/Fix_Binary_Spelling.quilt | 9 +++++++++
 debian/rules                             | 3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 736152d..e629b25 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
 Uploaders: Steve Kostecke <steve at debian.org>, Colin Tuckley <colint at debian.org>, Dave Hibberd <d at vehibberd.com> 
 Standards-Version: 3.9.8
 Homepage: http://users.telenet.be/on4qz
-Build-Depends: debhelper (>=9), libfftw3-dev, qt5-default, libhamlib-dev, libasound2-dev, libopenjp2-7-dev, libv4l-dev, libpulse-dev
+Build-Depends: debhelper (>=9), libfftw3-dev, qtbase5-dev, qtchooser, qt5-qmake, qtbase5-dev-tools, libhamlib-dev, libasound2-dev, libopenjp2-7-dev, libv4l-dev, libpulse-dev
 
 Package: qsstv
 Architecture: linux-any
diff --git a/debian/patches/Fix_Binary_Spelling.quilt b/debian/patches/Fix_Binary_Spelling.quilt
index 04cd37e..bc246c7 100644
--- a/debian/patches/Fix_Binary_Spelling.quilt
+++ b/debian/patches/Fix_Binary_Spelling.quilt
@@ -13,3 +13,12 @@ Last-Update: 2016-05-24
                               + "\n Last Modified: " + fi.lastModified().toString()
                               ,QMessageBox::Ok);
    }
+@@ -526,7 +526,7 @@
+   {
+     QMessageBox::information(this,"Image Properties",
+                              " Image width:   " + QString::number(orgWidth)
+-                             + "\n Image heigth:  " + QString::number(orgHeight)
++                             + "\n Image height:  " + QString::number(orgHeight)
+                              ,QMessageBox::Ok);
+   }
+ 
diff --git a/debian/rules b/debian/rules
index 61ee0af..f11282f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,11 @@
 #!/usr/bin/make -f
 
+export QT_SELECT=5
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
 	dh $@
 
 override_dh_auto_build:
-	sed -n '77,125p' qsstv/documentation/manual/manual.txt > CHANGELOG.groff
+	sed -n '77,125p' qsstv/documentation/manual/manual.txt > CHANGELOG
 	dh_auto_build

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