rev 20192 - kde-extras/kid3/trunk/debian

[Patrick Matthäi]

Author: pmatthaei
Date: 2015-12-22 09:21:24 +0000 (Tue, 22 Dec 2015)
New Revision: 20192

Modified:
   kde-extras/kid3/trunk/debian/changelog
   kde-extras/kid3/trunk/debian/control
   kde-extras/kid3/trunk/debian/kid3-core.install
   kde-extras/kid3/trunk/debian/kid3-qt.install
   kde-extras/kid3/trunk/debian/kid3.install
   kde-extras/kid3/trunk/debian/rules
Log:
* Port package to KDE5 and Qt5.


Modified: kde-extras/kid3/trunk/debian/changelog
===================================================================
--- kde-extras/kid3/trunk/debian/changelog	2015-12-21 14:11:52 UTC (rev 20191)
+++ kde-extras/kid3/trunk/debian/changelog	2015-12-22 09:21:24 UTC (rev 20192)
@@ -1,3 +1,9 @@
+kid3 (3.3.1-2) UNRELEASED; urgency=medium
+
+  * Port package to KDE5 and Qt5.
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Tue, 22 Dec 2015 10:21:01 +0100
+
 kid3 (3.3.1-1) unstable; urgency=medium
 
   * New upstream release.

Modified: kde-extras/kid3/trunk/debian/control
===================================================================
--- kde-extras/kid3/trunk/debian/control	2015-12-21 14:11:52 UTC (rev 20191)
+++ kde-extras/kid3/trunk/debian/control	2015-12-22 09:21:24 UTC (rev 20192)
@@ -5,8 +5,15 @@
 Uploaders: Mark Purcell <msp at debian.org>,
  Patrick Matthäi <pmatthaei at debian.org>
 Build-Depends: debhelper (>= 9),
- libqt4-dev,
- kdelibs5-dev,
+ extra-cmake-modules,
+ kio-dev,
+ kdoctools-dev,
+ qtmultimedia5-dev,
+ qtdeclarative5-dev,
+ qttools5-dev,
+ qttools5-dev-tools,
+ qtdeclarative5-dev-tools,
+ qml-module-qtquick2,
  cmake,
  libid3-3.8.3-dev,
  libflac++-dev,
@@ -15,10 +22,9 @@
  libchromaprint-dev,
  libavformat-dev,
  libavcodec-dev,
- docbook-utils,
+ docbook-xsl,
  pkg-config,
  libreadline-dev,
- qt4-dev-tools,
  xsltproc
 Standards-Version: 3.9.6
 Homepage: http://kid3.sourceforge.net/

Modified: kde-extras/kid3/trunk/debian/kid3-core.install
===================================================================
--- kde-extras/kid3/trunk/debian/kid3-core.install	2015-12-21 14:11:52 UTC (rev 20191)
+++ kde-extras/kid3/trunk/debian/kid3-core.install	2015-12-22 09:21:24 UTC (rev 20192)
@@ -1,3 +1,4 @@
 /usr/lib/kid3/*
 /usr/share/dbus-1/interfaces/net.sourceforge.Kid3.xml
 /usr/share/kid3/translations/*
+/usr/share/kid3/qml/script/*

Modified: kde-extras/kid3/trunk/debian/kid3-qt.install
===================================================================
--- kde-extras/kid3/trunk/debian/kid3-qt.install	2015-12-21 14:11:52 UTC (rev 20191)
+++ kde-extras/kid3/trunk/debian/kid3-qt.install	2015-12-22 09:21:24 UTC (rev 20192)
@@ -1,4 +1,5 @@
 /usr/bin/kid3-qt
 /usr/share/applications/kid3-qt.desktop
+/usr/share/appdata/kid3-qt.appdata.xml
 /usr/share/doc/kid3-qt/*
 /usr/share/icons/hicolor/*/apps/kid3-qt.*

Modified: kde-extras/kid3/trunk/debian/kid3.install
===================================================================
--- kde-extras/kid3/trunk/debian/kid3.install	2015-12-21 14:11:52 UTC (rev 20191)
+++ kde-extras/kid3/trunk/debian/kid3.install	2015-12-22 09:21:24 UTC (rev 20192)
@@ -1,5 +1,6 @@
 /usr/bin/kid3
-/usr/share/applications/kde4/kid3.desktop
-/usr/share/doc/kde/HTML/*/kid3/*
+/usr/share/appdata/kid3.appdata.xml
 /usr/share/icons/hicolor/*/apps/kid3.*
-/usr/share/kde4/apps/kid3/kid3ui.rc
+/usr/share/applications/kid3.desktop
+/usr/share/doc/HTML/*/kid3/*
+/usr/share/kxmlgui5/kid3/kid3ui.rc

Modified: kde-extras/kid3/trunk/debian/rules
===================================================================
--- kde-extras/kid3/trunk/debian/rules	2015-12-21 14:11:52 UTC (rev 20191)
+++ kde-extras/kid3/trunk/debian/rules	2015-12-22 09:21:24 UTC (rev 20192)
@@ -3,6 +3,7 @@
 DEB_CMAKE_PREFIX = /usr
 DEB_CONFIG_INSTALL_DIR = $(DEB_CMAKE_PREFIX)/share/kde4/config
 DEB_HTML_INSTALL_DIR = $(DEB_CMAKE_PREFIX)/share/doc/kde/HTML
+BASE_CMAKE_DEFS = -DWITH_QT5=ON -DKDE_INSTALL_BINDIR=$(DEB_CMAKE_PREFIX)/bin -Wno-dev
 
 %:
 	dh $@ --parallel --builddirectory=kid3-build
@@ -11,10 +12,7 @@
 	dh_auto_configure -- \
 		-DSYSCONF_INSTALL_DIR=/etc \
 		-DCMAKE_INSTALL_PREFIX=$(DEB_CMAKE_PREFIX) \
-		-DCONFIG_INSTALL_DIR=$(DEB_CONFIG_INSTALL_DIR) \
-		-DDATA_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/share/kde4/apps \
-		-DHTML_INSTALL_DIR=$(DEB_HTML_INSTALL_DIR) \
-		-DKCFG_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/share/kde4/config.kcfg \
+		$(BASE_CMAKE_DEFS) \
 		-DLIB_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/lib/kid3 \
 		-DCMAKE_C_COMPILER:FILEPATH="$(CC)" \
 		-DCMAKE_CXX_COMPILER:FILEPATH="$(CXX)" \
@@ -28,7 +26,6 @@
 
 override_dh_auto_install:
 	dh_auto_install
-	rm $(CURDIR)/debian/tmp/usr/share/doc/kde/HTML/*/kid3/common
 
 override_dh_makeshlibs:
 	dh_makeshlibs --noscripts