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

8 files changed, 46 insertions, 28 deletions

diff --git a/debian/lenny/applications/gtk-qt-engine/debian/control b/debian/lenny/applications/gtk-qt-engine/debian/control
index 7fedac3f0..fdb470268 100644
--- a/debian/lenny/applications/gtk-qt-engine/debian/control
+++ b/debian/lenny/applications/gtk-qt-engine/debian/control
@@ -21,3 +21,13 @@ Description: theme engine using Qt for GTK+ 2.x and Trinity
  .
  Please note that this package is targeted at Trinity users and therefore provides
  a way to configure it from within KControl.
+
+Package: gtk-qt-engine-trinity-dbg
+Section: devel
+Architecture: any
+Priority: extra
+Depends: gtk-qt-engine-trinity (= ${binary:Version}), tdelibs-trinity-dbg
+Description: debugging symbols for the GTK-Qt Theme Engine [Trinity]
+ This package contains the debugging symbols associated with gtk-qt-engine-trinity.
+ They will automatically be used by gdb for debugging gtk-qt-engine-trinity-related
+ issues.
diff --git a/debian/lenny/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install b/debian/lenny/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install
new file mode 100644
index 000000000..73ebaf828
--- /dev/null
+++ b/debian/lenny/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install
@@ -0,0 +1,5 @@
+debian/tmp/opt/trinity/lib/trinity/*.so*
+debian/tmp/opt/trinity/lib/trinity/*.la
+debian/tmp/opt/trinity/share/
+debian/tmp/usr/lib/
+debian/tmp/usr/share/themes/Qt/gtk-2.0/
diff --git a/debian/lenny/applications/kchmviewer/debian/debiandirs b/debian/lenny/applications/kchmviewer/debian/debiandirs
index 4ef41159b..a190453fb 100644
--- a/debian/lenny/applications/kchmviewer/debian/debiandirs
+++ b/debian/lenny/applications/kchmviewer/debian/debiandirs
@@ -1,9 +1,9 @@
-export kde_prefix=/usr
+export kde_prefix=/opt/trinity
 export sysconfdir=/etc
-export kde_includedir=/usr/include/tde
-export infodir=/usr/share/info
-export mandir=/usr/share/man
+export kde_includedir=/opt/trinity/include/tde
+export infodir=/opt/trinity/share/info
+export mandir=/opt/trinity/share/man
 export qtdir=/usr/share/qt3
-export kde_cgidir=/usr/lib/cgi-bin
+export kde_cgidir=/opt/trinity/lib/cgi-bin
 export kde_confdir=/etc/trinity
-export kde_htmldir=/usr/share/doc/tde/HTML
+export kde_htmldir=/opt/trinity/share/doc/tde/HTML
diff --git a/debian/lenny/applications/kchmviewer/debian/rules b/debian/lenny/applications/kchmviewer/debian/rules
index c22afc5a3..e3fdf7aac 100755
--- a/debian/lenny/applications/kchmviewer/debian/rules
+++ b/debian/lenny/applications/kchmviewer/debian/rules
@@ -1,14 +1,10 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+-include debian/debiandirs
+
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
 DEB_CONFIGURE_PREFIX := /opt/trinity
@@ -43,8 +39,6 @@ else
 	CFLAGS += -O2
 endif
 
--include debian/debiandirs
-
 build: debian/build-kde
 
 debian/build-kde:
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/control b/debian/squeeze/applications/gtk-qt-engine/debian/control
index 7fedac3f0..fdb470268 100644
--- a/debian/squeeze/applications/gtk-qt-engine/debian/control
+++ b/debian/squeeze/applications/gtk-qt-engine/debian/control
@@ -21,3 +21,13 @@ Description: theme engine using Qt for GTK+ 2.x and Trinity
  .
  Please note that this package is targeted at Trinity users and therefore provides
  a way to configure it from within KControl.
+
+Package: gtk-qt-engine-trinity-dbg
+Section: devel
+Architecture: any
+Priority: extra
+Depends: gtk-qt-engine-trinity (= ${binary:Version}), tdelibs-trinity-dbg
+Description: debugging symbols for the GTK-Qt Theme Engine [Trinity]
+ This package contains the debugging symbols associated with gtk-qt-engine-trinity.
+ They will automatically be used by gdb for debugging gtk-qt-engine-trinity-related
+ issues.
diff --git a/debian/squeeze/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install b/debian/squeeze/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install
new file mode 100644
index 000000000..73ebaf828
--- /dev/null
+++ b/debian/squeeze/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install
@@ -0,0 +1,5 @@
+debian/tmp/opt/trinity/lib/trinity/*.so*
+debian/tmp/opt/trinity/lib/trinity/*.la
+debian/tmp/opt/trinity/share/
+debian/tmp/usr/lib/
+debian/tmp/usr/share/themes/Qt/gtk-2.0/
diff --git a/debian/squeeze/applications/kchmviewer/debian/debiandirs b/debian/squeeze/applications/kchmviewer/debian/debiandirs
index 4ef41159b..a190453fb 100644
--- a/debian/squeeze/applications/kchmviewer/debian/debiandirs
+++ b/debian/squeeze/applications/kchmviewer/debian/debiandirs
@@ -1,9 +1,9 @@
-export kde_prefix=/usr
+export kde_prefix=/opt/trinity
 export sysconfdir=/etc
-export kde_includedir=/usr/include/tde
-export infodir=/usr/share/info
-export mandir=/usr/share/man
+export kde_includedir=/opt/trinity/include/tde
+export infodir=/opt/trinity/share/info
+export mandir=/opt/trinity/share/man
 export qtdir=/usr/share/qt3
-export kde_cgidir=/usr/lib/cgi-bin
+export kde_cgidir=/opt/trinity/lib/cgi-bin
 export kde_confdir=/etc/trinity
-export kde_htmldir=/usr/share/doc/tde/HTML
+export kde_htmldir=/opt/trinity/share/doc/tde/HTML
diff --git a/debian/squeeze/applications/kchmviewer/debian/rules b/debian/squeeze/applications/kchmviewer/debian/rules
index c22afc5a3..e3fdf7aac 100755
--- a/debian/squeeze/applications/kchmviewer/debian/rules
+++ b/debian/squeeze/applications/kchmviewer/debian/rules
@@ -1,14 +1,10 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+-include debian/debiandirs
+
 DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
 DEB_CONFIGURE_PREFIX := /opt/trinity
@@ -43,8 +39,6 @@ else
 	CFLAGS += -O2
 endif
 
--include debian/debiandirs
-
 build: debian/build-kde
 
 debian/build-kde: