File tree Expand file tree Collapse file tree 3 files changed +11
-3
lines changed Expand file tree Collapse file tree 3 files changed +11
-3
lines changed Original file line number Diff line number Diff line change
1
+ bitcoin (0.14.1-trusty3) trusty; urgency=medium
2
+
3
+ * Build with qt5 if we are on a non-Ubuntu (ie non-Unity) distro.
4
+
5
+ -- Matt Corallo (BlueMatt) <
[email protected] > Thu, 04 May 2017 17:13:00 -0400
6
+
1
7
bitcoin (0.14.1-trusty2) trusty; urgency=medium
2
8
3
9
* Bump minimum boost version in deps.
Original file line number Diff line number Diff line change @@ -18,8 +18,8 @@ Build-Depends: debhelper,
18
18
libboost-thread1.48-dev | libboost-thread-dev (>> 1.47),
19
19
libboost-test1.48-dev | libboost-test-dev (>> 1.47),
20
20
libboost-chrono1.48-dev | libboost-chrono-dev (>> 1.47),
21
- qt4-qmake,
22
- libqt4 -dev,
21
+ qt4-qmake, libqt4-dev,
22
+ qttools5-dev-tools, qttools5 -dev,
23
23
libqrencode-dev,
24
24
libprotobuf-dev, protobuf-compiler,
25
25
python,
Original file line number Diff line number Diff line change @@ -12,10 +12,12 @@ override_dh_auto_clean:
12
12
if [ -f Makefile ]; then $( MAKE) distclean; fi
13
13
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
14
14
15
+ QT =$(shell dpkg-vendor --derives-from Ubuntu && echo qt4 || echo qt5)
16
+
15
17
# Yea, autogen should be run on the source archive, but I like doing git archive
16
18
override_dh_auto_configure :
17
19
./autogen.sh
18
- ./configure --without-miniupnpc --with-gui=qt4
20
+ ./configure --without-miniupnpc --with-gui=$( QT )
19
21
20
22
override_dh_auto_test :
21
23
make check
You can’t perform that action at this time.
0 commit comments