aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMatt Corallo <git@bluematt.me>2017-05-04 17:15:16 -0400
committerMatt Corallo <git@bluematt.me>2017-05-05 13:29:38 -0400
commitc5071e1f03085b4025f2a33fb2c3079d823d660c (patch)
treeaae24d00a8fb8085fef1b38566881c1077516a9a /contrib
parenta8e928699a6ab612459e836ba24af143eae37b0f (diff)
Build with QT5 on Debian-based systems using contrib/debian
Diffstat (limited to 'contrib')
-rw-r--r--contrib/debian/changelog6
-rw-r--r--contrib/debian/control4
-rwxr-xr-xcontrib/debian/rules4
3 files changed, 11 insertions, 3 deletions
diff --git a/contrib/debian/changelog b/contrib/debian/changelog
index f38d6da83a..1bef910398 100644
--- a/contrib/debian/changelog
+++ b/contrib/debian/changelog
@@ -1,3 +1,9 @@
+bitcoin (0.14.1-trusty3) trusty; urgency=medium
+
+ * Build with qt5 if we are on a non-Ubuntu (ie non-Unity) distro.
+
+ -- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Thu, 04 May 2017 17:13:00 -0400
+
bitcoin (0.14.1-trusty2) trusty; urgency=medium
* Bump minimum boost version in deps.
diff --git a/contrib/debian/control b/contrib/debian/control
index 53dd4faf41..523b4f936b 100644
--- a/contrib/debian/control
+++ b/contrib/debian/control
@@ -18,8 +18,8 @@ Build-Depends: debhelper,
libboost-thread1.48-dev | libboost-thread-dev (>> 1.47),
libboost-test1.48-dev | libboost-test-dev (>> 1.47),
libboost-chrono1.48-dev | libboost-chrono-dev (>> 1.47),
- qt4-qmake,
- libqt4-dev,
+ qt4-qmake, libqt4-dev,
+ qttools5-dev-tools, qttools5-dev,
libqrencode-dev,
libprotobuf-dev, protobuf-compiler,
python,
diff --git a/contrib/debian/rules b/contrib/debian/rules
index 8db0b2dba5..354f15f320 100755
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -12,10 +12,12 @@ override_dh_auto_clean:
if [ -f Makefile ]; then $(MAKE) distclean; fi
rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/bitcoin-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in
+QT=$(shell dpkg-vendor --derives-from Ubuntu && echo qt4 || echo qt5)
+
# Yea, autogen should be run on the source archive, but I like doing git archive
override_dh_auto_configure:
./autogen.sh
- ./configure --without-miniupnpc --with-gui=qt4
+ ./configure --without-miniupnpc --with-gui=$(QT)
override_dh_auto_test:
make check