[SCM] mediaconch/master: Upgrade to qt5

hyperair at users.alioth.debian.org hyperair at users.alioth.debian.org
Mon Mar 14 18:44:34 UTC 2016


The following commit has been merged in the master branch:
commit 8cecc33835e0da6d2e2f63cdb02f7ba2f58fcf3c
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Mon Mar 14 23:40:03 2016 +0800

    Upgrade to qt5
    
    Closes: #816810

diff --git a/debian/control b/debian/control
index 0b9ceb9..d5a9e7d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,12 +8,13 @@ Build-Depends: debhelper (>= 9),
                tofrodos,
                libmediainfo-dev (>= 0.7.79),
                libzen-dev (>= 0.4.32),
-               libqt4-dev,
+               qt5-qmake,
+               qtbase5-dev,
+               libqt5webkit5-dev,
                libxml2-dev,
                libxslt-dev,
                zlib1g-dev,
                pkg-config,
-               libqtwebkit-dev,
                libcurl4-gnutls-dev,
                libevent-dev,
                libsqlite3-dev,
diff --git a/debian/rules b/debian/rules
index 663755d..676565d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed
+export QT_SELECT = qt5
 
 include /usr/share/dpkg/default.mk
 

-- 
mediaconch packaging



More information about the pkg-multimedia-commits mailing list