Skip to content

Commit

Permalink
Make PPA use Qt 5 by default
Browse files Browse the repository at this point in the history
Except 12.04 LTS all Ubuntu versions supported by us have Qt 5 packages.
To be able to cleanly switch to it for the next release this patch makes
it the default and adjusts the backport script for 12.04 LTS to use the
old qmake as well as the 'qt4-legacy-compat' flag.

Fixes issue #3
  • Loading branch information
hacst committed May 10, 2015
1 parent 4ac0845 commit 544225f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
4 changes: 4 additions & 0 deletions backports/precise
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ while (<F>) {
}
close(F);

$file =~ s/qt5-default[^,]*/libqt4-dev (>= 4.5.0)/;
$file =~ s/libqt5opengl5-dev[^,]*/libqt4-opengl-dev (>= 4.5.0)/;
$file =~ s/libqt5svg5-dev[^,],\n?//;
$file =~ s/ice35/ice34/g;
$file =~ s/ libopus-dev,\n//g;

Expand All @@ -29,6 +32,7 @@ while (<F>) {
}
close(F);

$file =~ s/qmake /qmake-qt4 CONFIG*=qt4-legacy-compat /;
$file =~ s/CONFIG\*=no-bundled-opus \\/CONFIG*=bundled-opus \\/;

open(F, ">debian/rules") or croak;
Expand Down
12 changes: 6 additions & 6 deletions control
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ Uploaders: Thorvald Natvig <thorvald@debian.org>
Build-Depends: debhelper (>= 7.0.8),
po-debconf,
libboost-dev (>= 1.42),
libboost-python-dev (>= 1.42),
libqt4-dev (>= 4.5.0),
libqt4-opengl-dev (>= 4.5.0),
qt5-default,
libqt5svg5-dev,
libqt5opengl5-dev,
hardening-wrapper,
libgl1-mesa-dev,
libasound2-dev,
Expand All @@ -31,13 +31,13 @@ Build-Depends: debhelper (>= 7.0.8),
libxi-dev,
libcap-dev [linux-any]
Standards-Version: 3.9.5
Homepage: http://mumble.sourceforge.net/
Homepage: http://www.mumble.info/

Package: mumble
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
libqt4-sql-sqlite,
libqt5sql5-sqlite,
lsb-release
Suggests: speech-dispatcher,
mumble-server
Expand All @@ -56,7 +56,7 @@ Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
adduser,
libqt4-sql-sqlite
libqt5sql5-sqlite
Suggests: mumble-django
Description: Low latency encrypted VoIP server
Murmur is the VoIP server component for Mumble. Murmur is installed
Expand Down
3 changes: 1 addition & 2 deletions rules
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ export DH_OPTIONS
configure: configure-stamp
configure-stamp:
dh_testdir
qmake-qt4 -recursive main.pro \
CONFIG*=qt4-legacy-compat \
qmake -recursive main.pro \
CONFIG*=release \
CONFIG*=symbols \
CONFIG*=no-embed-qt-translations \
Expand Down

0 comments on commit 544225f

Please sign in to comment.