Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

1 files changed, 17 insertions, 63 deletions

diff --git a/ubuntu/maverick/applications/rosegarden/debian/rules b/ubuntu/maverick/applications/rosegarden/debian/rules
index 34af02e91..4e4718806 100755
--- a/ubuntu/maverick/applications/rosegarden/debian/rules
+++ b/ubuntu/maverick/applications/rosegarden/debian/rules
@@ -1,75 +1,29 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/dpatch/dpatch.make
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_BUILD_ARCH := $(shell dpkg --print-installation-architecture)
-ARCH=$(DEB_BUILD_ARCH)
-
-ifeq ($(ARCH),alpha)
-CXXFLAGS+=-O0 -mieee
+# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
+# Also include the main Trinity path
+ifeq ("$(LD_LIBRARY_PATH)", "")
+LD_LIBRARY_PATH=debian/tmp/opt/trinity/lib
 else
-CXXFLAGS+=-O2
+LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
 endif
+export LD_LIBRARY_PATH
 
-# DEBUGGING FLAGS.
-# CXXFLAGS+=-g3 -gstabs+ -fexceptions
-# DEB_BUILD_OPTIONS+=nostrip
-# export CXXFLAGS
-# export DEB_BUILD_OPTIONS
-
-###
-
-configure: configure-stamp
-
-configure-stamp:
-	dh_testdir
-	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde CMAKE_INSTALL_PREFIX=/usr cmake .
-	touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp patch-stamp 
-	dh_testdir
-	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde make
-	touch build-stamp
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include debian/cdbs/debian-qt-kde.mk
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
+DEB_KDE_APIDOX := yes
 
-	[ ! -f Makefile ] || make clean
-	rm -rf RGbuild
-	rm -rf CMakeCache.txt
-	rm -rf CMakeFiles
-	rm -f build-stamp
-	rm -f configure-stamp
-	rm -f config.log
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
+CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
 
-	env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde make install DESTDIR=`pwd`/debian/tmp 
-	find debian/tmp/opt/trinity/share -type f -exec chmod 664 {} \;
+DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF"
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+# Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
+# never build in parallel, regardless of DEB_BUILD_OPTIONS.
+DEB_BUILD_PARALLEL = true
 
 # Build architecture-dependent files here.
 binary-arch: build install