[SCM] smtube/master: Switch to QT5.
onlyjob at users.alioth.debian.org
onlyjob at users.alioth.debian.org
Tue May 19 11:36:53 UTC 2015
The following commit has been merged in the master branch:
commit a9673b9398d0c35d4346b00fde136cc55cbddaf4
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date: Tue May 19 21:23:28 2015 +1000
Switch to QT5.
diff --git a/debian/changelog b/debian/changelog
index e79e53c..03b173c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,12 @@ smtube (15.5.10-1) unstable; urgency=medium
* Team upload.
* New upstream release [May 2015] (Closes: #785142).
- * Build-Depends += "libqtwebkit-dev".
+ * Switch to QT5.
+ * Build-Depends:
+ - libqt4-dev (>= 4.3)
+ + libqt5webkit5-dev
+ + qttools5-dev-tools
+ + qtscript5-dev
* Added new "hardening.patch".
* rules: remove upstream Changelog, if empty.
* Updated Vcs-Browser URL.
diff --git a/debian/control b/debian/control
index 4782f41..fbffea4 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,9 @@ Uploaders:
Alessio Treglia <alessio at debian.org>
Build-Depends:
debhelper (>= 9~),
- libqt4-dev (>= 4.3),
- libqtwebkit-dev,
+ libqt5webkit5-dev,
+ qttools5-dev-tools,
+ qtscript5-dev,
zlib1g-dev
Standards-Version: 3.9.6
Homepage: http://smplayer.sourceforge.net/smtube.php
diff --git a/debian/rules b/debian/rules
index 48e4314..1df3bf9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,8 @@
#!/usr/bin/make -f
+export QT_SELECT=5
QMAKE_OPTS = DEFINES+=NO_DEBUG_ON_CONSOLE
-MAKE_OPTS = PREFIX=/usr QMAKE=qmake-qt4 LRELEASE=lrelease-qt4 QMAKE_OPTS="$(QMAKE_OPTS)"
+MAKE_OPTS = PREFIX=/usr QMAKE_OPTS="$(QMAKE_OPTS)"
override_dh_auto_clean:
[ ! -f src/Makefile ] || dh_auto_clean
--
smtube packaging
More information about the pkg-multimedia-commits
mailing list