Merge lp:~sil2100/appmenu-qt/disable_qt5 into lp:appmenu-qt

[Łukasz Zemczak]

Remove the appmenu-qt5 packages - those are now built using the new appmenu-qt5 sources, using QPA and upstream Qt5 approaches to global menus

Remove the appmenu-qt5 packages - those are now built using the new appmenu-qt5 sources, using QPA and upstream Qt5 approaches to global menus

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:59
http://jenkins.qa.ubuntu.com/job/appmenu-qt-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/appmenu-qt-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/appmenu-qt-trusty-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/appmenu-qt-trusty-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/appmenu-qt-ci/4/rebuild

review: Approve (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Looks good, and the new appmenu-qt5 builds already.

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-05-02 15:24:55 +0000
+++ debian/control	2014-01-16 14:06:21 +0000
@@ -1,17 +1,15 @@
 Source: appmenu-qt
 Section: kde
-Priority: extra
+Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian KDE Extras Team <[e-mail]>
 Uploaders: Ritesh Raj Sarraf <[e-mail]>,
 Build-Depends: cmake,
                debhelper (>= 9),
                libdbusmenu-qt-dev,
-               libdbusmenu-qt5-dev,
                libqt4-dev (>= 4:4.8),
                pkg-config,
-               qtbase5-dev (>= 5.0.1+dfsg-0ubuntu4~),
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Homepage: https://launchpad.net/appmenu-qt
 # If you aren't ~indicator-applet-developers but need to upload packaging changes,
 # just go ahead.  ~indicator-applet-developers will notice and sync up the code again.
@@ -27,18 +25,3 @@
  global menu bar
  .
  appmenu-qt will work for applications designed for Qt and KDE
-
-Package: appmenu-qt5
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Suggests: libqt5core5,
-          libqt5dbus5,
-          libqt5gui5,
-          libqt5widgets5,
-Description: application menu for Qt5
- appmenu provides you with an integrated application menu in your
- global menu bar
- .
- appmenu-qt5 will work for applications designed for Qt and KDE
- This is the Qt5 version

=== modified file 'debian/rules'
--- debian/rules	2013-03-28 14:26:55 +0000
+++ debian/rules	2014-01-16 14:06:21 +0000
@@ -8,18 +8,7 @@
 	dh $@
 
 override_dh_auto_configure:
-	mkdir qt4
-	mkdir qt5
-	cd qt4 && QT_SELECT=qt4 cmake -DUSE_QT4=true ../
-	cd qt5 && QT_SELECT=qt5 cmake -DUSE_QT5=true ../
-
-override_dh_auto_build:
-	cd qt4 && make
-	cd qt5 && make
-
-override_dh_auto_install:
-	cd qt4 && make DESTDIR=../debian/appmenu-qt install
-	cd qt5 && make DESTDIR=../debian/appmenu-qt5 install
+	QT_SELECT=qt4 cmake -DUSE_QT4=true 
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
@@ -29,11 +18,3 @@
 
 override_dh_install:
 	dh_install --fail-missing
-
-override_dh_gencontrol:
-	# Ugly hack, since we don't want to have Qt5 as our depends, we prefer
-	# those as Suggests for now
-	sed -i '/^shlibs/s/libqt5[^,]*, //g' debian/appmenu-qt5.substvars
-	sed -i '/^shlibs/s/,[^,]* libqt5.*$$//' debian/appmenu-qt5.substvars
-
-	dh_gencontrol