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

2 files changed, 78 insertions, 6 deletions

diff --git a/debian/lenny/tdesdk/debian/rules b/debian/lenny/tdesdk/debian/rules
index 5a7eda7d0..baa9b59c0 100755
--- a/debian/lenny/tdesdk/debian/rules
+++ b/debian/lenny/tdesdk/debian/rules
@@ -43,9 +43,11 @@ binary-install/tdesdk-scripts-trinity::
 		debian/tdesdk-scripts-trinity/opt/trinity/bin/svn-clean-kde
 	mv -f debian/tdesdk-scripts-trinity/opt/trinity/bin/svnversions \
 		debian/tdesdk-scripts-trinity/opt/trinity/bin/svnversion-kde
-	rm -rf debian/tdesdk-scripts-trinity/opt/share/man/pl
-	rm -rf debian/tdesdk-scripts-trinity/opt/share/man/py
-	rm -rf debian/tdesdk-scripts-trinity/opt/share/man/sh
+	rm -rf debian/tdesdk-scripts-trinity/usr/share/man/pl
+	rm -rf debian/tdesdk-scripts-trinity/usr/share/man/py
+	rm -rf debian/tdesdk-scripts-trinity/usr/share/man/sh
+	mv debian/tdesdk-scripts-trinity/usr/share/man/man1/* debian/tdesdk-scripts-trinity/opt/trinity/share/man/man1/
+	rm -fr debian/tdesdk-scripts-trinity/usr/share/man
 	install -p -D -m644 scripts/kde-buildrc \
 		debian/tdesdk-scripts-trinity/opt/trinity/share/doc/tdesdk-scripts-trinity/kde-buildrc.example
 
@@ -67,3 +69,37 @@ binary-install/kapptemplate-trinity::
 			Doxyfile.global install-sh missing mkinstalldirs nmcheck ylwrap; do \
 		chmod 755 debian/kapptemplate-trinity/opt/trinity/share/apps/kapptemplate/admin/$$admindirfile; \
 	done
+	mv debian/kapptemplate-trinity/usr/share/man debian/kapptemplate-trinity/opt/trinity/share/
+
+binary-install/kbabel-trinity::
+	mv debian/kbabel-trinity/usr/share/man debian/kbabel-trinity/opt/trinity/share/
+
+binary-install/kbugbuster-trinity::
+	mv debian/kbugbuster-trinity/usr/share/man debian/kbugbuster-trinity/opt/trinity/share/
+
+binary-install/kmtrace-trinity::
+	mv debian/kmtrace-trinity/usr/share/man debian/kmtrace-trinity/opt/trinity/share/
+
+binary-install/kompare-trinity::
+	mv debian/kompare-trinity/usr/share/man debian/kompare-trinity/opt/trinity/share/
+
+binary-install/kspy-trinity::
+	mv debian/kspy-trinity/usr/share/man debian/kspy-trinity/opt/trinity/share/
+
+binary-install/kuiviewer-trinity::
+	mv debian/kuiviewer-trinity/usr/share/man debian/kuiviewer-trinity/opt/trinity/share/
+
+binary-install/libcvsservice0-trinity::
+	mv debian/libcvsservice0-trinity/usr/share/man debian/libcvsservice0-trinity/opt/trinity/share/
+
+binary-install/poxml-trinity::
+	mv debian/poxml-trinity/usr/share/man debian/poxml-trinity/opt/trinity/share/
+
+binary-install/tdecachegrind-converters-trinity::
+	mv debian/tdecachegrind-converters-trinity/usr/share/man debian/tdecachegrind-converters-trinity/opt/trinity/share/
+
+binary-install/tdecachegrind-trinity::
+	mv debian/tdecachegrind-trinity/usr/share/man debian/tdecachegrind-trinity/opt/trinity/share/
+
+binary-install/umbrello-trinity::
+	mv debian/umbrello-trinity/usr/share/man debian/umbrello-trinity/opt/trinity/share/
diff --git a/debian/squeeze/tdesdk/debian/rules b/debian/squeeze/tdesdk/debian/rules
index 5a7eda7d0..c80f0a85d 100755
--- a/debian/squeeze/tdesdk/debian/rules
+++ b/debian/squeeze/tdesdk/debian/rules
@@ -43,9 +43,11 @@ binary-install/tdesdk-scripts-trinity::
 		debian/tdesdk-scripts-trinity/opt/trinity/bin/svn-clean-kde
 	mv -f debian/tdesdk-scripts-trinity/opt/trinity/bin/svnversions \
 		debian/tdesdk-scripts-trinity/opt/trinity/bin/svnversion-kde
-	rm -rf debian/tdesdk-scripts-trinity/opt/share/man/pl
-	rm -rf debian/tdesdk-scripts-trinity/opt/share/man/py
-	rm -rf debian/tdesdk-scripts-trinity/opt/share/man/sh
+	rm -rf debian/tdesdk-scripts-trinity/usr/share/man/pl
+	rm -rf debian/tdesdk-scripts-trinity/usr/share/man/py
+	rm -rf debian/tdesdk-scripts-trinity/usr/share/man/sh
+	mv debian/tdesdk-scripts-trinity/usr/share/man/man1/* debian/tdesdk-scripts-trinity/opt/trinity/share/man/man1/
+	rm -rf debian/tdesdk-scripts-trinity/usr/share/man
 	install -p -D -m644 scripts/kde-buildrc \
 		debian/tdesdk-scripts-trinity/opt/trinity/share/doc/tdesdk-scripts-trinity/kde-buildrc.example
 
@@ -67,3 +69,37 @@ binary-install/kapptemplate-trinity::
 			Doxyfile.global install-sh missing mkinstalldirs nmcheck ylwrap; do \
 		chmod 755 debian/kapptemplate-trinity/opt/trinity/share/apps/kapptemplate/admin/$$admindirfile; \
 	done
+	mv debian/kapptemplate-trinity/usr/share/man debian/kapptemplate-trinity/opt/trinity/share/
+
+binary-install/kbabel-trinity::
+	mv debian/kbabel-trinity/usr/share/man debian/kbabel-trinity/opt/trinity/share/
+
+binary-install/kbugbuster-trinity::
+	mv debian/kbugbuster-trinity/usr/share/man debian/kbugbuster-trinity/opt/trinity/share/
+
+binary-install/kmtrace-trinity::
+	mv debian/kmtrace-trinity/usr/share/man debian/kmtrace-trinity/opt/trinity/share/
+
+binary-install/kompare-trinity::
+	mv debian/kompare-trinity/usr/share/man debian/kompare-trinity/opt/trinity/share/
+
+binary-install/kspy-trinity::
+	mv debian/kspy-trinity/usr/share/man debian/kspy-trinity/opt/trinity/share/
+
+binary-install/kuiviewer-trinity::
+	mv debian/kuiviewer-trinity/usr/share/man debian/kuiviewer-trinity/opt/trinity/share/
+
+binary-install/libcvsservice0-trinity::
+	mv debian/libcvsservice0-trinity/usr/share/man debian/libcvsservice0-trinity/opt/trinity/share/
+
+binary-install/poxml-trinity::
+	mv debian/poxml-trinity/usr/share/man debian/poxml-trinity/opt/trinity/share/
+
+binary-install/tdecachegrind-converters-trinity::
+	mv debian/tdecachegrind-converters-trinity/usr/share/man debian/tdecachegrind-converters-trinity/opt/trinity/share/
+
+binary-install/tdecachegrind-trinity::
+	mv debian/tdecachegrind-trinity/usr/share/man debian/tdecachegrind-trinity/opt/trinity/share/
+
+binary-install/umbrello-trinity::
+	mv debian/umbrello-trinity/usr/share/man debian/umbrello-trinity/opt/trinity/share/