Fix install directories for kdesvn on Debian and Ubuntu

8 files changed, 26 insertions, 70 deletions

diff --git a/debian/lenny/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install b/debian/lenny/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install
index f461ccbef..44c022ef7 100644
--- a/debian/lenny/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install
+++ b/debian/lenny/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install
@@ -1,4 +1,4 @@
 debian/tmp/opt/trinity/share/services/*.protocol
-debian/tmp/opt/trinity/lib/kio*
-debian/tmp/opt/trinity/lib/kded_kdesvnd.*
+debian/tmp/opt/trinity/lib/trinity/kio*
+debian/tmp/opt/trinity/lib/trinity/kded_kdesvnd.*
 debian/tmp/opt/trinity/share/services/kded/
diff --git a/debian/lenny/applications/kdesvn/debian/kdesvn-trinity.install b/debian/lenny/applications/kdesvn/debian/kdesvn-trinity.install
index 3b80f418f..546d35034 100644
--- a/debian/lenny/applications/kdesvn/debian/kdesvn-trinity.install
+++ b/debian/lenny/applications/kdesvn/debian/kdesvn-trinity.install
@@ -1,6 +1,6 @@
 debian/icons/kdesvn.xpm	/opt/trinity/share/pixmaps/
 debian/tmp/opt/trinity/bin/
-debian/tmp/opt/trinity/lib/libkdesvnpart.*
+debian/tmp/opt/trinity/lib/trinity/libkdesvnpart.*
 debian/tmp/opt/trinity/share/apps/kdesvn/
 debian/tmp/opt/trinity/share/apps/kdesvnpart/
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/
diff --git a/debian/lenny/applications/kdesvn/debian/libsvnqt-trinity-dev.install b/debian/lenny/applications/kdesvn/debian/libsvnqt-trinity-dev.install
index 798378e12..fb3c81018 100644
--- a/debian/lenny/applications/kdesvn/debian/libsvnqt-trinity-dev.install
+++ b/debian/lenny/applications/kdesvn/debian/libsvnqt-trinity-dev.install
@@ -1,2 +1,2 @@
 debian/tmp/opt/trinity/lib*/*.so
-debian/tmp/opt/trinity/include/kde/svnqt/
+debian/tmp/opt/trinity/include/svnqt/
diff --git a/debian/lenny/applications/kdesvn/debian/rules b/debian/lenny/applications/kdesvn/debian/rules
index b8bfab22c..e289d0818 100755
--- a/debian/lenny/applications/kdesvn/debian/rules
+++ b/debian/lenny/applications/kdesvn/debian/rules
@@ -14,8 +14,15 @@ 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" \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DLIB_SUFFIX=""
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
@@ -27,34 +34,5 @@ DEB_DH_MAKESHLIBS_ARGS_libsvnqt4 := -V
 # Tell dh_shlibdeps where to find our own libs.
 DEB_SHLIBDEPS_INCLUDE := debian/tmp/opt/trinity/lib
 
-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
-
 binary-install/kdesvn-trinity::
 	mv debian/kdesvn-trinity/usr/share/man debian/kdesvn-trinity/opt/trinity/share/
diff --git a/debian/squeeze/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install b/debian/squeeze/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install
index f461ccbef..44c022ef7 100644
--- a/debian/squeeze/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install
+++ b/debian/squeeze/applications/kdesvn/debian/kdesvn-kio-plugins-trinity.install
@@ -1,4 +1,4 @@
 debian/tmp/opt/trinity/share/services/*.protocol
-debian/tmp/opt/trinity/lib/kio*
-debian/tmp/opt/trinity/lib/kded_kdesvnd.*
+debian/tmp/opt/trinity/lib/trinity/kio*
+debian/tmp/opt/trinity/lib/trinity/kded_kdesvnd.*
 debian/tmp/opt/trinity/share/services/kded/
diff --git a/debian/squeeze/applications/kdesvn/debian/kdesvn-trinity.install b/debian/squeeze/applications/kdesvn/debian/kdesvn-trinity.install
index 3b80f418f..546d35034 100644
--- a/debian/squeeze/applications/kdesvn/debian/kdesvn-trinity.install
+++ b/debian/squeeze/applications/kdesvn/debian/kdesvn-trinity.install
@@ -1,6 +1,6 @@
 debian/icons/kdesvn.xpm	/opt/trinity/share/pixmaps/
 debian/tmp/opt/trinity/bin/
-debian/tmp/opt/trinity/lib/libkdesvnpart.*
+debian/tmp/opt/trinity/lib/trinity/libkdesvnpart.*
 debian/tmp/opt/trinity/share/apps/kdesvn/
 debian/tmp/opt/trinity/share/apps/kdesvnpart/
 debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/
diff --git a/debian/squeeze/applications/kdesvn/debian/libsvnqt-trinity-dev.install b/debian/squeeze/applications/kdesvn/debian/libsvnqt-trinity-dev.install
index 798378e12..fb3c81018 100644
--- a/debian/squeeze/applications/kdesvn/debian/libsvnqt-trinity-dev.install
+++ b/debian/squeeze/applications/kdesvn/debian/libsvnqt-trinity-dev.install
@@ -1,2 +1,2 @@
 debian/tmp/opt/trinity/lib*/*.so
-debian/tmp/opt/trinity/include/kde/svnqt/
+debian/tmp/opt/trinity/include/svnqt/
diff --git a/debian/squeeze/applications/kdesvn/debian/rules b/debian/squeeze/applications/kdesvn/debian/rules
index 5dc283b7c..f49bca49b 100755
--- a/debian/squeeze/applications/kdesvn/debian/rules
+++ b/debian/squeeze/applications/kdesvn/debian/rules
@@ -14,8 +14,15 @@ 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" \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DLIB_SUFFIX=""
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
@@ -27,34 +34,5 @@ DEB_DH_MAKESHLIBS_ARGS_libsvnqt4 := -V
 # Tell dh_shlibdeps where to find our own libs.
 DEB_SHLIBDEPS_INCLUDE := debian/tmp/opt/trinity/lib
 
-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
-
 binary-install/kdesvn-trinity::
 	mv debian/kdesvn-trinity/usr/share/man debian/kdesvn-trinity/opt/trinity/share/