From c3714d2ced877d97074ab6186d6c300cb039504c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 13 May 2014 16:46:20 -0500 Subject: [PATCH 1/4] Add debugging symbols package to gtk-qt-engine-trinity --- debian/lenny/applications/gtk-qt-engine/debian/control | 10 ++++++++++ .../gtk-qt-engine/debian/gtk-qt-engine-trinity.install | 5 +++++ .../squeeze/applications/gtk-qt-engine/debian/control | 10 ++++++++++ .../gtk-qt-engine/debian/gtk-qt-engine-trinity.install | 5 +++++ .../maverick/applications/gtk-qt-engine/debian/control | 10 ++++++++++ .../gtk-qt-engine/debian/gtk-qt-engine-trinity.install | 5 +++++ 6 files changed, 45 insertions(+) create mode 100644 debian/lenny/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install create mode 100644 debian/squeeze/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install create mode 100644 ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install 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..37b4423fb --- /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/usr/lib/gtk-2.0/2.10.0/engines/ +debian/usr/share/themes/Qt/gtk-2.0/ 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..37b4423fb --- /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/usr/lib/gtk-2.0/2.10.0/engines/ +debian/usr/share/themes/Qt/gtk-2.0/ diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/control b/ubuntu/maverick/applications/gtk-qt-engine/debian/control index a1529b6d8..86143b89b 100644 --- a/ubuntu/maverick/applications/gtk-qt-engine/debian/control +++ b/ubuntu/maverick/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/ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install b/ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install new file mode 100644 index 000000000..37b4423fb --- /dev/null +++ b/ubuntu/maverick/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/usr/lib/gtk-2.0/2.10.0/engines/ +debian/usr/share/themes/Qt/gtk-2.0/ From 0d6e43d04dfbe3c3119b76280704447a0a45e031 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 13 May 2014 20:28:14 -0500 Subject: [PATCH 2/4] Fix prior commit --- .../gtk-qt-engine/debian/gtk-qt-engine-trinity.install | 4 ++-- .../gtk-qt-engine/debian/gtk-qt-engine-trinity.install | 4 ++-- .../gtk-qt-engine/debian/gtk-qt-engine-trinity.install | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) 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 index 37b4423fb..2a5c00ddd 100644 --- 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 @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/lib/trinity/*.so* debian/tmp/opt/trinity/lib/trinity/*.la debian/tmp/opt/trinity/share/ -debian/usr/lib/gtk-2.0/2.10.0/engines/ -debian/usr/share/themes/Qt/gtk-2.0/ +debian/tmp/usr/lib/gtk-2.0/*/engines/ +debian/tmp/usr/share/themes/Qt/gtk-2.0/ 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 index 37b4423fb..2a5c00ddd 100644 --- 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 @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/lib/trinity/*.so* debian/tmp/opt/trinity/lib/trinity/*.la debian/tmp/opt/trinity/share/ -debian/usr/lib/gtk-2.0/2.10.0/engines/ -debian/usr/share/themes/Qt/gtk-2.0/ +debian/tmp/usr/lib/gtk-2.0/*/engines/ +debian/tmp/usr/share/themes/Qt/gtk-2.0/ diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install b/ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install index 37b4423fb..2a5c00ddd 100644 --- a/ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install +++ b/ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/lib/trinity/*.so* debian/tmp/opt/trinity/lib/trinity/*.la debian/tmp/opt/trinity/share/ -debian/usr/lib/gtk-2.0/2.10.0/engines/ -debian/usr/share/themes/Qt/gtk-2.0/ +debian/tmp/usr/lib/gtk-2.0/*/engines/ +debian/tmp/usr/share/themes/Qt/gtk-2.0/ From 667ba3c078943712504e6fb2c19c8604fa513395 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 13 May 2014 23:14:55 -0500 Subject: [PATCH 3/4] Revert to less specific but more portable installation of qt engine library --- .../gtk-qt-engine/debian/gtk-qt-engine-trinity.install | 2 +- .../gtk-qt-engine/debian/gtk-qt-engine-trinity.install | 2 +- .../gtk-qt-engine/debian/gtk-qt-engine-trinity.install | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 index 2a5c00ddd..73ebaf828 100644 --- 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 @@ -1,5 +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/gtk-2.0/*/engines/ +debian/tmp/usr/lib/ debian/tmp/usr/share/themes/Qt/gtk-2.0/ 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 index 2a5c00ddd..73ebaf828 100644 --- 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 @@ -1,5 +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/gtk-2.0/*/engines/ +debian/tmp/usr/lib/ debian/tmp/usr/share/themes/Qt/gtk-2.0/ diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install b/ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install index 2a5c00ddd..73ebaf828 100644 --- a/ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install +++ b/ubuntu/maverick/applications/gtk-qt-engine/debian/gtk-qt-engine-trinity.install @@ -1,5 +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/gtk-2.0/*/engines/ +debian/tmp/usr/lib/ debian/tmp/usr/share/themes/Qt/gtk-2.0/ From 3033b338e5f09deb6cbb9e26235fd1bed96537cd Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 17 May 2014 13:52:08 +0900 Subject: [PATCH 4/4] Fixed directory configuration for KChmviewer in Debian/Ubuntu. --- .../lenny/applications/kchmviewer/debian/debiandirs | 12 ++++++------ debian/lenny/applications/kchmviewer/debian/rules | 10 ++-------- .../applications/kchmviewer/debian/debiandirs | 12 ++++++------ debian/squeeze/applications/kchmviewer/debian/rules | 10 ++-------- .../applications/kchmviewer/debian/debiandirs | 12 ++++++------ ubuntu/maverick/applications/kchmviewer/debian/rules | 10 ++-------- 6 files changed, 24 insertions(+), 42 deletions(-) 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/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: diff --git a/ubuntu/maverick/applications/kchmviewer/debian/debiandirs b/ubuntu/maverick/applications/kchmviewer/debian/debiandirs index 4ef41159b..a190453fb 100644 --- a/ubuntu/maverick/applications/kchmviewer/debian/debiandirs +++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kchmviewer/debian/rules b/ubuntu/maverick/applications/kchmviewer/debian/rules index c22afc5a3..e3fdf7aac 100755 --- a/ubuntu/maverick/applications/kchmviewer/debian/rules +++ b/ubuntu/maverick/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: