rev 14657 - kde-extras/kid3/trunk/debian
Patrick Matthäi
pmatthaei at alioth.debian.org
Wed May 20 14:12:21 UTC 2009
Author: pmatthaei
Date: 2009-05-20 14:12:21 +0000 (Wed, 20 May 2009)
New Revision: 14657
Modified:
kde-extras/kid3/trunk/debian/changelog
kde-extras/kid3/trunk/debian/rules
Log:
Ready to build against KDE4 and Qt4.
Modified: kde-extras/kid3/trunk/debian/changelog
===================================================================
--- kde-extras/kid3/trunk/debian/changelog 2009-05-20 14:06:14 UTC (rev 14656)
+++ kde-extras/kid3/trunk/debian/changelog 2009-05-20 14:12:21 UTC (rev 14657)
@@ -13,7 +13,7 @@
This fixes the lintian warning copyright-refers-to-symlink-license.
* Adjust build dependencies, so that kid3 builds against Qt4 and KDE4 libs.
- -- Patrick Matthäi <pmatthaei at debian.org> Wed, 20 May 2009 16:05:16 +0200
+ -- Patrick Matthäi <pmatthaei at debian.org> Wed, 20 May 2009 16:11:27 +0200
kid3 (1.1-1) unstable; urgency=low
Modified: kde-extras/kid3/trunk/debian/rules
===================================================================
--- kde-extras/kid3/trunk/debian/rules 2009-05-20 14:06:14 UTC (rev 14656)
+++ kde-extras/kid3/trunk/debian/rules 2009-05-20 14:12:21 UTC (rev 14657)
@@ -34,17 +34,35 @@
-include debian/debiandirs
+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
+
+CMAKE_KDE4_FLAGS += \
+ -DCMAKE_SKIP_RPATH=true \
+ -DKDE4_USE_ALWAYS_FULL_RPATH=false \
+ -DWITH_MP4V2=false \
+ -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 \
+ -DLIB_INSTALL_DIR=$(DEB_CMAKE_PREFIX)/lib
+
debian/debiandirs: admin/debianrules
perl -w admin/debianrules echodirs > debian/debiandirs
build-stamp:
dh_testdir
+ # KDE4 build.
+ mkdir kid3-kde4
+ cd kid3-kde4 && cmake .. $(CMAKE_KDE4_FLAGS)
+ $(MAKE) -C kid3-kde4
+ # Qt4 build.
+ cd kid3-qt && \
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- $(configkde)
- $(MAKE)
- cd kid3-qt; \
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr --with-qmake=qmake-qt3; \
+ --prefix=/usr --with-qmake=qmake-qt4 && \
cd ..
$(MAKE) -C kid3-qt
touch build-stamp
@@ -53,8 +71,9 @@
dh_testdir
dh_testroot
[ ! -f Makefile ] || $(MAKE) -C kid3-qt distclean
- [ ! -f Makefile ] || $(MAKE) distclean
- -rm -f *-stamp po/*.gmo kid3-qt/kid3/*.png kid3-qt/kid3/*.svgz
+ [ ! -f Makefile ] || $(MAKE) -C kid3-kde4 distclean
+ rm -rf kid3-kde4
+ rm -f *-stamp po/*.gmo kid3-qt/kid3/*.png kid3-qt/kid3/*.svgz
dh_clean
install: build
@@ -63,7 +82,7 @@
dh_clean -k
dh_installdirs
# Main install.
- $(MAKE) install DESTDIR=$(CURDIR)/debian/kid3
+ $(MAKE) -C kid3-kde4 install DESTDIR=$(CURDIR)/debian/kid3
$(MAKE) -C kid3-qt install INSTALL_ROOT=$(CURDIR)/debian/kid3-qt
# Make common links for docs.
for p in `dh_listpackages`; do \
More information about the pkg-kde-commits
mailing list