summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog11
-rw-r--r--debian/control8
-rwxr-xr-xdebian/rules6
3 files changed, 19 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 06905ce..7350e43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+bibletime (2.11.2-9) unstable; urgency=medium
+
+ * alternative build-dep on libqtwebkit5-dev, Closes: #913782
+ it should build on archs where qtwebengine5 is not available
+ BibleTime appears to prefer qtwebengine so using that
+ when available rather than libqtwebkit5 everywhere
+ * d/rules: remove unnecessary --parallel
+ * d/control: fix Vcs fields (wrong way round)
+
+ -- Daniel Glassey <wdg@debian.org> Thu, 15 Nov 2018 22:59:33 +0700
+
bibletime (2.11.2-8) unstable; urgency=medium
* d/control: dep libsword 1.8.1+dfsg-8
diff --git a/debian/control b/debian/control
index 7dbc37f..a3c1b5e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: kde
Build-Depends: quilt (>= 0.46-7~), debhelper (>= 11),
libsword-dev (>= 1.8.1+dfsg-8), libclucene-dev, cmake,
pkg-config, libcurl4-gnutls-dev, git,
- qtbase5-dev, qttools5-dev, qtwebengine5-dev, libqt5svg5-dev
+ qtbase5-dev, qttools5-dev, qtwebengine5-dev | libqtwebkit5-dev, libqt5svg5-dev
Priority: optional
Maintainer: CrossWire Packaging Team <pkg-crosswire-devel@alioth-lists.debian.net>
Uploaders: Daniel Glassey <wdg@debian.org>,
@@ -13,11 +13,11 @@ Uploaders: Daniel Glassey <wdg@debian.org>,
Teus Benschop <teusjannette@gmail.com>
Standards-Version: 4.2.1
Homepage: http://www.bibletime.info/
-Vcs-Git: https://salsa.debian.org/pkg-crosswire-team/bibletime
-Vcs-Browser: https://salsa.debian.org/pkg-crosswire-team/bibletime.git
+Vcs-Git: https://salsa.debian.org/pkg-crosswire-team/bibletime.git
+Vcs-Browser: https://salsa.debian.org/pkg-crosswire-team/bibletime
Package: bibletime
-Architecture: amd64 arm64 armhf i386 mipsel
+Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
bibletime-data (=${source:Version})
Provides: sword-frontend
diff --git a/debian/rules b/debian/rules
index fa6408b..ee09297 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,15 @@
#!/usr/bin/make -f
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
# Hardening
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
%:
- dh $@ -Scmake --parallel
+ dh $@ -Scmake
override_dh_auto_test:
echo "Skip dh_auto_test because the tests rely on a display which is not there"