From 784405e8180ea3d82b9c983dc6980b395a10099b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 7 Feb 2012 13:25:53 -0600 Subject: Update Debian and Ubuntu packaging files for new TDE include directory name --- ubuntu/maverick/applications/adept/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/adept/debian/rules | 2 +- ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/amarok/debian/rules | 2 +- ubuntu/maverick/applications/basket/debian/rules | 2 +- ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/bibletime/debian/rules | 2 +- .../compizconfig-backend-kconfig/debian/cdbs/kde.mk | 2 +- .../applications/compizconfig-backend-kconfig/debian/rules | 4 ++-- ubuntu/maverick/applications/desktop-effects-tde/debian/rules | 2 +- ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk | 2 +- .../applications/digikam/debian/digikam-trinity.install | 2 +- ubuntu/maverick/applications/digikam/debian/rules | 2 +- ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/filelight-l10n/debian/rules | 4 ++-- ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/filelight/debian/rules | 2 +- ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/gtk-qt-engine/debian/rules | 4 ++-- ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/gwenview/debian/rules | 2 +- ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/k3b/debian/rules | 4 ++-- ubuntu/maverick/applications/k3b/debian/trinity.mk | 2 +- ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/k9copy/debian/rules | 4 ++-- ubuntu/maverick/applications/kaffeine-mozilla/debian/rules | 2 +- ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk | 2 +- .../applications/kaffeine/debian/kaffeine-trinity.install | 2 +- ubuntu/maverick/applications/kaffeine/debian/rules | 2 +- ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/katapult/debian/rules | 2 +- ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kbarcode/debian/rules | 2 +- ubuntu/maverick/applications/kbfx/debian/rules | 6 +++--- ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kbookreader/debian/rules | 4 ++-- ubuntu/maverick/applications/kchmviewer/debian/debiandirs | 2 +- ubuntu/maverick/applications/kchmviewer/debian/rules | 4 ++-- ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kcpuload/debian/rules | 4 ++-- .../maverick/applications/kdbusnotification/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kdbusnotification/debian/rules | 4 ++-- ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kdiff3/debian/rules | 4 ++-- ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kdirstat/debian/rules | 4 ++-- ubuntu/maverick/applications/kdpkg/debian/rules | 2 +- ubuntu/maverick/applications/keep/debian/cdbs/kde.mk | 2 +- .../applications/keep/debian/patches/kubuntu_01_kdepot.diff | 4 ++-- ubuntu/maverick/applications/keep/debian/rules | 4 ++-- ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kerry/debian/rules | 2 +- ubuntu/maverick/applications/kile/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kile/debian/rules | 4 ++-- ubuntu/maverick/applications/kima/debian/rules | 2 +- ubuntu/maverick/applications/kio-apt/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kio-apt/debian/rules | 4 ++-- .../maverick/applications/kio-umountwrapper/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kio-umountwrapper/debian/rules | 4 ++-- ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kmplayer/debian/rules | 4 ++-- ubuntu/maverick/applications/kmyfirewall/debian/debiandirs | 2 +- ubuntu/maverick/applications/kmyfirewall/debian/rules | 8 ++++---- ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk | 2 +- .../applications/kmymoney/debian/kmymoney2-trinity-dev.install | 2 +- ubuntu/maverick/applications/kmymoney/debian/rules | 4 ++-- ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/knemo/debian/rules | 4 ++-- ubuntu/maverick/applications/knetload/debian/rules | 4 ++-- ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/knetstats/debian/rules | 2 +- .../maverick/applications/knetworkmanager8/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/knetworkmanager8/debian/rules | 2 +- ubuntu/maverick/applications/knights/debian/debiandirs | 2 +- ubuntu/maverick/applications/knights/debian/rules | 4 ++-- ubuntu/maverick/applications/knowit/debian/rules | 2 +- ubuntu/maverick/applications/knutclient/debian/rules | 2 +- ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk | 2 +- .../applications/koffice/debian/koffice-dev-trinity.install | 2 +- ubuntu/maverick/applications/koffice/debian/rules | 2 +- ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/konversation/debian/rules | 4 ++-- ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kopete-otr/debian/rules | 4 ++-- ubuntu/maverick/applications/kpicosim/debian/rules | 4 ++-- ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kpilot/debian/rules | 4 ++-- ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kpowersave/debian/rules | 4 ++-- ubuntu/maverick/applications/kradio/debian/rules | 2 +- ubuntu/maverick/applications/krename/debian/rules | 4 ++-- ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/krusader/debian/rules | 4 ++-- .../applications/ksplash-engine-moodin/debian/debiandirs | 2 +- .../maverick/applications/ksplash-engine-moodin/debian/rules | 4 ++-- ubuntu/maverick/applications/ksquirrel/debian/rules | 2 +- ubuntu/maverick/applications/kstreamripper/debian/rules | 4 ++-- ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/ksystemlog/debian/rules | 4 ++-- ubuntu/maverick/applications/ktechlab/debian/debiandirs | 2 +- ubuntu/maverick/applications/ktechlab/debian/rules | 10 +++++----- ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/ktorrent/debian/rules | 4 ++-- ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kuickshow/debian/rules | 4 ++-- ubuntu/maverick/applications/kvirc/debian/rules | 2 +- ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/kvkbd/debian/rules | 4 ++-- ubuntu/maverick/applications/kvpnc/debian/rules | 4 ++-- ubuntu/maverick/applications/piklab/debian/rules | 4 ++-- ubuntu/maverick/applications/potracegui/debian/rules | 2 +- ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/smb4k/debian/rules | 2 +- ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/soundkonverter/debian/rules | 4 ++-- ubuntu/maverick/applications/tde-guidance/debian/rules | 2 +- ubuntu/maverick/applications/tde-style-lipstik/debian/rules | 4 ++-- .../applications/tde-systemsettings/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/tde-systemsettings/debian/rules | 2 +- ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/tdesudo/debian/rules | 4 ++-- ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/tdmtheme/debian/rules | 4 ++-- ubuntu/maverick/applications/tellico/debian/rules | 2 +- .../applications/twin-style-crystal/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/twin-style-crystal/debian/rules | 2 +- ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk | 2 +- ubuntu/maverick/applications/yakuake/debian/rules | 2 +- 129 files changed, 178 insertions(+), 178 deletions(-) (limited to 'ubuntu/maverick/applications') diff --git a/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk b/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/adept/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/adept/debian/rules b/ubuntu/maverick/applications/adept/debian/rules index 9c80b51c7..ee86e8e4f 100755 --- a/ubuntu/maverick/applications/adept/debian/rules +++ b/ubuntu/maverick/applications/adept/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk b/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/amarok/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/amarok/debian/rules b/ubuntu/maverick/applications/amarok/debian/rules index 1e2caae64..deb43ebf7 100755 --- a/ubuntu/maverick/applications/amarok/debian/rules +++ b/ubuntu/maverick/applications/amarok/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/basket/debian/rules b/ubuntu/maverick/applications/basket/debian/rules index 5af81349e..0e699603a 100755 --- a/ubuntu/maverick/applications/basket/debian/rules +++ b/ubuntu/maverick/applications/basket/debian/rules @@ -3,7 +3,7 @@ #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk b/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/bibletime/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/bibletime/debian/rules b/ubuntu/maverick/applications/bibletime/debian/rules index 1ef64a83d..ea4b62326 100755 --- a/ubuntu/maverick/applications/bibletime/debian/rules +++ b/ubuntu/maverick/applications/bibletime/debian/rules @@ -9,7 +9,7 @@ DEB_DH_INSTALL_SOURCEDIR := debian DEB_BUILDDIR = $(DEB_SRCDIR) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules index 820ba5a3b..c5dd59ccb 100755 --- a/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules +++ b/ubuntu/maverick/applications/compizconfig-backend-kconfig/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde 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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/desktop-effects-tde/debian/rules b/ubuntu/maverick/applications/desktop-effects-tde/debian/rules index 7bdd258a5..7bf3e3306 100755 --- a/ubuntu/maverick/applications/desktop-effects-tde/debian/rules +++ b/ubuntu/maverick/applications/desktop-effects-tde/debian/rules @@ -2,7 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk b/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/digikam/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/digikam/debian/digikam-trinity.install b/ubuntu/maverick/applications/digikam/debian/digikam-trinity.install index 87c7fe33f..49fc16b82 100644 --- a/ubuntu/maverick/applications/digikam/debian/digikam-trinity.install +++ b/ubuntu/maverick/applications/digikam/debian/digikam-trinity.install @@ -1,5 +1,5 @@ opt/trinity/bin/digi* -/opt/trinity/include/kde +/opt/trinity/include/tde opt/trinity/lib /opt/trinity/share/apps/digikam /opt/trinity/share/apps/konqueror/servicemenus/digikam*.desktop diff --git a/ubuntu/maverick/applications/digikam/debian/rules b/ubuntu/maverick/applications/digikam/debian/rules index d4b31de95..18181fd83 100755 --- a/ubuntu/maverick/applications/digikam/debian/rules +++ b/ubuntu/maverick/applications/digikam/debian/rules @@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk -include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/filelight-l10n/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/filelight-l10n/debian/rules b/ubuntu/maverick/applications/filelight-l10n/debian/rules index 7eea2f6e2..9255102ce 100755 --- a/ubuntu/maverick/applications/filelight-l10n/debian/rules +++ b/ubuntu/maverick/applications/filelight-l10n/debian/rules @@ -7,7 +7,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -17,7 +17,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine #DEB_PATCHDIRS := debian/patches/common debian/patches #DEB_INSTALL_DOCS_ALL := -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/usr/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk b/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/filelight/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/filelight/debian/rules b/ubuntu/maverick/applications/filelight/debian/rules index a7c79577a..838448085 100755 --- a/ubuntu/maverick/applications/filelight/debian/rules +++ b/ubuntu/maverick/applications/filelight/debian/rules @@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk b/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/gtk-qt-engine/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/gtk-qt-engine/debian/rules b/ubuntu/maverick/applications/gtk-qt-engine/debian/rules index f2ac92c96..0247f6ef3 100755 --- a/ubuntu/maverick/applications/gtk-qt-engine/debian/rules +++ b/ubuntu/maverick/applications/gtk-qt-engine/debian/rules @@ -15,7 +15,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -24,7 +24,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib -DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/kde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" +DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" binary-install/gtk-qt-engine-trinity:: mkdir -p $(CURDIR)/debian/gtk-qt-engine-trinity/opt/trinity/share/kgtk/ diff --git a/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk b/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/gwenview/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/gwenview/debian/rules b/ubuntu/maverick/applications/gwenview/debian/rules index c231b336f..81fd87521 100755 --- a/ubuntu/maverick/applications/gwenview/debian/rules +++ b/ubuntu/maverick/applications/gwenview/debian/rules @@ -7,7 +7,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk b/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/k3b/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/k3b/debian/rules b/ubuntu/maverick/applications/k3b/debian/rules index fa308829e..664df39cf 100755 --- a/ubuntu/maverick/applications/k3b/debian/rules +++ b/ubuntu/maverick/applications/k3b/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde5 +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde5 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_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde" +DEB_CONFIGURE_EXTRA_FLAGS = --with-k3bsetup=no --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" DEB_INSTALL_MANPAGES_k3b = debian/k3b.1 diff --git a/ubuntu/maverick/applications/k3b/debian/trinity.mk b/ubuntu/maverick/applications/k3b/debian/trinity.mk index c48d5d5af..cd71193a1 100644 --- a/ubuntu/maverick/applications/k3b/debian/trinity.mk +++ b/ubuntu/maverick/applications/k3b/debian/trinity.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama --without-arts $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "/opt/trinity/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "/opt/trinity/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk b/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/k9copy/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/k9copy/debian/rules b/ubuntu/maverick/applications/k9copy/debian/rules index 860ee9e84..7f17e00f5 100755 --- a/ubuntu/maverick/applications/k9copy/debian/rules +++ b/ubuntu/maverick/applications/k9copy/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/class/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_k9copy = k9copy-trinity.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kaffeine-mozilla/debian/rules b/ubuntu/maverick/applications/kaffeine-mozilla/debian/rules index 86b977b3f..80fe9807b 100755 --- a/ubuntu/maverick/applications/kaffeine-mozilla/debian/rules +++ b/ubuntu/maverick/applications/kaffeine-mozilla/debian/rules @@ -14,7 +14,7 @@ export DH_OPTIONS DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kaffeine/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kaffeine/debian/kaffeine-trinity.install b/ubuntu/maverick/applications/kaffeine/debian/kaffeine-trinity.install index 825837cba..4777ef63c 100644 --- a/ubuntu/maverick/applications/kaffeine/debian/kaffeine-trinity.install +++ b/ubuntu/maverick/applications/kaffeine/debian/kaffeine-trinity.install @@ -13,7 +13,7 @@ debian/tmp/opt/trinity/share/doc/ debian/tmp/opt/trinity/share/icons/ debian/tmp/opt/trinity/share/mimelnk/application/x-kaffeine.desktop debian/tmp/opt/trinity/share/locale/ -debian/tmp/opt/trinity/include/kde/kaffeine/*h +debian/tmp/opt/trinity/include/tde/kaffeine/*h debian/tmp/opt/trinity/share/services/kaffeineoggvorbis.desktop debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.la debian/tmp/opt/trinity/lib/trinity/libkaffeineoggvorbis.so diff --git a/ubuntu/maverick/applications/kaffeine/debian/rules b/ubuntu/maverick/applications/kaffeine/debian/rules index efff35a86..43e1e0d24 100755 --- a/ubuntu/maverick/applications/kaffeine/debian/rules +++ b/ubuntu/maverick/applications/kaffeine/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk b/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/katapult/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/katapult/debian/rules b/ubuntu/maverick/applications/katapult/debian/rules index f29a6a564..e48ac244a 100755 --- a/ubuntu/maverick/applications/katapult/debian/rules +++ b/ubuntu/maverick/applications/katapult/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kbarcode/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kbarcode/debian/rules b/ubuntu/maverick/applications/kbarcode/debian/rules index bb554f410..35a033bc7 100755 --- a/ubuntu/maverick/applications/kbarcode/debian/rules +++ b/ubuntu/maverick/applications/kbarcode/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/kbfx/debian/rules b/ubuntu/maverick/applications/kbfx/debian/rules index 5ea2ffc62..9d710b00d 100755 --- a/ubuntu/maverick/applications/kbfx/debian/rules +++ b/ubuntu/maverick/applications/kbfx/debian/rules @@ -7,21 +7,21 @@ URL = http://www.$(DEB_SOURCE_PACKAGE).org/release/0.4.9/testing/$(UPFILENAME) DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib #CMAKE_LIBRARY_PATH := /opt/trinity/lib -#CMAKE_INCLUDE_PATH := /opt/trinity/include/kde +#CMAKE_INCLUDE_PATH := /opt/trinity/include/tde include debian/cmake.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde 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_INSTALL_PREFIX="/opt/trinity/" +DEB_CMAKE_EXTRA_FLAGS = -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/tde" -DCMAKE_INSTALL_PREFIX="/opt/trinity/" get-orig-source: @@dh_testdir diff --git a/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kbookreader/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kbookreader/debian/rules b/ubuntu/maverick/applications/kbookreader/debian/rules index 4ceef7d99..b3b57fdb9 100755 --- a/ubuntu/maverick/applications/kbookreader/debian/rules +++ b/ubuntu/maverick/applications/kbookreader/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/class/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde 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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kchmviewer/debian/debiandirs b/ubuntu/maverick/applications/kchmviewer/debian/debiandirs index cb33e0ee3..893052e08 100644 --- a/ubuntu/maverick/applications/kchmviewer/debian/debiandirs +++ b/ubuntu/maverick/applications/kchmviewer/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/usr export sysconfdir=/etc -export kde_includedir=/usr/include/kde +export kde_includedir=/usr/include/tde export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 diff --git a/ubuntu/maverick/applications/kchmviewer/debian/rules b/ubuntu/maverick/applications/kchmviewer/debian/rules index 0466e25ea..72c3fd5bb 100755 --- a/ubuntu/maverick/applications/kchmviewer/debian/rules +++ b/ubuntu/maverick/applications/kchmviewer/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -27,7 +27,7 @@ CFLAGS = -Wall -g CONFIGURE_OPTIONS_KDE = \ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \ - --includedir=/opt/trinity/include/kde --mandir=/opt/trinity/share/man \ + --includedir=/opt/trinity/include/tde --mandir=/opt/trinity/share/man \ --with-qt-dir=$(qtdir) \ --sysconfdir=$(sysconfdir) \ --infodir=/opt/trinity/share/info \ diff --git a/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kcpuload/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kcpuload/debian/rules b/ubuntu/maverick/applications/kcpuload/debian/rules index 2ab783f6d..fae495f36 100755 --- a/ubuntu/maverick/applications/kcpuload/debian/rules +++ b/ubuntu/maverick/applications/kcpuload/debian/rules @@ -5,7 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -79,7 +79,7 @@ configure-stamp: # run configure with build tree $(objdir) cd $(objdir) && \ - ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib + ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib touch configure-stamp diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/rules b/ubuntu/maverick/applications/kdbusnotification/debian/rules index 3fbf27bb0..d47788b3a 100755 --- a/ubuntu/maverick/applications/kdbusnotification/debian/rules +++ b/ubuntu/maverick/applications/kdbusnotification/debian/rules @@ -5,7 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -78,7 +78,7 @@ configure-stamp: # run configure with build tree $(objdir) cd $(objdir) && \ - ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/kde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib + ../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib touch configure-stamp diff --git a/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kdiff3/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kdiff3/debian/rules b/ubuntu/maverick/applications/kdiff3/debian/rules index 90b33c108..e76778235 100755 --- a/ubuntu/maverick/applications/kdiff3/debian/rules +++ b/ubuntu/maverick/applications/kdiff3/debian/rules @@ -4,7 +4,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -37,7 +37,7 @@ config.status: cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in make -f admin/Makefile.common cvs - CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/trinity --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + CFLAGS="$(CFLAGS)" ./configure --disable-rpath --prefix=/opt/trinity --with-qt-includes=/usr/include/qt3 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde build: build-stamp diff --git a/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kdirstat/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kdirstat/debian/rules b/ubuntu/maverick/applications/kdirstat/debian/rules index cf2a8db06..b15f5a9a5 100755 --- a/ubuntu/maverick/applications/kdirstat/debian/rules +++ b/ubuntu/maverick/applications/kdirstat/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde 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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde LDFLAGS += -Wl,--as-needed diff --git a/ubuntu/maverick/applications/kdpkg/debian/rules b/ubuntu/maverick/applications/kdpkg/debian/rules index 59fc3d5a5..b2822c5b3 100755 --- a/ubuntu/maverick/applications/kdpkg/debian/rules +++ b/ubuntu/maverick/applications/kdpkg/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk b/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/keep/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff index 55238c41a..782118729 100644 --- a/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -5,7 +5,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/usr/include/kde/kde.pot ++kdepotpath=/usr/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -16,5 +16,5 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot if ! test -f $kdepotpath; then - kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot + kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot fi diff --git a/ubuntu/maverick/applications/keep/debian/rules b/ubuntu/maverick/applications/keep/debian/rules index 49dc42fae..b6eae04ee 100755 --- a/ubuntu/maverick/applications/keep/debian/rules +++ b/ubuntu/maverick/applications/keep/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_keep := keep.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kerry/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kerry/debian/rules b/ubuntu/maverick/applications/kerry/debian/rules index 0d08e83f9..7dc0fbe23 100755 --- a/ubuntu/maverick/applications/kerry/debian/rules +++ b/ubuntu/maverick/applications/kerry/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk # include /usr/share/cdbs/1/class/kde.mk include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kile/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kile/debian/rules b/ubuntu/maverick/applications/kile/debian/rules index 2d31b63e0..3e19a08ea 100755 --- a/ubuntu/maverick/applications/kile/debian/rules +++ b/ubuntu/maverick/applications/kile/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -15,7 +15,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kile := debian/kile.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kima/debian/rules b/ubuntu/maverick/applications/kima/debian/rules index a353777b4..519575104 100755 --- a/ubuntu/maverick/applications/kima/debian/rules +++ b/ubuntu/maverick/applications/kima/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk DEB_CONFIGURE_EXTRA_FLAGS += --disable-rpath -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/kio-apt/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kio-apt/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kio-apt/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kio-apt/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kio-apt/debian/rules b/ubuntu/maverick/applications/kio-apt/debian/rules index a6d8c580a..9b82c21ad 100755 --- a/ubuntu/maverick/applications/kio-apt/debian/rules +++ b/ubuntu/maverick/applications/kio-apt/debian/rules @@ -5,14 +5,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde 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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kio-umountwrapper/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kio-umountwrapper/debian/rules b/ubuntu/maverick/applications/kio-umountwrapper/debian/rules index ce61aac65..ae8903f41 100755 --- a/ubuntu/maverick/applications/kio-umountwrapper/debian/rules +++ b/ubuntu/maverick/applications/kio-umountwrapper/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde 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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kmplayer/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kmplayer/debian/rules b/ubuntu/maverick/applications/kmplayer/debian/rules index b23d91457..63bf848d1 100755 --- a/ubuntu/maverick/applications/kmplayer/debian/rules +++ b/ubuntu/maverick/applications/kmplayer/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -18,7 +18,7 @@ ifeq ($(GCC_VERSION),4.3) CXX = g++ -fpermissive endif -DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --enable-maintainer-mode --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_INSTALL_MANPAGES_kmplayer = kmplayer.1 diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/debiandirs b/ubuntu/maverick/applications/kmyfirewall/debian/debiandirs index 959f97f68..8b51d74fa 100644 --- a/ubuntu/maverick/applications/kmyfirewall/debian/debiandirs +++ b/ubuntu/maverick/applications/kmyfirewall/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/usr export sysconfdir=/etc -export kde_includedir=/usr/include/kde +export kde_includedir=/usr/include/tde export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 diff --git a/ubuntu/maverick/applications/kmyfirewall/debian/rules b/ubuntu/maverick/applications/kmyfirewall/debian/rules index 1993e3bfe..a8d1312d8 100755 --- a/ubuntu/maverick/applications/kmyfirewall/debian/rules +++ b/ubuntu/maverick/applications/kmyfirewall/debian/rules @@ -6,7 +6,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -56,7 +56,7 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde build: build-stamp @@ -65,7 +65,7 @@ build-stamp: config.status dh_testdir # Add here commands to compile the package. - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) touch build-stamp @@ -94,7 +94,7 @@ install: build dh_clean -k # Add here commands to install the package into debian/kmyfirewall. - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-trinity + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/kmyfirewall-trinity rm -f debian/kmyfirewall-trinity/opt/trinity/lib/*.so chrpath -d debian/kmyfirewall-trinity/opt/trinity/bin/kmyfirewall debian/kmyfirewall-trinity/opt/trinity/lib/*.so.* debian/kmyfirewall-trinity/opt/trinity/lib/trinity/*.so diff --git a/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kmymoney/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kmymoney/debian/kmymoney2-trinity-dev.install b/ubuntu/maverick/applications/kmymoney/debian/kmymoney2-trinity-dev.install index 4c3b73990..f8c5dc4e3 100644 --- a/ubuntu/maverick/applications/kmymoney/debian/kmymoney2-trinity-dev.install +++ b/ubuntu/maverick/applications/kmymoney/debian/kmymoney2-trinity-dev.install @@ -1,3 +1,3 @@ -opt/trinity/include/kde/kmymoney/* +opt/trinity/include/tde/kmymoney/* opt/trinity/lib/lib*.la opt/trinity/lib/lib*.so diff --git a/ubuntu/maverick/applications/kmymoney/debian/rules b/ubuntu/maverick/applications/kmymoney/debian/rules index efb7a96ea..1bb4dc1bf 100755 --- a/ubuntu/maverick/applications/kmymoney/debian/rules +++ b/ubuntu/maverick/applications/kmymoney/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde 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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde --disable-sqlite3 +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde --disable-sqlite3 LDFLAGS += -Wl,--as-needed diff --git a/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/knemo/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/knemo/debian/rules b/ubuntu/maverick/applications/knemo/debian/rules index 143b4cd5e..fd71fe17f 100755 --- a/ubuntu/maverick/applications/knemo/debian/rules +++ b/ubuntu/maverick/applications/knemo/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_DOCS_knemo = -XNEWS -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/knetload/debian/rules b/ubuntu/maverick/applications/knetload/debian/rules index c0beba707..843a04ceb 100755 --- a/ubuntu/maverick/applications/knetload/debian/rules +++ b/ubuntu/maverick/applications/knetload/debian/rules @@ -2,7 +2,7 @@ # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -74,7 +74,7 @@ configure-stamp: # run configure with build tree $(objdir) cd $(objdir) && \ - ../configure $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + ../configure $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde touch configure-stamp diff --git a/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/knetstats/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/knetstats/debian/rules b/ubuntu/maverick/applications/knetstats/debian/rules index 9d3414239..62349e5af 100755 --- a/ubuntu/maverick/applications/knetstats/debian/rules +++ b/ubuntu/maverick/applications/knetstats/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/knetworkmanager8/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/knetworkmanager8/debian/rules b/ubuntu/maverick/applications/knetworkmanager8/debian/rules index 97955e38b..e2e99d9d9 100755 --- a/ubuntu/maverick/applications/knetworkmanager8/debian/rules +++ b/ubuntu/maverick/applications/knetworkmanager8/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/knights/debian/debiandirs b/ubuntu/maverick/applications/knights/debian/debiandirs index d341195a1..ba70ea3fb 100644 --- a/ubuntu/maverick/applications/knights/debian/debiandirs +++ b/ubuntu/maverick/applications/knights/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/usr export sysconfdir=/etc -export kde_includedir=/usr/include/kde +export kde_includedir=/usr/include/tde export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 diff --git a/ubuntu/maverick/applications/knights/debian/rules b/ubuntu/maverick/applications/knights/debian/rules index d7e8330c7..fc447c09a 100755 --- a/ubuntu/maverick/applications/knights/debian/rules +++ b/ubuntu/maverick/applications/knights/debian/rules @@ -6,7 +6,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -51,7 +51,7 @@ config.status: configure patch if [ -f doc/Makefile.in ]; then cp doc/Makefile.in doc/Makefile.in.backup; else mv doc/Makefile.in.backup doc/Makefile.in; fi CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ - --disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/trinity/include/kde --infodir=/opt/trinity/share/info --mandir=/opt/trinity/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib + --disable-debug --disable-rpath --sysconfdir=/etc --includedir=/opt/trinity/include/tde --infodir=/opt/trinity/share/info --mandir=/opt/trinity/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib build: build-stamp diff --git a/ubuntu/maverick/applications/knowit/debian/rules b/ubuntu/maverick/applications/knowit/debian/rules index bd6992a4a..5af8a0aa8 100755 --- a/ubuntu/maverick/applications/knowit/debian/rules +++ b/ubuntu/maverick/applications/knowit/debian/rules @@ -7,7 +7,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/knutclient/debian/rules b/ubuntu/maverick/applications/knutclient/debian/rules index 7e8adfc25..a7655e11e 100755 --- a/ubuntu/maverick/applications/knutclient/debian/rules +++ b/ubuntu/maverick/applications/knutclient/debian/rules @@ -11,7 +11,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk b/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install b/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install index 936153c99..4b80b83ec 100644 --- a/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install +++ b/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde +debian/tmp/opt/trinity/include/tde debian/tmp/opt/trinity/lib/libkarboncommon.la debian/tmp/opt/trinity/lib/libkarboncommon.so debian/tmp/opt/trinity/lib/libkchartcommon.la diff --git a/ubuntu/maverick/applications/koffice/debian/rules b/ubuntu/maverick/applications/koffice/debian/rules index 9bc0b9c76..0c94bbdc9 100755 --- a/ubuntu/maverick/applications/koffice/debian/rules +++ b/ubuntu/maverick/applications/koffice/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk b/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/konversation/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/konversation/debian/rules b/ubuntu/maverick/applications/konversation/debian/rules index 67bc3bb74..359d5f809 100755 --- a/ubuntu/maverick/applications/konversation/debian/rules +++ b/ubuntu/maverick/applications/konversation/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_STRIP_ARGS := --dbg-package=konversation-trinity-dbg DEB_INSTALL_DOCS_ALL = -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kopete-otr/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kopete-otr/debian/rules b/ubuntu/maverick/applications/kopete-otr/debian/rules index 8b49a1a4b..abfd36cfc 100755 --- a/ubuntu/maverick/applications/kopete-otr/debian/rules +++ b/ubuntu/maverick/applications/kopete-otr/debian/rules @@ -3,14 +3,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde 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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kpicosim/debian/rules b/ubuntu/maverick/applications/kpicosim/debian/rules index 3541dc742..8d66d9609 100755 --- a/ubuntu/maverick/applications/kpicosim/debian/rules +++ b/ubuntu/maverick/applications/kpicosim/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -52,7 +52,7 @@ build-stamp: config.status dh_testdir # Add here commands to compile the package. - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) #docbook-to-man debian/kpicosim.sgml > kpicosim.1 touch build-stamp diff --git a/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kpilot/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kpilot/debian/rules b/ubuntu/maverick/applications/kpilot/debian/rules index 8b49a1a4b..abfd36cfc 100755 --- a/ubuntu/maverick/applications/kpilot/debian/rules +++ b/ubuntu/maverick/applications/kpilot/debian/rules @@ -3,14 +3,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde 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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kpowersave/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kpowersave/debian/rules b/ubuntu/maverick/applications/kpowersave/debian/rules index 2c4fb87d0..49718160e 100755 --- a/ubuntu/maverick/applications/kpowersave/debian/rules +++ b/ubuntu/maverick/applications/kpowersave/debian/rules @@ -4,7 +4,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -12,7 +12,7 @@ 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_INSTALL_DOCS_ALL := AUTHORS NEWS -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kradio/debian/rules b/ubuntu/maverick/applications/kradio/debian/rules index a55c7fd87..4ec00e4dc 100755 --- a/ubuntu/maverick/applications/kradio/debian/rules +++ b/ubuntu/maverick/applications/kradio/debian/rules @@ -9,7 +9,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/krename/debian/rules b/ubuntu/maverick/applications/krename/debian/rules index ece39aee4..86f185efb 100755 --- a/ubuntu/maverick/applications/krename/debian/rules +++ b/ubuntu/maverick/applications/krename/debian/rules @@ -6,14 +6,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde 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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde ### Libtool and Automake updates post-patches:: debian/stamp-autothings-update diff --git a/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk b/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/krusader/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/krusader/debian/rules b/ubuntu/maverick/applications/krusader/debian/rules index 9ff5fba71..139132dbb 100755 --- a/ubuntu/maverick/applications/krusader/debian/rules +++ b/ubuntu/maverick/applications/krusader/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -16,7 +16,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DESTDIR = $(CURDIR)/debian/krusader-trinity/ -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/debiandirs b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/debiandirs index 304c32ae4..58237d430 100644 --- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/debiandirs +++ b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/opt/trinity export sysconfdir=/etc -export kde_includedir=/opt/trinity/include/kde +export kde_includedir=/opt/trinity/include/tde export infodir=/opt/trinity/share/info export mandir=/opt/trinity/share/man export qtdir=/opt/trinity/share/qt3 diff --git a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules index 2b5a4f326..047b8ca76 100755 --- a/ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules +++ b/ubuntu/maverick/applications/ksplash-engine-moodin/debian/rules @@ -4,7 +4,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -49,7 +49,7 @@ patch: patch-stamp config.status: configure patch dh_testdir - CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde build: build-stamp diff --git a/ubuntu/maverick/applications/ksquirrel/debian/rules b/ubuntu/maverick/applications/ksquirrel/debian/rules index aeeceb417..8f8161523 100755 --- a/ubuntu/maverick/applications/ksquirrel/debian/rules +++ b/ubuntu/maverick/applications/ksquirrel/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/kstreamripper/debian/rules b/ubuntu/maverick/applications/kstreamripper/debian/rules index 319fe9f4a..27cc7e874 100755 --- a/ubuntu/maverick/applications/kstreamripper/debian/rules +++ b/ubuntu/maverick/applications/kstreamripper/debian/rules @@ -3,10 +3,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk DEB_INSTALL_MANPAGES_kstreamripper:=debian/kstreamripper.1 build/kstreamripper:: - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE) + env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde DESTDIR=$(DEB_DESTDIR)/opt/trinity $(MAKE) install/kstreamripper:: - env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install + env PATH=/opt/trinity/bin:$(PATH) QTDIR=/usr/share/qt3 CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install mkdir -p $(DEB_DESTDIR)/opt/trinity/share/pixmaps/ mkdir -p $(DEB_DESTDIR)/opt/trinity/share/doc/HTML/ install -m 644 ./src/hi32-app-kstreamripper.png \ diff --git a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk b/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/ksystemlog/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/ksystemlog/debian/rules b/ubuntu/maverick/applications/ksystemlog/debian/rules index 115c9a97e..6571b56cb 100755 --- a/ubuntu/maverick/applications/ksystemlog/debian/rules +++ b/ubuntu/maverick/applications/ksystemlog/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_ksystemlog-trinity := ksystemlog.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/ktechlab/debian/debiandirs b/ubuntu/maverick/applications/ktechlab/debian/debiandirs index d35ab77aa..dfe8aa8ab 100644 --- a/ubuntu/maverick/applications/ktechlab/debian/debiandirs +++ b/ubuntu/maverick/applications/ktechlab/debian/debiandirs @@ -1,7 +1,7 @@ export kde_confdir=/etc/trinity export kde_prefix=/opt/trinity export kde_bindir=/opt/trinity/bin -export kde_includedir=/opt/trinity/include/kde +export kde_includedir=/opt/trinity/include/tde export kde_libdir=/opt/trinity/lib export kde_cgidir=/opt/trinity/lib/cgi-bin export kde_moduledir=/opt/trinity/lib/trinity diff --git a/ubuntu/maverick/applications/ktechlab/debian/rules b/ubuntu/maverick/applications/ktechlab/debian/rules index cadc4e546..1e1e53c9c 100755 --- a/ubuntu/maverick/applications/ktechlab/debian/rules +++ b/ubuntu/maverick/applications/ktechlab/debian/rules @@ -5,7 +5,7 @@ -include debian/debiandirs -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -45,7 +45,7 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity + PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) --prefix=/opt/trinity build: build-stamp debian/ktechlab.xpm @@ -55,7 +55,7 @@ build-stamp: config.status make -f admin/Makefile.common cvs touch debian/stamp-bootstrap - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) touch build-stamp clean: @@ -85,8 +85,8 @@ install: build dh_testroot dh_clean -k dh_installdirs - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-trinity - env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-trinity + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/ktechlab-trinity + env PATH=/opt/trinity/bin:$(PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) -C po install DESTDIR=$(CURDIR)/debian/ktechlab-trinity install -D -m 644 debian/ktechlab.xpm debian/ktechlab-trinity/opt/trinity/share/pixmaps/ktechlab.xpm chrpath -d $(CURDIR)/debian/ktechlab-trinity/opt/trinity/bin/ktechlab chrpath -d $(CURDIR)/debian/ktechlab-trinity/opt/trinity/bin/microbe diff --git a/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk b/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/ktorrent/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/ktorrent/debian/rules b/ubuntu/maverick/applications/ktorrent/debian/rules index 46a8b920a..5590816c2 100755 --- a/ubuntu/maverick/applications/ktorrent/debian/rules +++ b/ubuntu/maverick/applications/ktorrent/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/debian-qt-kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_INSTALL_MANPAGES_ktorrent = ktorrent.1 -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde build/ktorrent-trinity:: docbook2x-man debian/ktorrent.1.docbook diff --git a/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kuickshow/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kuickshow/debian/rules b/ubuntu/maverick/applications/kuickshow/debian/rules index 6b1798055..191172fdc 100755 --- a/ubuntu/maverick/applications/kuickshow/debian/rules +++ b/ubuntu/maverick/applications/kuickshow/debian/rules @@ -5,14 +5,14 @@ include debian/cdbs/debian-qt-kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde 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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/kvirc/debian/rules b/ubuntu/maverick/applications/kvirc/debian/rules index a0130f2ac..bd103aecd 100755 --- a/ubuntu/maverick/applications/kvirc/debian/rules +++ b/ubuntu/maverick/applications/kvirc/debian/rules @@ -17,7 +17,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/kvkbd/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/kvkbd/debian/rules b/ubuntu/maverick/applications/kvkbd/debian/rules index 2aabc75db..305c1e4df 100755 --- a/ubuntu/maverick/applications/kvkbd/debian/rules +++ b/ubuntu/maverick/applications/kvkbd/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde 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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde makebuilddir/kvkbd-trinity:: make -f Makefile.cvs diff --git a/ubuntu/maverick/applications/kvpnc/debian/rules b/ubuntu/maverick/applications/kvpnc/debian/rules index 8e7f6fc6f..00d853fcc 100755 --- a/ubuntu/maverick/applications/kvpnc/debian/rules +++ b/ubuntu/maverick/applications/kvpnc/debian/rules @@ -8,14 +8,14 @@ include /usr/share/cdbs/1/rules/utils.mk DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" DEB_INSTALL_MANPAGES_kvpnc-trinity := debian/kvpnc-trinity.1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde 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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde makebuilddir/kvpnc-trinity:: cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in diff --git a/ubuntu/maverick/applications/piklab/debian/rules b/ubuntu/maverick/applications/piklab/debian/rules index ba5677a64..e0a25dd7f 100755 --- a/ubuntu/maverick/applications/piklab/debian/rules +++ b/ubuntu/maverick/applications/piklab/debian/rules @@ -3,7 +3,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -48,7 +48,7 @@ endif ./configure CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed" \ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib \ - --with-extra-includes=/opt/trinity/include/kde \ + --with-extra-includes=/opt/trinity/include/tde \ --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --enable-rpath touch $@ diff --git a/ubuntu/maverick/applications/potracegui/debian/rules b/ubuntu/maverick/applications/potracegui/debian/rules index 4eeace3c8..6be58cd48 100755 --- a/ubuntu/maverick/applications/potracegui/debian/rules +++ b/ubuntu/maverick/applications/potracegui/debian/rules @@ -11,7 +11,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk b/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/smb4k/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/smb4k/debian/rules b/ubuntu/maverick/applications/smb4k/debian/rules index a7f5808ef..db6aa90dd 100755 --- a/ubuntu/maverick/applications/smb4k/debian/rules +++ b/ubuntu/maverick/applications/smb4k/debian/rules @@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk b/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/soundkonverter/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/soundkonverter/debian/rules b/ubuntu/maverick/applications/soundkonverter/debian/rules index 16846b152..831240224 100755 --- a/ubuntu/maverick/applications/soundkonverter/debian/rules +++ b/ubuntu/maverick/applications/soundkonverter/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/tde-guidance/debian/rules b/ubuntu/maverick/applications/tde-guidance/debian/rules index f3f46453f..e21db2b6b 100755 --- a/ubuntu/maverick/applications/tde-guidance/debian/rules +++ b/ubuntu/maverick/applications/tde-guidance/debian/rules @@ -12,7 +12,7 @@ DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp DEB_UPDATE_RCD_PARAMS := multiuser DEB_INSTALL_MANPAGES_tde-guidance-trinity := debian/displayconfig-trinity.1 debian/mountconfig-trinity.1 debian/serviceconfig-trinity.1 debian/userconfig-trinity.1 PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde LDFLAGS_APPEND := -L/opt/trinity/lib install/tde-guidance-trinity:: diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/rules b/ubuntu/maverick/applications/tde-style-lipstik/debian/rules index c25c8d5bd..b20ff9228 100755 --- a/ubuntu/maverick/applications/tde-style-lipstik/debian/rules +++ b/ubuntu/maverick/applications/tde-style-lipstik/debian/rules @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -37,7 +37,7 @@ config.status: patch configure CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/opt/trinity --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ --disable-debug --enable-final \ - --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde # --with-qt-includes=/usr/include/qt3 --with-qt-libraries=/usr/lib/qt3/ build: build-stamp diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/tde-systemsettings/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/tde-systemsettings/debian/rules b/ubuntu/maverick/applications/tde-systemsettings/debian/rules index 82d5c2429..588264407 100755 --- a/ubuntu/maverick/applications/tde-systemsettings/debian/rules +++ b/ubuntu/maverick/applications/tde-systemsettings/debian/rules @@ -6,7 +6,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/tdesudo/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/tdesudo/debian/rules b/ubuntu/maverick/applications/tdesudo/debian/rules index f3b2afb13..5a63a69a9 100755 --- a/ubuntu/maverick/applications/tdesudo/debian/rules +++ b/ubuntu/maverick/applications/tdesudo/debian/rules @@ -4,14 +4,14 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde 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_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde DEB_INSTALL_MANPAGES_tdesudo-trinity = tdesudo-trinity.1 diff --git a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/tdmtheme/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/tdmtheme/debian/rules b/ubuntu/maverick/applications/tdmtheme/debian/rules index 0eb4fad95..8e74fc2cb 100755 --- a/ubuntu/maverick/applications/tdmtheme/debian/rules +++ b/ubuntu/maverick/applications/tdmtheme/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info @@ -13,7 +13,7 @@ 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_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde post-patches:: debian/stamp-bootstrap diff --git a/ubuntu/maverick/applications/tellico/debian/rules b/ubuntu/maverick/applications/tellico/debian/rules index e22c0c6f2..b21fb6bd9 100755 --- a/ubuntu/maverick/applications/tellico/debian/rules +++ b/ubuntu/maverick/applications/tellico/debian/rules @@ -5,7 +5,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk b/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/twin-style-crystal/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/twin-style-crystal/debian/rules b/ubuntu/maverick/applications/twin-style-crystal/debian/rules index 5e522ca06..8cda3384a 100755 --- a/ubuntu/maverick/applications/twin-style-crystal/debian/rules +++ b/ubuntu/maverick/applications/twin-style-crystal/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info diff --git a/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk b/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk +++ b/ubuntu/maverick/applications/yakuake/debian/cdbs/kde.mk @@ -59,7 +59,7 @@ endif cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug) DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin -DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/kde" +DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde" DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%: diff --git a/ubuntu/maverick/applications/yakuake/debian/rules b/ubuntu/maverick/applications/yakuake/debian/rules index 176f45bc3..f5bd922f5 100755 --- a/ubuntu/maverick/applications/yakuake/debian/rules +++ b/ubuntu/maverick/applications/yakuake/debian/rules @@ -3,7 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info -- cgit v1.2.1 From db492eb63c802187323c1febcec142daf2f4d74c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 7 Feb 2012 13:58:40 -0600 Subject: Undo prior accidental rename of translation files on Debian and Ubuntu --- ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ubuntu/maverick/applications') diff --git a/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff index 782118729..de663438c 100644 --- a/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -16,5 +16,5 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot if ! test -f $kdepotpath; then - kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot + kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot fi -- cgit v1.2.1 From d3bbe1a1e2187f463c106ad1baf82b68b3c87852 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 9 Feb 2012 09:30:10 -0600 Subject: Fix tdelibs FTBFS on Debian and Ubuntu --- ubuntu/maverick/applications/k3b/debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ubuntu/maverick/applications') diff --git a/ubuntu/maverick/applications/k3b/debian/rules b/ubuntu/maverick/applications/k3b/debian/rules index 664df39cf..3a19a0ec8 100755 --- a/ubuntu/maverick/applications/k3b/debian/rules +++ b/ubuntu/maverick/applications/k3b/debian/rules @@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include debian/cdbs/kde.mk -DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde5 +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde5 DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info -- cgit v1.2.1