Use standard build system for tdesvn on Debian and Ubuntu

1 files changed, 17 insertions, 44 deletions

diff --git a/ubuntu/maverick/applications/tdesvn/debian/rules b/ubuntu/maverick/applications/tdesvn/debian/rules
index 6e339cd2e..8041bcf1e 100755
--- a/ubuntu/maverick/applications/tdesvn/debian/rules
+++ b/ubuntu/maverick/applications/tdesvn/debian/rules
@@ -1,53 +1,26 @@
 #!/usr/bin/make -f
 
-PATH := /opt/trinity/bin:$(PATH)
-  
+# 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
+LD_LIBRARY_PATH += :debian/tmp/opt/trinity/lib
+endif
+export LD_LIBRARY_PATH
+
 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 /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-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_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DCMAKE_CXX_FLAGS="-I/opt/trinity/include/kde" -DCMAKE_LDFLAGS="-L/opt/trinity/lib"
+include debian/cdbs/debian-qt-kde.mk
 
-DEB_COMPRESS_EXCLUDE := .dcl .docbook -license .tag .sty .el
+DEB_KDE_APIDOX := yes
 
-DEB_DH_MAKESHLIBS_ARGS_libsvnqt4 := -V
+CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG)
 
-# Tell dh_shlibdeps where to find our own libs.
-DEB_SHLIBDEPS_INCLUDE := debian/tmp/opt/trinity/lib
+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"
 
-common-install-impl::
-	mkdir -p debian/tmp/opt/trinity
-	mkdir -p debian/tmp/opt/trinity/include/kde
-	mkdir -p debian/tmp/usr/lib
-	mkdir -p debian/tmp/opt/trinity/lib
-	mkdir -p debian/tmp/usr/lib/trinity
-	mkdir -p debian/tmp/usr/lib64/trinity
-	touch debian/tmp/usr/lib/trinity/removeme
-	touch debian/tmp/usr/lib64/trinity/removeme
-	mv debian/tmp/usr/lib/trinity/* debian/tmp/usr/lib/
-	mv debian/tmp/usr/lib64/trinity/* debian/tmp/usr/lib64/
-	rm -rf debian/tmp/usr/lib/trinity
-	rm -rf debian/tmp/usr/lib64/trinity
-	cp -Rp debian/tmp/usr/bin debian/tmp/opt/trinity/
-	cp -Rp debian/tmp/usr/lib/* debian/tmp/opt/trinity/lib/
-	cp -Rp debian/tmp/usr/lib64/* debian/tmp/opt/trinity/lib/
-	cp -Rp debian/tmp/usr/share debian/tmp/opt/trinity/
-	cp -Rp debian/tmp/usr/include/* debian/tmp/opt/trinity/include/kde/
-	rm -rf debian/tmp/usr/bin
-	rm -rf debian/tmp/usr/lib/trinity
-	rm -rf debian/tmp/usr/lib64/trinity
-	rm -rf debian/tmp/usr/share
-	rm -rf debian/tmp/usr/include
-	mkdir -p debian/tmp/opt/trinity/lib/trinity
-	touch debian/tmp/opt/trinity/lib/trinity/removeme
-	cp -Rp debian/tmp/opt/trinity/lib/trinity/* debian/tmp/opt/trinity/lib/
-	rm -rf debian/tmp/opt/trinity/lib/trinity
-	rm -rf debian/tmp/opt/trinity/lib/removeme
+# Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
+# never build in parallel, regardless of DEB_BUILD_OPTIONS.
+DEB_BUILD_PARALLEL = true
\ No newline at end of file