diff options
Diffstat (limited to 'ubuntu/maverick')
236 files changed, 955 insertions, 955 deletions
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 diff --git a/ubuntu/maverick/dependencies/arts/debian/rules b/ubuntu/maverick/dependencies/arts/debian/rules index c6720ab40..95cd29258 100755 --- a/ubuntu/maverick/dependencies/arts/debian/rules +++ b/ubuntu/maverick/dependencies/arts/debian/rules @@ -14,7 +14,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_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -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" -DWITH_GCC_VISIBILITY="ON" +DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -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" -DWITH_GCC_VISIBILITY="ON" # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to # never build in parallel, regardless of DEB_BUILD_OPTIONS. diff --git a/ubuntu/maverick/kdegraphics.automake/debian/cdbs/kde.mk b/ubuntu/maverick/kdegraphics.automake/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/kdegraphics.automake/debian/cdbs/kde.mk +++ b/ubuntu/maverick/kdegraphics.automake/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/kdegraphics.automake/debian/kdegraphics-dev-trinity.install b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install index 608149acc..4d50b4fc5 100644 --- a/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install +++ b/ubuntu/maverick/kdegraphics.automake/debian/kdegraphics-dev-trinity.install @@ -1,184 +1,184 @@ -debian/tmp/opt/trinity/include/kde/dom/SVGAElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAltGlyphDefElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAltGlyphElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAngle.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateColorElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateMotionElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateTransformElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedAngle.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedBoolean.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedEnumeration.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedInteger.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedLength.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedLengthList.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedNumber.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedNumberList.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPathData.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPoints.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPreserveAspectRatio.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedRect.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedString.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedTransformList.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimationElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGCSSRule.h -debian/tmp/opt/trinity/include/kde/dom/SVGCircleElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGClipPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGColor.h -debian/tmp/opt/trinity/include/kde/dom/SVGColorProfileElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGColorProfileRule.h -debian/tmp/opt/trinity/include/kde/dom/SVGComponentTransferFunctionElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGCursorElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDefinitionSrcElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDefsElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDescElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDocument.h -debian/tmp/opt/trinity/include/kde/dom/SVGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGElementInstance.h -debian/tmp/opt/trinity/include/kde/dom/SVGElementInstanceList.h -debian/tmp/opt/trinity/include/kde/dom/SVGEllipseElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGEvent.h -debian/tmp/opt/trinity/include/kde/dom/SVGException.h -debian/tmp/opt/trinity/include/kde/dom/SVGExternalResourcesRequired.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEBlendElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEColorMatrixElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEComponentTransferElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFECompositeElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEConvolveMatrixElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEDiffuseLightingElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEDisplacementMapElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEDistantLightElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFloodElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncAElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncBElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncRElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEGaussianBlurElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEImageElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEMergeElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEMergeNodeElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEMorphologyElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEOffsetElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEPointLightElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFESpecularLightingElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFESpotLightElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFETileElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFETurbulenceElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFilterElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFilterPrimitiveStandardAttributes.h -debian/tmp/opt/trinity/include/kde/dom/SVGFitToViewBox.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceFormatElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceNameElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceSrcElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceUriElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGForeignObjectElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGlyphElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGlyphRefElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGradientElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGHKernElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGICCColor.h -debian/tmp/opt/trinity/include/kde/dom/SVGImageElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGLangSpace.h -debian/tmp/opt/trinity/include/kde/dom/SVGLength.h -debian/tmp/opt/trinity/include/kde/dom/SVGLengthList.h -debian/tmp/opt/trinity/include/kde/dom/SVGLineElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGLinearGradientElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGLocatable.h -debian/tmp/opt/trinity/include/kde/dom/SVGMPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMarkerElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMaskElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMatrix.h -debian/tmp/opt/trinity/include/kde/dom/SVGMetadataElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMissingGlyphElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGNumber.h -debian/tmp/opt/trinity/include/kde/dom/SVGNumberList.h -debian/tmp/opt/trinity/include/kde/dom/SVGPaint.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSeg.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegArc.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegClosePath.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoCubic.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoCubicSmooth.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoQuadratic.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoQuadraticSmooth.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLineto.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLinetoHorizontal.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLinetoVertical.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegList.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegMoveto.h -debian/tmp/opt/trinity/include/kde/dom/SVGPatternElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPoint.h -debian/tmp/opt/trinity/include/kde/dom/SVGPointList.h -debian/tmp/opt/trinity/include/kde/dom/SVGPolygonElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPolylineElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPreserveAspectRatio.h -debian/tmp/opt/trinity/include/kde/dom/SVGRadialGradientElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGRect.h -debian/tmp/opt/trinity/include/kde/dom/SVGRectElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGRenderingIntent.h -debian/tmp/opt/trinity/include/kde/dom/SVGSVGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGScriptElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGSetElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGStopElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGStringList.h -debian/tmp/opt/trinity/include/kde/dom/SVGStylable.h -debian/tmp/opt/trinity/include/kde/dom/SVGStyleElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGSwitchElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGSymbolElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTRefElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTSpanElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTests.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextContentElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextPositioningElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTitleElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTransform.h -debian/tmp/opt/trinity/include/kde/dom/SVGTransformList.h -debian/tmp/opt/trinity/include/kde/dom/SVGTransformable.h -debian/tmp/opt/trinity/include/kde/dom/SVGURIReference.h -debian/tmp/opt/trinity/include/kde/dom/SVGUnitTypes.h -debian/tmp/opt/trinity/include/kde/dom/SVGUseElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGVKernElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGViewElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGViewSpec.h -debian/tmp/opt/trinity/include/kde/dom/SVGWindow.h -debian/tmp/opt/trinity/include/kde/dom/SVGZoomAndPan.h -debian/tmp/opt/trinity/include/kde/dom/SVGZoomEvent.h -debian/tmp/opt/trinity/include/kde/kfaximage.h -debian/tmp/opt/trinity/include/kde/kmultipageInterface.h -debian/tmp/opt/trinity/include/kde/ksvg/CanvasFactory.h -debian/tmp/opt/trinity/include/kde/ksvg/CanvasItem.h -debian/tmp/opt/trinity/include/kde/ksvg/CanvasItems.h -debian/tmp/opt/trinity/include/kde/ksvg/DocumentFactory.h -debian/tmp/opt/trinity/include/kde/ksvg/KSVGCanvas.h -debian/tmp/opt/trinity/include/kde/ksvg/ksvg_plugin.h -debian/tmp/opt/trinity/include/kde/kviewshell/anchor.h -debian/tmp/opt/trinity/include/kde/kviewshell/bookmark.h -debian/tmp/opt/trinity/include/kde/kviewshell/pageView.h -debian/tmp/opt/trinity/include/kde/kviewshell/documentPageCache.h -debian/tmp/opt/trinity/include/kde/kviewshell/documentRenderer.h -debian/tmp/opt/trinity/include/kde/kviewshell/documentWidget.h -debian/tmp/opt/trinity/include/kde/kviewshell/history.h -debian/tmp/opt/trinity/include/kde/kviewshell/hyperlink.h -debian/tmp/opt/trinity/include/kde/kviewshell/kmultipage.h -debian/tmp/opt/trinity/include/kde/kviewshell/length.h -debian/tmp/opt/trinity/include/kde/kviewshell/pageNumber.h -debian/tmp/opt/trinity/include/kde/kviewshell/pageSize.h -debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPage.h -debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPagePixmap.h -debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPagePrinter.h -debian/tmp/opt/trinity/include/kde/kviewshell/selection.h -debian/tmp/opt/trinity/include/kde/kviewshell/simplePageSize.h -debian/tmp/opt/trinity/include/kde/kviewshell/textBox.h -debian/tmp/opt/trinity/include/kde/kviewshell/zoom.h -debian/tmp/opt/trinity/include/kde/kviewshell/zoomlimits.h -debian/tmp/opt/trinity/include/kde/libtext2path-0.1/BezierPath.h -debian/tmp/opt/trinity/include/kde/libtext2path-0.1/Glyph.h -debian/tmp/opt/trinity/include/kde/libtext2path-0.1/GlyphTracer.h +debian/tmp/opt/trinity/include/tde/dom/SVGAElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAltGlyphDefElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAltGlyphElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAngle.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateColorElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateMotionElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateTransformElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedAngle.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedBoolean.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedEnumeration.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedInteger.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedLength.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedLengthList.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedNumber.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedNumberList.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPathData.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPoints.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPreserveAspectRatio.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedRect.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedString.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedTransformList.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimationElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGCSSRule.h +debian/tmp/opt/trinity/include/tde/dom/SVGCircleElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGClipPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGColor.h +debian/tmp/opt/trinity/include/tde/dom/SVGColorProfileElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGColorProfileRule.h +debian/tmp/opt/trinity/include/tde/dom/SVGComponentTransferFunctionElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGCursorElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDefinitionSrcElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDefsElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDescElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDocument.h +debian/tmp/opt/trinity/include/tde/dom/SVGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGElementInstance.h +debian/tmp/opt/trinity/include/tde/dom/SVGElementInstanceList.h +debian/tmp/opt/trinity/include/tde/dom/SVGEllipseElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGEvent.h +debian/tmp/opt/trinity/include/tde/dom/SVGException.h +debian/tmp/opt/trinity/include/tde/dom/SVGExternalResourcesRequired.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEBlendElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEColorMatrixElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEComponentTransferElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFECompositeElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEConvolveMatrixElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEDiffuseLightingElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEDisplacementMapElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEDistantLightElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFloodElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncAElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncBElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncRElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEGaussianBlurElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEImageElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEMergeElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEMergeNodeElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEMorphologyElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEOffsetElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEPointLightElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFESpecularLightingElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFESpotLightElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFETileElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFETurbulenceElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFilterElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFilterPrimitiveStandardAttributes.h +debian/tmp/opt/trinity/include/tde/dom/SVGFitToViewBox.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceFormatElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceNameElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceSrcElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceUriElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGForeignObjectElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGlyphElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGlyphRefElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGradientElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGHKernElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGICCColor.h +debian/tmp/opt/trinity/include/tde/dom/SVGImageElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGLangSpace.h +debian/tmp/opt/trinity/include/tde/dom/SVGLength.h +debian/tmp/opt/trinity/include/tde/dom/SVGLengthList.h +debian/tmp/opt/trinity/include/tde/dom/SVGLineElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGLinearGradientElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGLocatable.h +debian/tmp/opt/trinity/include/tde/dom/SVGMPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMarkerElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMaskElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMatrix.h +debian/tmp/opt/trinity/include/tde/dom/SVGMetadataElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMissingGlyphElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGNumber.h +debian/tmp/opt/trinity/include/tde/dom/SVGNumberList.h +debian/tmp/opt/trinity/include/tde/dom/SVGPaint.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSeg.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegArc.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegClosePath.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoCubic.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoCubicSmooth.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoQuadratic.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoQuadraticSmooth.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLineto.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLinetoHorizontal.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLinetoVertical.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegList.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegMoveto.h +debian/tmp/opt/trinity/include/tde/dom/SVGPatternElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPoint.h +debian/tmp/opt/trinity/include/tde/dom/SVGPointList.h +debian/tmp/opt/trinity/include/tde/dom/SVGPolygonElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPolylineElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPreserveAspectRatio.h +debian/tmp/opt/trinity/include/tde/dom/SVGRadialGradientElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGRect.h +debian/tmp/opt/trinity/include/tde/dom/SVGRectElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGRenderingIntent.h +debian/tmp/opt/trinity/include/tde/dom/SVGSVGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGScriptElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGSetElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGStopElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGStringList.h +debian/tmp/opt/trinity/include/tde/dom/SVGStylable.h +debian/tmp/opt/trinity/include/tde/dom/SVGStyleElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGSwitchElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGSymbolElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTRefElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTSpanElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTests.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextContentElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextPositioningElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTitleElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTransform.h +debian/tmp/opt/trinity/include/tde/dom/SVGTransformList.h +debian/tmp/opt/trinity/include/tde/dom/SVGTransformable.h +debian/tmp/opt/trinity/include/tde/dom/SVGURIReference.h +debian/tmp/opt/trinity/include/tde/dom/SVGUnitTypes.h +debian/tmp/opt/trinity/include/tde/dom/SVGUseElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGVKernElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGViewElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGViewSpec.h +debian/tmp/opt/trinity/include/tde/dom/SVGWindow.h +debian/tmp/opt/trinity/include/tde/dom/SVGZoomAndPan.h +debian/tmp/opt/trinity/include/tde/dom/SVGZoomEvent.h +debian/tmp/opt/trinity/include/tde/kfaximage.h +debian/tmp/opt/trinity/include/tde/kmultipageInterface.h +debian/tmp/opt/trinity/include/tde/ksvg/CanvasFactory.h +debian/tmp/opt/trinity/include/tde/ksvg/CanvasItem.h +debian/tmp/opt/trinity/include/tde/ksvg/CanvasItems.h +debian/tmp/opt/trinity/include/tde/ksvg/DocumentFactory.h +debian/tmp/opt/trinity/include/tde/ksvg/KSVGCanvas.h +debian/tmp/opt/trinity/include/tde/ksvg/ksvg_plugin.h +debian/tmp/opt/trinity/include/tde/kviewshell/anchor.h +debian/tmp/opt/trinity/include/tde/kviewshell/bookmark.h +debian/tmp/opt/trinity/include/tde/kviewshell/pageView.h +debian/tmp/opt/trinity/include/tde/kviewshell/documentPageCache.h +debian/tmp/opt/trinity/include/tde/kviewshell/documentRenderer.h +debian/tmp/opt/trinity/include/tde/kviewshell/documentWidget.h +debian/tmp/opt/trinity/include/tde/kviewshell/history.h +debian/tmp/opt/trinity/include/tde/kviewshell/hyperlink.h +debian/tmp/opt/trinity/include/tde/kviewshell/kmultipage.h +debian/tmp/opt/trinity/include/tde/kviewshell/length.h +debian/tmp/opt/trinity/include/tde/kviewshell/pageNumber.h +debian/tmp/opt/trinity/include/tde/kviewshell/pageSize.h +debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPage.h +debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPagePixmap.h +debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPagePrinter.h +debian/tmp/opt/trinity/include/tde/kviewshell/selection.h +debian/tmp/opt/trinity/include/tde/kviewshell/simplePageSize.h +debian/tmp/opt/trinity/include/tde/kviewshell/textBox.h +debian/tmp/opt/trinity/include/tde/kviewshell/zoom.h +debian/tmp/opt/trinity/include/tde/kviewshell/zoomlimits.h +debian/tmp/opt/trinity/include/tde/libtext2path-0.1/BezierPath.h +debian/tmp/opt/trinity/include/tde/libtext2path-0.1/Glyph.h +debian/tmp/opt/trinity/include/tde/libtext2path-0.1/GlyphTracer.h debian/tmp/opt/trinity/lib/libtdeinit_kview.la debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.la debian/tmp/opt/trinity/lib/libkghostviewlib.la diff --git a/ubuntu/maverick/kdegraphics.automake/debian/libpoppler-tqt-dev.install b/ubuntu/maverick/kdegraphics.automake/debian/libpoppler-tqt-dev.install index 57d9ec1d0..7e7ce35c8 100644 --- a/ubuntu/maverick/kdegraphics.automake/debian/libpoppler-tqt-dev.install +++ b/ubuntu/maverick/kdegraphics.automake/debian/libpoppler-tqt-dev.install @@ -1,3 +1,3 @@ -debian/tmp/opt/trinity/include/kde/poppler-link-qt3.h -debian/tmp/opt/trinity/include/kde/poppler-page-transition.h -debian/tmp/opt/trinity/include/kde/poppler-qt.h +debian/tmp/opt/trinity/include/tde/poppler-link-qt3.h +debian/tmp/opt/trinity/include/tde/poppler-page-transition.h +debian/tmp/opt/trinity/include/tde/poppler-qt.h diff --git a/ubuntu/maverick/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - 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 +# 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 $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/kdegraphics.automake/debian/rules b/ubuntu/maverick/kdegraphics.automake/debian/rules index 75fb0ff6e..7a23d61e5 100755 --- a/ubuntu/maverick/kdegraphics.automake/debian/rules +++ b/ubuntu/maverick/kdegraphics.automake/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 --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" --with-extra-libs="/usr/lib/mesa" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" --with-extra-libs="/usr/lib/mesa" DEB_DH_STRIP_ARGS := --dbg-package=kdegraphics-trinity-dbg diff --git a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/kde.mk b/ubuntu/maverick/kdevelop.cmake/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/kdevelop.cmake/debian/cdbs/kde.mk +++ b/ubuntu/maverick/kdevelop.cmake/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/kdevelop.cmake/debian/kdevelop-trinity-dev.install b/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity-dev.install index 5c24ba5bb..f9f8c82ab 100644 --- a/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity-dev.install +++ b/ubuntu/maverick/kdevelop.cmake/debian/kdevelop-trinity-dev.install @@ -1,3 +1,3 @@ -debian/tmp/opt/trinity/include/kde +debian/tmp/opt/trinity/include/tde debian/tmp/opt/trinity/lib/lib*.so debian/tmp/opt/trinity/lib/lib*.la diff --git a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk b/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/libraries/kipi-plugins/debian/cdbs/kde.mk +++ b/ubuntu/maverick/libraries/kipi-plugins/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/libraries/kipi-plugins/debian/rules b/ubuntu/maverick/libraries/kipi-plugins/debian/rules index ec3d9a4a3..e277fb614 100755 --- a/ubuntu/maverick/libraries/kipi-plugins/debian/rules +++ b/ubuntu/maverick/libraries/kipi-plugins/debian/rules @@ -9,7 +9,7 @@ include debian/cdbs/debian-qt-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 @@ -18,7 +18,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine 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 clean :: rm -f po/*/*.gmo diff --git a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk b/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/libraries/libkdcraw/debian/cdbs/kde.mk +++ b/ubuntu/maverick/libraries/libkdcraw/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/libraries/libkdcraw/debian/rules b/ubuntu/maverick/libraries/libkdcraw/debian/rules index 0606b98a9..7785e4bcc 100755 --- a/ubuntu/maverick/libraries/libkdcraw/debian/rules +++ b/ubuntu/maverick/libraries/libkdcraw/debian/rules @@ -5,7 +5,7 @@ include debian/cdbs/debian-qt-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/libraries/libkexiv2/debian/cdbs/kde.mk b/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/libraries/libkexiv2/debian/cdbs/kde.mk +++ b/ubuntu/maverick/libraries/libkexiv2/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/libraries/libkexiv2/debian/rules b/ubuntu/maverick/libraries/libkexiv2/debian/rules index dc80327f0..28a1c06e8 100755 --- a/ubuntu/maverick/libraries/libkexiv2/debian/rules +++ b/ubuntu/maverick/libraries/libkexiv2/debian/rules @@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include debian/cdbs/debian-qt-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 diff --git a/ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk b/ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/libraries/libkipi/debian/cdbs/kde.mk +++ b/ubuntu/maverick/libraries/libkipi/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/libraries/libkipi/debian/rules b/ubuntu/maverick/libraries/libkipi/debian/rules index 903f7c7b1..94eb41df3 100755 --- a/ubuntu/maverick/libraries/libkipi/debian/rules +++ b/ubuntu/maverick/libraries/libkipi/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/libraries/libksquirrel/debian/rules b/ubuntu/maverick/libraries/libksquirrel/debian/rules index fa3c9c335..fa07f7f8c 100755 --- a/ubuntu/maverick/libraries/libksquirrel/debian/rules +++ b/ubuntu/maverick/libraries/libksquirrel/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/libraries/mlt++/debian/rules b/ubuntu/maverick/libraries/mlt++/debian/rules index cf8cb1984..0232c83be 100755 --- a/ubuntu/maverick/libraries/mlt++/debian/rules +++ b/ubuntu/maverick/libraries/mlt++/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 diff --git a/ubuntu/maverick/libraries/mlt/debian/rules b/ubuntu/maverick/libraries/mlt/debian/rules index 771793fff..3889b6a3a 100755 --- a/ubuntu/maverick/libraries/mlt/debian/rules +++ b/ubuntu/maverick/libraries/mlt/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 @@ -47,10 +47,10 @@ configure-stamp: QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 - CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde ./configure --enable-gpl \ + CFLAGS="$(CFLAGS)" PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde ./configure --enable-gpl \ --luma-compress --disable-mmx $(CONFIGURE_OPTS) \ --avformat-shared=/usr --avformat-swscale \ - --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde touch configure-stamp @@ -58,7 +58,7 @@ build: configure-stamp build-stamp build-stamp: dh_testdir - env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) -j $(NCPUS) + env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) -j $(NCPUS) touch build-stamp @@ -81,7 +81,7 @@ install: build dh_clean -k dh_installdirs opt/trinity/lib/mlt0.2.5/modules opt/trinity/share/mlt0.2.5 - env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + env PATH=/opt/trinity/bin:$(PATH) LD_LIBRARY_PATH=/opt/trinity/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/trinity/lib CMAKE_INCLUDE_PATH=/opt/trinity/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp # mkdir debian/tmp/opt/trinity # mv debian/tmp/opt/trinity/lib debian/tmp/opt/trinity/ diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install b/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install index f50fc4e15..d7e5bd651 100644 --- a/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/libpythonize0-trinity-dev.install @@ -1,4 +1,4 @@ -opt/trinity/include/kde/pythonize.h +opt/trinity/include/tde/pythonize.h opt/trinity/lib/libpythonize.a opt/trinity/lib/libpythonize.la opt/trinity/lib/libpythonize.so diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/rules b/ubuntu/maverick/libraries/pytdeextensions/debian/rules index 1acb32f7d..4dcfaaae8 100755 --- a/ubuntu/maverick/libraries/pytdeextensions/debian/rules +++ b/ubuntu/maverick/libraries/pytdeextensions/debian/rules @@ -8,7 +8,7 @@ include debian/python-distutils-jaunty.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 @@ -16,7 +16,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_DH_INSTALL_ARGS = --sourcedir=debian/tmp -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 install/pytdeextensions-trinity:: # We have no idea if the built product is site-packages or dist-packages @@ -45,8 +45,8 @@ install/libpythonize0-trinity:: # fix binary-or-shlib-defines-rpath chrpath -d debian/tmp/opt/trinity/lib/libpythonize.so.* # fix include directory location - mkdir -p debian/tmp/opt/trinity/include/kde - mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/kde + mkdir -p debian/tmp/opt/trinity/include/tde + mv debian/tmp/opt/trinity/include/*.h debian/tmp/opt/trinity/include/tde clean:: rm -rf build diff --git a/ubuntu/maverick/tde-i18n/debian/debiandirs b/ubuntu/maverick/tde-i18n/debian/debiandirs index ba667b86e..2d0da0c80 100644 --- a/ubuntu/maverick/tde-i18n/debian/debiandirs +++ b/ubuntu/maverick/tde-i18n/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/tde-i18n/debian/rules b/ubuntu/maverick/tde-i18n/debian/rules index f49804687..e275e35df 100755 --- a/ubuntu/maverick/tde-i18n/debian/rules +++ b/ubuntu/maverick/tde-i18n/debian/rules @@ -24,7 +24,7 @@ I18N_INSTALL := $(patsubst $(I18N_DIR_PAT),install__%,$(I18N_DIRS)) -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 diff --git a/ubuntu/maverick/tdeaccessibility/debian/cdbs/kde.mk b/ubuntu/maverick/tdeaccessibility/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdeaccessibility/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdeaccessibility/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/tdeaccessibility/debian/ksayit-trinity.install b/ubuntu/maverick/tdeaccessibility/debian/ksayit-trinity.install index 2f5be2460..f4a7297c0 100644 --- a/ubuntu/maverick/tdeaccessibility/debian/ksayit-trinity.install +++ b/ubuntu/maverick/tdeaccessibility/debian/ksayit-trinity.install @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/bin/ksayit -debian/tmp/opt/trinity/include/kde/ksayit_fxplugin.h +debian/tmp/opt/trinity/include/tde/ksayit_fxplugin.h debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.la debian/tmp/opt/trinity/lib/trinity/libFreeverb_plugin.so debian/tmp/opt/trinity/lib/libKTTSD_Lib.la diff --git a/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - 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 +# 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 $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeaccessibility/debian/rules b/ubuntu/maverick/tdeaccessibility/debian/rules index 0f40f42e0..ce879ebd4 100755 --- a/ubuntu/maverick/tdeaccessibility/debian/rules +++ b/ubuntu/maverick/tdeaccessibility/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/tdeaddons/debian/cdbs/kde.mk b/ubuntu/maverick/tdeaddons/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdeaddons/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdeaddons/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/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - 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 +# 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 $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeaddons/debian/rules b/ubuntu/maverick/tdeaddons/debian/rules index c872980f3..5d337bfab 100755 --- a/ubuntu/maverick/tdeaddons/debian/rules +++ b/ubuntu/maverick/tdeaddons/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/tdeadmin/debian/cdbs/kde.mk b/ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdeadmin/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/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - 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 +# 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 $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeadmin/debian/rules b/ubuntu/maverick/tdeadmin/debian/rules index 19e9ac01b..9c9ccadda 100755 --- a/ubuntu/maverick/tdeadmin/debian/rules +++ b/ubuntu/maverick/tdeadmin/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/tdeartwork/debian/cdbs/kde.mk b/ubuntu/maverick/tdeartwork/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdeartwork/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdeartwork/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/tdeartwork/debian/rules b/ubuntu/maverick/tdeartwork/debian/rules index 3e16d1ff2..82a71627a 100755 --- a/ubuntu/maverick/tdeartwork/debian/rules +++ b/ubuntu/maverick/tdeartwork/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/tdebindings/debian/cdbs/kde.mk b/ubuntu/maverick/tdebindings/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdebindings/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdebindings/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/tdebindings/debian/libkjsembed-trinity-dev.install b/ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.install index 62a36de6e..540ad0ca2 100644 --- a/ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.install +++ b/ubuntu/maverick/tdebindings/debian/libkjsembed-trinity-dev.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde/kjsembed/* +debian/tmp/opt/trinity/include/tde/kjsembed/* debian/tmp/opt/trinity/lib/libkjsembed.so debian/tmp/opt/trinity/lib/libkjsembed.la diff --git a/ubuntu/maverick/tdebindings/debian/libsmokeqt-trinity-dev.install b/ubuntu/maverick/tdebindings/debian/libsmokeqt-trinity-dev.install index 2904a6815..99a21c1de 100644 --- a/ubuntu/maverick/tdebindings/debian/libsmokeqt-trinity-dev.install +++ b/ubuntu/maverick/tdebindings/debian/libsmokeqt-trinity-dev.install @@ -1,3 +1,3 @@ -debian/tmp/opt/trinity/include/kde/smoke.h +debian/tmp/opt/trinity/include/tde/smoke.h debian/tmp/opt/trinity/lib/libsmokeqt.so debian/tmp/opt/trinity/lib/libsmokeqt.la diff --git a/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - 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 +# 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 $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdebindings/debian/rules b/ubuntu/maverick/tdebindings/debian/rules index 6c5a7ddad..6498e0a4d 100755 --- a/ubuntu/maverick/tdebindings/debian/rules +++ b/ubuntu/maverick/tdebindings/debian/rules @@ -11,7 +11,7 @@ DEB_BUILDDIR := $(DEB_SRCDIR) 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/tdeedu/debian/cdbs/kde.mk b/ubuntu/maverick/tdeedu/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdeedu/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdeedu/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/tdeedu/debian/kstars-trinity.install b/ubuntu/maverick/tdeedu/debian/kstars-trinity.install index 4db6bf7e7..61544b793 100644 --- a/ubuntu/maverick/tdeedu/debian/kstars-trinity.install +++ b/ubuntu/maverick/tdeedu/debian/kstars-trinity.install @@ -1,7 +1,7 @@ etc/trinity/kstarsrc opt/trinity/bin/kstars -/opt/trinity/include/kde/kstarsinterface.h -/opt/trinity/include/kde/simclockinterface.h +/opt/trinity/include/tde/kstarsinterface.h +/opt/trinity/include/tde/simclockinterface.h /opt/trinity/share/applications/kde/kstars.desktop /opt/trinity/share/config.kcfg/kstars.kcfg /opt/trinity/share/doc/kde/HTML/en/kstars/common diff --git a/ubuntu/maverick/tdeedu/debian/libkiten-dev-trinity.install b/ubuntu/maverick/tdeedu/debian/libkiten-dev-trinity.install index ca0848fd9..e64535480 100644 --- a/ubuntu/maverick/tdeedu/debian/libkiten-dev-trinity.install +++ b/ubuntu/maverick/tdeedu/debian/libkiten-dev-trinity.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/libkiten +/opt/trinity/include/tde/libkiten opt/trinity/lib/libkiten.la opt/trinity/lib/libkiten.so diff --git a/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.install b/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.install index be3af1e7b..1695e3cf1 100644 --- a/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.install +++ b/ubuntu/maverick/tdeedu/debian/libtdeedu-dev-trinity.install @@ -1,4 +1,4 @@ -/opt/trinity/include/kde/libtdeedu +/opt/trinity/include/tde/libtdeedu opt/trinity/lib/libextdate.la opt/trinity/lib/libextdate.so opt/trinity/lib/libtdeeducore.la diff --git a/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - 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 +# 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 $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeedu/debian/rules b/ubuntu/maverick/tdeedu/debian/rules index b19d3d32f..059005f50 100755 --- a/ubuntu/maverick/tdeedu/debian/rules +++ b/ubuntu/maverick/tdeedu/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 @@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" # Ensure that kig's python scripting built successfully. common-build-arch:: diff --git a/ubuntu/maverick/tdegames/debian/atlantik-trinity-dev.install b/ubuntu/maverick/tdegames/debian/atlantik-trinity-dev.install index b9052ce9a..b7dea632a 100644 --- a/ubuntu/maverick/tdegames/debian/atlantik-trinity-dev.install +++ b/ubuntu/maverick/tdegames/debian/atlantik-trinity-dev.install @@ -1,5 +1,5 @@ -/opt/trinity/include/kde/atlantik -/opt/trinity/include/kde/atlantic +/opt/trinity/include/tde/atlantik +/opt/trinity/include/tde/atlantic /opt/trinity/lib/libatlantic.so /opt/trinity/lib/libatlantikclient.so /opt/trinity/lib/libatlantikui.so diff --git a/ubuntu/maverick/tdegames/debian/cdbs/kde.mk b/ubuntu/maverick/tdegames/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdegames/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdegames/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/tdegames/debian/kolf-trinity-dev.install b/ubuntu/maverick/tdegames/debian/kolf-trinity-dev.install index 4da86d1b2..ff0a2b177 100644 --- a/ubuntu/maverick/tdegames/debian/kolf-trinity-dev.install +++ b/ubuntu/maverick/tdegames/debian/kolf-trinity-dev.install @@ -1,2 +1,2 @@ -/opt/trinity/include/kde/kolf +/opt/trinity/include/tde/kolf /opt/trinity/lib/libkolf.so diff --git a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-dev.install b/ubuntu/maverick/tdegames/debian/libtdegames-trinity-dev.install index 354fa3840..eca00d487 100644 --- a/ubuntu/maverick/tdegames/debian/libtdegames-trinity-dev.install +++ b/ubuntu/maverick/tdegames/debian/libtdegames-trinity-dev.install @@ -1,4 +1,4 @@ -/opt/trinity/include/kde/*.h -/opt/trinity/include/kde/kgame +/opt/trinity/include/tde/*.h +/opt/trinity/include/tde/kgame /opt/trinity/lib/libtdegames.so /opt/trinity/lib/libtdegames.la diff --git a/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - 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 +# 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 $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdegames/debian/rules b/ubuntu/maverick/tdegames/debian/rules index 0ba5f21cb..5a24cd5ae 100755 --- a/ubuntu/maverick/tdegames/debian/rules +++ b/ubuntu/maverick/tdegames/debian/rules @@ -7,7 +7,7 @@ include /usr/share/cdbs/1/rules/utils.mk export kde_bindir = /opt/trinity/games -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/tdegraphics/debian/cdbs/kde.mk b/ubuntu/maverick/tdegraphics/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdegraphics/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdegraphics/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/tdegraphics/debian/libpoppler-tqt-dev.install b/ubuntu/maverick/tdegraphics/debian/libpoppler-tqt-dev.install index 57d9ec1d0..7e7ce35c8 100644 --- a/ubuntu/maverick/tdegraphics/debian/libpoppler-tqt-dev.install +++ b/ubuntu/maverick/tdegraphics/debian/libpoppler-tqt-dev.install @@ -1,3 +1,3 @@ -debian/tmp/opt/trinity/include/kde/poppler-link-qt3.h -debian/tmp/opt/trinity/include/kde/poppler-page-transition.h -debian/tmp/opt/trinity/include/kde/poppler-qt.h +debian/tmp/opt/trinity/include/tde/poppler-link-qt3.h +debian/tmp/opt/trinity/include/tde/poppler-page-transition.h +debian/tmp/opt/trinity/include/tde/poppler-qt.h diff --git a/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - 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 +# 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 $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdegraphics/debian/tdegraphics-dev-trinity.install b/ubuntu/maverick/tdegraphics/debian/tdegraphics-dev-trinity.install index 608149acc..4d50b4fc5 100644 --- a/ubuntu/maverick/tdegraphics/debian/tdegraphics-dev-trinity.install +++ b/ubuntu/maverick/tdegraphics/debian/tdegraphics-dev-trinity.install @@ -1,184 +1,184 @@ -debian/tmp/opt/trinity/include/kde/dom/SVGAElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAltGlyphDefElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAltGlyphElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAngle.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateColorElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateMotionElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimateTransformElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedAngle.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedBoolean.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedEnumeration.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedInteger.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedLength.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedLengthList.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedNumber.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedNumberList.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPathData.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPoints.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedPreserveAspectRatio.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedRect.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedString.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimatedTransformList.h -debian/tmp/opt/trinity/include/kde/dom/SVGAnimationElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGCSSRule.h -debian/tmp/opt/trinity/include/kde/dom/SVGCircleElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGClipPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGColor.h -debian/tmp/opt/trinity/include/kde/dom/SVGColorProfileElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGColorProfileRule.h -debian/tmp/opt/trinity/include/kde/dom/SVGComponentTransferFunctionElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGCursorElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDefinitionSrcElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDefsElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDescElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGDocument.h -debian/tmp/opt/trinity/include/kde/dom/SVGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGElementInstance.h -debian/tmp/opt/trinity/include/kde/dom/SVGElementInstanceList.h -debian/tmp/opt/trinity/include/kde/dom/SVGEllipseElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGEvent.h -debian/tmp/opt/trinity/include/kde/dom/SVGException.h -debian/tmp/opt/trinity/include/kde/dom/SVGExternalResourcesRequired.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEBlendElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEColorMatrixElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEComponentTransferElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFECompositeElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEConvolveMatrixElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEDiffuseLightingElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEDisplacementMapElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEDistantLightElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFloodElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncAElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncBElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEFuncRElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEGaussianBlurElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEImageElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEMergeElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEMergeNodeElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEMorphologyElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEOffsetElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFEPointLightElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFESpecularLightingElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFESpotLightElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFETileElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFETurbulenceElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFilterElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFilterPrimitiveStandardAttributes.h -debian/tmp/opt/trinity/include/kde/dom/SVGFitToViewBox.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceFormatElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceNameElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceSrcElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGFontFaceUriElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGForeignObjectElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGlyphElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGlyphRefElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGGradientElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGHKernElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGICCColor.h -debian/tmp/opt/trinity/include/kde/dom/SVGImageElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGLangSpace.h -debian/tmp/opt/trinity/include/kde/dom/SVGLength.h -debian/tmp/opt/trinity/include/kde/dom/SVGLengthList.h -debian/tmp/opt/trinity/include/kde/dom/SVGLineElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGLinearGradientElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGLocatable.h -debian/tmp/opt/trinity/include/kde/dom/SVGMPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMarkerElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMaskElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMatrix.h -debian/tmp/opt/trinity/include/kde/dom/SVGMetadataElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGMissingGlyphElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGNumber.h -debian/tmp/opt/trinity/include/kde/dom/SVGNumberList.h -debian/tmp/opt/trinity/include/kde/dom/SVGPaint.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSeg.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegArc.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegClosePath.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoCubic.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoCubicSmooth.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoQuadratic.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegCurvetoQuadraticSmooth.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLineto.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLinetoHorizontal.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegLinetoVertical.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegList.h -debian/tmp/opt/trinity/include/kde/dom/SVGPathSegMoveto.h -debian/tmp/opt/trinity/include/kde/dom/SVGPatternElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPoint.h -debian/tmp/opt/trinity/include/kde/dom/SVGPointList.h -debian/tmp/opt/trinity/include/kde/dom/SVGPolygonElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPolylineElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGPreserveAspectRatio.h -debian/tmp/opt/trinity/include/kde/dom/SVGRadialGradientElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGRect.h -debian/tmp/opt/trinity/include/kde/dom/SVGRectElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGRenderingIntent.h -debian/tmp/opt/trinity/include/kde/dom/SVGSVGElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGScriptElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGSetElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGStopElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGStringList.h -debian/tmp/opt/trinity/include/kde/dom/SVGStylable.h -debian/tmp/opt/trinity/include/kde/dom/SVGStyleElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGSwitchElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGSymbolElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTRefElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTSpanElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTests.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextContentElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextPathElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTextPositioningElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTitleElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGTransform.h -debian/tmp/opt/trinity/include/kde/dom/SVGTransformList.h -debian/tmp/opt/trinity/include/kde/dom/SVGTransformable.h -debian/tmp/opt/trinity/include/kde/dom/SVGURIReference.h -debian/tmp/opt/trinity/include/kde/dom/SVGUnitTypes.h -debian/tmp/opt/trinity/include/kde/dom/SVGUseElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGVKernElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGViewElement.h -debian/tmp/opt/trinity/include/kde/dom/SVGViewSpec.h -debian/tmp/opt/trinity/include/kde/dom/SVGWindow.h -debian/tmp/opt/trinity/include/kde/dom/SVGZoomAndPan.h -debian/tmp/opt/trinity/include/kde/dom/SVGZoomEvent.h -debian/tmp/opt/trinity/include/kde/kfaximage.h -debian/tmp/opt/trinity/include/kde/kmultipageInterface.h -debian/tmp/opt/trinity/include/kde/ksvg/CanvasFactory.h -debian/tmp/opt/trinity/include/kde/ksvg/CanvasItem.h -debian/tmp/opt/trinity/include/kde/ksvg/CanvasItems.h -debian/tmp/opt/trinity/include/kde/ksvg/DocumentFactory.h -debian/tmp/opt/trinity/include/kde/ksvg/KSVGCanvas.h -debian/tmp/opt/trinity/include/kde/ksvg/ksvg_plugin.h -debian/tmp/opt/trinity/include/kde/kviewshell/anchor.h -debian/tmp/opt/trinity/include/kde/kviewshell/bookmark.h -debian/tmp/opt/trinity/include/kde/kviewshell/pageView.h -debian/tmp/opt/trinity/include/kde/kviewshell/documentPageCache.h -debian/tmp/opt/trinity/include/kde/kviewshell/documentRenderer.h -debian/tmp/opt/trinity/include/kde/kviewshell/documentWidget.h -debian/tmp/opt/trinity/include/kde/kviewshell/history.h -debian/tmp/opt/trinity/include/kde/kviewshell/hyperlink.h -debian/tmp/opt/trinity/include/kde/kviewshell/kmultipage.h -debian/tmp/opt/trinity/include/kde/kviewshell/length.h -debian/tmp/opt/trinity/include/kde/kviewshell/pageNumber.h -debian/tmp/opt/trinity/include/kde/kviewshell/pageSize.h -debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPage.h -debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPagePixmap.h -debian/tmp/opt/trinity/include/kde/kviewshell/renderedDocumentPagePrinter.h -debian/tmp/opt/trinity/include/kde/kviewshell/selection.h -debian/tmp/opt/trinity/include/kde/kviewshell/simplePageSize.h -debian/tmp/opt/trinity/include/kde/kviewshell/textBox.h -debian/tmp/opt/trinity/include/kde/kviewshell/zoom.h -debian/tmp/opt/trinity/include/kde/kviewshell/zoomlimits.h -debian/tmp/opt/trinity/include/kde/libtext2path-0.1/BezierPath.h -debian/tmp/opt/trinity/include/kde/libtext2path-0.1/Glyph.h -debian/tmp/opt/trinity/include/kde/libtext2path-0.1/GlyphTracer.h +debian/tmp/opt/trinity/include/tde/dom/SVGAElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAltGlyphDefElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAltGlyphElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAngle.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateColorElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateMotionElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimateTransformElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedAngle.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedBoolean.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedEnumeration.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedInteger.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedLength.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedLengthList.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedNumber.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedNumberList.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPathData.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPoints.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedPreserveAspectRatio.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedRect.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedString.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimatedTransformList.h +debian/tmp/opt/trinity/include/tde/dom/SVGAnimationElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGCSSRule.h +debian/tmp/opt/trinity/include/tde/dom/SVGCircleElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGClipPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGColor.h +debian/tmp/opt/trinity/include/tde/dom/SVGColorProfileElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGColorProfileRule.h +debian/tmp/opt/trinity/include/tde/dom/SVGComponentTransferFunctionElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGCursorElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDefinitionSrcElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDefsElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDescElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGDocument.h +debian/tmp/opt/trinity/include/tde/dom/SVGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGElementInstance.h +debian/tmp/opt/trinity/include/tde/dom/SVGElementInstanceList.h +debian/tmp/opt/trinity/include/tde/dom/SVGEllipseElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGEvent.h +debian/tmp/opt/trinity/include/tde/dom/SVGException.h +debian/tmp/opt/trinity/include/tde/dom/SVGExternalResourcesRequired.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEBlendElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEColorMatrixElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEComponentTransferElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFECompositeElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEConvolveMatrixElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEDiffuseLightingElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEDisplacementMapElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEDistantLightElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFloodElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncAElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncBElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEFuncRElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEGaussianBlurElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEImageElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEMergeElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEMergeNodeElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEMorphologyElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEOffsetElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFEPointLightElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFESpecularLightingElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFESpotLightElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFETileElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFETurbulenceElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFilterElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFilterPrimitiveStandardAttributes.h +debian/tmp/opt/trinity/include/tde/dom/SVGFitToViewBox.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceFormatElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceNameElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceSrcElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGFontFaceUriElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGForeignObjectElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGlyphElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGlyphRefElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGGradientElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGHKernElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGICCColor.h +debian/tmp/opt/trinity/include/tde/dom/SVGImageElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGLangSpace.h +debian/tmp/opt/trinity/include/tde/dom/SVGLength.h +debian/tmp/opt/trinity/include/tde/dom/SVGLengthList.h +debian/tmp/opt/trinity/include/tde/dom/SVGLineElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGLinearGradientElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGLocatable.h +debian/tmp/opt/trinity/include/tde/dom/SVGMPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMarkerElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMaskElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMatrix.h +debian/tmp/opt/trinity/include/tde/dom/SVGMetadataElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGMissingGlyphElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGNumber.h +debian/tmp/opt/trinity/include/tde/dom/SVGNumberList.h +debian/tmp/opt/trinity/include/tde/dom/SVGPaint.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSeg.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegArc.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegClosePath.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoCubic.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoCubicSmooth.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoQuadratic.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegCurvetoQuadraticSmooth.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLineto.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLinetoHorizontal.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegLinetoVertical.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegList.h +debian/tmp/opt/trinity/include/tde/dom/SVGPathSegMoveto.h +debian/tmp/opt/trinity/include/tde/dom/SVGPatternElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPoint.h +debian/tmp/opt/trinity/include/tde/dom/SVGPointList.h +debian/tmp/opt/trinity/include/tde/dom/SVGPolygonElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPolylineElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGPreserveAspectRatio.h +debian/tmp/opt/trinity/include/tde/dom/SVGRadialGradientElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGRect.h +debian/tmp/opt/trinity/include/tde/dom/SVGRectElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGRenderingIntent.h +debian/tmp/opt/trinity/include/tde/dom/SVGSVGElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGScriptElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGSetElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGStopElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGStringList.h +debian/tmp/opt/trinity/include/tde/dom/SVGStylable.h +debian/tmp/opt/trinity/include/tde/dom/SVGStyleElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGSwitchElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGSymbolElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTRefElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTSpanElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTests.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextContentElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextPathElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTextPositioningElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTitleElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGTransform.h +debian/tmp/opt/trinity/include/tde/dom/SVGTransformList.h +debian/tmp/opt/trinity/include/tde/dom/SVGTransformable.h +debian/tmp/opt/trinity/include/tde/dom/SVGURIReference.h +debian/tmp/opt/trinity/include/tde/dom/SVGUnitTypes.h +debian/tmp/opt/trinity/include/tde/dom/SVGUseElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGVKernElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGViewElement.h +debian/tmp/opt/trinity/include/tde/dom/SVGViewSpec.h +debian/tmp/opt/trinity/include/tde/dom/SVGWindow.h +debian/tmp/opt/trinity/include/tde/dom/SVGZoomAndPan.h +debian/tmp/opt/trinity/include/tde/dom/SVGZoomEvent.h +debian/tmp/opt/trinity/include/tde/kfaximage.h +debian/tmp/opt/trinity/include/tde/kmultipageInterface.h +debian/tmp/opt/trinity/include/tde/ksvg/CanvasFactory.h +debian/tmp/opt/trinity/include/tde/ksvg/CanvasItem.h +debian/tmp/opt/trinity/include/tde/ksvg/CanvasItems.h +debian/tmp/opt/trinity/include/tde/ksvg/DocumentFactory.h +debian/tmp/opt/trinity/include/tde/ksvg/KSVGCanvas.h +debian/tmp/opt/trinity/include/tde/ksvg/ksvg_plugin.h +debian/tmp/opt/trinity/include/tde/kviewshell/anchor.h +debian/tmp/opt/trinity/include/tde/kviewshell/bookmark.h +debian/tmp/opt/trinity/include/tde/kviewshell/pageView.h +debian/tmp/opt/trinity/include/tde/kviewshell/documentPageCache.h +debian/tmp/opt/trinity/include/tde/kviewshell/documentRenderer.h +debian/tmp/opt/trinity/include/tde/kviewshell/documentWidget.h +debian/tmp/opt/trinity/include/tde/kviewshell/history.h +debian/tmp/opt/trinity/include/tde/kviewshell/hyperlink.h +debian/tmp/opt/trinity/include/tde/kviewshell/kmultipage.h +debian/tmp/opt/trinity/include/tde/kviewshell/length.h +debian/tmp/opt/trinity/include/tde/kviewshell/pageNumber.h +debian/tmp/opt/trinity/include/tde/kviewshell/pageSize.h +debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPage.h +debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPagePixmap.h +debian/tmp/opt/trinity/include/tde/kviewshell/renderedDocumentPagePrinter.h +debian/tmp/opt/trinity/include/tde/kviewshell/selection.h +debian/tmp/opt/trinity/include/tde/kviewshell/simplePageSize.h +debian/tmp/opt/trinity/include/tde/kviewshell/textBox.h +debian/tmp/opt/trinity/include/tde/kviewshell/zoom.h +debian/tmp/opt/trinity/include/tde/kviewshell/zoomlimits.h +debian/tmp/opt/trinity/include/tde/libtext2path-0.1/BezierPath.h +debian/tmp/opt/trinity/include/tde/libtext2path-0.1/Glyph.h +debian/tmp/opt/trinity/include/tde/libtext2path-0.1/GlyphTracer.h debian/tmp/opt/trinity/lib/libtdeinit_kview.la debian/tmp/opt/trinity/lib/libtdeinit_mrmlsearch.la debian/tmp/opt/trinity/lib/libkghostviewlib.la diff --git a/ubuntu/maverick/tdelibs/debian/cdbs/kde.mk b/ubuntu/maverick/tdelibs/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdelibs/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdelibs/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/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog index dd416c496..8eda5d307 100644 --- a/ubuntu/maverick/tdelibs/debian/changelog +++ b/ubuntu/maverick/tdelibs/debian/changelog @@ -2087,7 +2087,7 @@ tdelibs (4:3.4.0-0pre5) alioth; urgency=low output them expanded even when --expandvars is not used. (Closes: #287822) * Fixed the ability of the build system to find kde.pot, even when it is not - located at TDEDIR/include/kde.pot. This allows the use of targets such as + located at TDEDIR/include/tde.pot. This allows the use of targets such as "package-messages" without specifying includedir. (Closes: #283858) * Now that graphviz is in main, add it to Build-Depends-Indep together with diff --git a/ubuntu/maverick/tdelibs/debian/rules b/ubuntu/maverick/tdelibs/debian/rules index 24b56bf2a..2e2bdf3ee 100755 --- a/ubuntu/maverick/tdelibs/debian/rules +++ b/ubuntu/maverick/tdelibs/debian/rules @@ -20,7 +20,7 @@ DEB_KDE_APIDOX := yes version=Debian Package $(DEB_VERSION) DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION) -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" -DWITH_GCC_VISIBILITY="ON" \ +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" -DWITH_GCC_VISIBILITY="ON" \ -DWITH_LIBART="ON" -DWITH_LIBIDN="ON" -DWITH_TIFF="ON" -DWITH_JASPER="ON" -DWITH_OPENEXR="ON" -DWITH_AVAHI="ON" -DWITH_ASPELL="ON" -DWITH_HSPELL="ON" -DWITH_ELFICON="ON" # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install index 3d2e8e43b..a9044b322 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install @@ -197,13 +197,13 @@ debian/tmp/opt/trinity/include/kdatewidget.h debian/tmp/opt/trinity/include/kdcopactionproxy.h debian/tmp/opt/trinity/include/kdcoppropertyproxy.h debian/tmp/opt/trinity/include/kdcopservicestarter.h -debian/tmp/opt/trinity/include/kdebugclasses.h -debian/tmp/opt/trinity/include/kdebug.h -debian/tmp/opt/trinity/include/kdedmodule.h -debian/tmp/opt/trinity/include/kde_file.h +debian/tmp/opt/trinity/include/tdebugclasses.h +debian/tmp/opt/trinity/include/tdebug.h +debian/tmp/opt/trinity/include/tdedmodule.h +debian/tmp/opt/trinity/include/tde_file.h debian/tmp/opt/trinity/include/tdelibs_export.h -debian/tmp/opt/trinity/include/kdemacros.h -debian/tmp/opt/trinity/include/kde.pot +debian/tmp/opt/trinity/include/tdemacros.h +debian/tmp/opt/trinity/include/tde.pot debian/tmp/opt/trinity/include/tdeprint/driver.h debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h debian/tmp/opt/trinity/include/tdeprint/kmjob.h @@ -221,7 +221,7 @@ debian/tmp/opt/trinity/include/tdeprint/kprintdialogpage.h debian/tmp/opt/trinity/include/tdeprint/lpr/lprhandler.h debian/tmp/opt/trinity/include/tdeprint/lpr/lprsettings.h debian/tmp/opt/trinity/include/tdeprint/lpr/printcapentry.h -debian/tmp/opt/trinity/include/kdesktopfile.h +debian/tmp/opt/trinity/include/tdesktopfile.h debian/tmp/opt/trinity/include/tdesu/client.h debian/tmp/opt/trinity/include/tdesu/defaults.h debian/tmp/opt/trinity/include/tdesu/kcookie.h @@ -231,7 +231,7 @@ debian/tmp/opt/trinity/include/tdesu/pty.h debian/tmp/opt/trinity/include/tdesu/ssh.h debian/tmp/opt/trinity/include/tdesu/stub.h debian/tmp/opt/trinity/include/tdesu/su.h -debian/tmp/opt/trinity/include/kde_terminal_interface.h +debian/tmp/opt/trinity/include/tde_terminal_interface.h debian/tmp/opt/trinity/include/tdeversion.h debian/tmp/opt/trinity/include/kdialogbase.h debian/tmp/opt/trinity/include/kdialog.h @@ -717,7 +717,7 @@ debian/tmp/opt/trinity/include/networkstatusindicator.h debian/tmp/opt/trinity/include/connectionmanager.h debian/tmp/opt/trinity/include/serviceiface.h debian/tmp/opt/trinity/include/provideriface.h -#debian/tmp/opt/trinity/include/kdemm +#debian/tmp/opt/trinity/include/tdemm debian/tmp/opt/trinity/lib/libnetworkstatus.la debian/tmp/opt/trinity/lib/libnetworkstatus.so diff --git a/ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk b/ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdemultimedia/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdemultimedia/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/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - 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 +# 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 $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdemultimedia/debian/rules b/ubuntu/maverick/tdemultimedia/debian/rules index abe114b59..aff6738b2 100755 --- a/ubuntu/maverick/tdemultimedia/debian/rules +++ b/ubuntu/maverick/tdemultimedia/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 @@ -14,9 +14,9 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_CONFIGURE_EXTRA_FLAGS := \ --with-alsa --with-arts-alsa \ - --with-extra-includes=/usr/include/speex:/opt/trinity/include/kde/arts \ + --with-extra-includes=/usr/include/speex:/opt/trinity/include/tde/arts \ --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib - # The include/kde/arts one should be temporary. See + # The include/tde/arts one should be temporary. See # "juk/Makefile.am: arts_includes vs ARTS_CFLAGS" in -talk. DOC_HTML_PRUNE := kcontrol-trinity diff --git a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install index a6b4265bd..4edb170bf 100644 --- a/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install +++ b/ubuntu/maverick/tdemultimedia/debian/tdemultimedia-trinity-dev.install @@ -1,137 +1,137 @@ -debian/tmp/opt/trinity/include/kde/arts/artsbuilder.h -debian/tmp/opt/trinity/include/kde/arts/artsbuilder.idl -debian/tmp/opt/trinity/include/kde/arts/artsgui.h -debian/tmp/opt/trinity/include/kde/arts/artsgui.idl -debian/tmp/opt/trinity/include/kde/arts/artsmidi.h -debian/tmp/opt/trinity/include/kde/arts/artsmidi.idl -debian/tmp/opt/trinity/include/kde/arts/artsmodules.h -debian/tmp/opt/trinity/include/kde/arts/artsmodules.idl -debian/tmp/opt/trinity/include/kde/arts/artsmodulescommon.h -debian/tmp/opt/trinity/include/kde/arts/artsmodulescommon.idl -debian/tmp/opt/trinity/include/kde/arts/artsmoduleseffects.h -debian/tmp/opt/trinity/include/kde/arts/artsmoduleseffects.idl -debian/tmp/opt/trinity/include/kde/arts/artsmodulesmixers.h -debian/tmp/opt/trinity/include/kde/arts/artsmodulesmixers.idl -debian/tmp/opt/trinity/include/kde/arts/artsmodulessynth.h -debian/tmp/opt/trinity/include/kde/arts/artsmodulessynth.idl -debian/tmp/opt/trinity/include/kde/arts/kartswidget.h -debian/tmp/opt/trinity/include/kde/arts/kframe_impl.h -debian/tmp/opt/trinity/include/kde/arts/klayoutbox_impl.h -debian/tmp/opt/trinity/include/kde/arts/kwidget_impl.h -debian/tmp/opt/trinity/include/kde/arts/kwidgetrepo.h -debian/tmp/opt/trinity/include/kde/audiocdencoder.h -debian/tmp/opt/trinity/include/kde/cmodule.h -debian/tmp/opt/trinity/include/kde/effectview.h -debian/tmp/opt/trinity/include/kde/equalizerview.h -debian/tmp/opt/trinity/include/kde/ksaver.h -debian/tmp/opt/trinity/include/kde/libkcddb/cache.h -debian/tmp/opt/trinity/include/kde/libkcddb/cddb.h -debian/tmp/opt/trinity/include/kde/libkcddb/cdinfo.h -debian/tmp/opt/trinity/include/kde/libkcddb/client.h -debian/tmp/opt/trinity/include/kde/libkcddb/config.h -debian/tmp/opt/trinity/include/kde/libkcddb/configbase.h -debian/tmp/opt/trinity/include/kde/mimetypetree.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/cddaPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/command.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/commandPipe.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/decoderPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/mpegPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/mpgPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/nukePlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/splayPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/tplayPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/vorbisPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/decoder/yuvPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/IOFrameQueue.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/audioFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/audioFrameQueue.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/floatFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/frame.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/frameQueue.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/framer.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/pcmFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/rawDataBuffer.h -debian/tmp/opt/trinity/include/kde/mpeglib/frame/rawFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/bufferInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/cddaInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/cdromInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/fileInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/httpInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/inputDetector.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/inputPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/inputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/input/threadSafeInputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegStreamPlayer.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegSystemHeader.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegSystemStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/mpegVideoLength.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/pesSystemStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/psSystemStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/mpegutil/tsSystemStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/oggFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/ovFramer.h -debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/vorbisDecoder.h -debian/tmp/opt/trinity/include/kde/mpeglib/oggvorbis/vorbisInfo.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/artsOutputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/audioTime.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/avSyncer.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/dspX11OutputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/outPlugin.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/outputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/pluginInfo.h -debian/tmp/opt/trinity/include/kde/mpeglib/output/threadSafeOutputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib/splay/mpegAudioFrame.h -debian/tmp/opt/trinity/include/kde/mpeglib/splay/mpegAudioInfo.h -debian/tmp/opt/trinity/include/kde/mpeglib/splay/splayDecoder.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/abstract/abs_thread.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/abstract/threadQueue.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/dynBuffer.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/file/fileAccess.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/mmx/mm_accel.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/mmx/mmx.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/mmx/mmx_asm.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/render/pictureArray.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/render/yuvPicture.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/syncClock.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/timeStamp.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/timeStampArray.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/timeWrapper.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/buffer.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/inputDecoder.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/inputInterface.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/outputInterface.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafcore/yaf_control.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h -debian/tmp/opt/trinity/include/kde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/decoderBaseObject.h -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/decoderBaseObject.idl -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/decoderBaseObject_impl.h -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/splayPlayObject.h -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/splayPlayObject.idl -debian/tmp/opt/trinity/include/kde/mpeglib_artsplug/splayPlayObject_impl.h -debian/tmp/opt/trinity/include/kde/noatun/app.h -debian/tmp/opt/trinity/include/kde/noatun/controls.h -debian/tmp/opt/trinity/include/kde/noatun/conversion.h -debian/tmp/opt/trinity/include/kde/noatun/downloader.h -debian/tmp/opt/trinity/include/kde/noatun/effects.h -debian/tmp/opt/trinity/include/kde/noatun/engine.h -debian/tmp/opt/trinity/include/kde/noatun/equalizer.h -debian/tmp/opt/trinity/include/kde/noatun/noatunarts.h -debian/tmp/opt/trinity/include/kde/noatun/player.h -debian/tmp/opt/trinity/include/kde/noatun/playlist.h -debian/tmp/opt/trinity/include/kde/noatun/playlistsaver.h -debian/tmp/opt/trinity/include/kde/noatun/plugin.h -debian/tmp/opt/trinity/include/kde/noatun/pluginloader.h -debian/tmp/opt/trinity/include/kde/noatun/pref.h -debian/tmp/opt/trinity/include/kde/noatun/scrollinglabel.h -debian/tmp/opt/trinity/include/kde/noatun/stdaction.h -debian/tmp/opt/trinity/include/kde/noatun/stereobuttonaction.h -debian/tmp/opt/trinity/include/kde/noatun/tags.h -debian/tmp/opt/trinity/include/kde/noatun/vequalizer.h -debian/tmp/opt/trinity/include/kde/noatun/video.h -debian/tmp/opt/trinity/include/kde/noatun/winskinvis.h -debian/tmp/opt/trinity/include/kde/plugin_deps.h +debian/tmp/opt/trinity/include/tde/arts/artsbuilder.h +debian/tmp/opt/trinity/include/tde/arts/artsbuilder.idl +debian/tmp/opt/trinity/include/tde/arts/artsgui.h +debian/tmp/opt/trinity/include/tde/arts/artsgui.idl +debian/tmp/opt/trinity/include/tde/arts/artsmidi.h +debian/tmp/opt/trinity/include/tde/arts/artsmidi.idl +debian/tmp/opt/trinity/include/tde/arts/artsmodules.h +debian/tmp/opt/trinity/include/tde/arts/artsmodules.idl +debian/tmp/opt/trinity/include/tde/arts/artsmodulescommon.h +debian/tmp/opt/trinity/include/tde/arts/artsmodulescommon.idl +debian/tmp/opt/trinity/include/tde/arts/artsmoduleseffects.h +debian/tmp/opt/trinity/include/tde/arts/artsmoduleseffects.idl +debian/tmp/opt/trinity/include/tde/arts/artsmodulesmixers.h +debian/tmp/opt/trinity/include/tde/arts/artsmodulesmixers.idl +debian/tmp/opt/trinity/include/tde/arts/artsmodulessynth.h +debian/tmp/opt/trinity/include/tde/arts/artsmodulessynth.idl +debian/tmp/opt/trinity/include/tde/arts/kartswidget.h +debian/tmp/opt/trinity/include/tde/arts/kframe_impl.h +debian/tmp/opt/trinity/include/tde/arts/klayoutbox_impl.h +debian/tmp/opt/trinity/include/tde/arts/kwidget_impl.h +debian/tmp/opt/trinity/include/tde/arts/kwidgetrepo.h +debian/tmp/opt/trinity/include/tde/audiocdencoder.h +debian/tmp/opt/trinity/include/tde/cmodule.h +debian/tmp/opt/trinity/include/tde/effectview.h +debian/tmp/opt/trinity/include/tde/equalizerview.h +debian/tmp/opt/trinity/include/tde/ksaver.h +debian/tmp/opt/trinity/include/tde/libkcddb/cache.h +debian/tmp/opt/trinity/include/tde/libkcddb/cddb.h +debian/tmp/opt/trinity/include/tde/libkcddb/cdinfo.h +debian/tmp/opt/trinity/include/tde/libkcddb/client.h +debian/tmp/opt/trinity/include/tde/libkcddb/config.h +debian/tmp/opt/trinity/include/tde/libkcddb/configbase.h +debian/tmp/opt/trinity/include/tde/mimetypetree.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/cddaPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/command.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/commandPipe.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/decoderPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/mpegPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/mpgPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/nukePlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/splayPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/tplayPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/vorbisPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/decoder/yuvPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/IOFrameQueue.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/audioFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/audioFrameQueue.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/floatFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/frame.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/frameQueue.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/framer.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/pcmFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/rawDataBuffer.h +debian/tmp/opt/trinity/include/tde/mpeglib/frame/rawFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/bufferInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/cddaInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/cdromInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/fileInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/httpInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/inputDetector.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/inputPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/inputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/input/threadSafeInputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegStreamPlayer.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegSystemHeader.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegSystemStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/mpegVideoLength.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/pesSystemStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/psSystemStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/mpegutil/tsSystemStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/oggFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/ovFramer.h +debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/vorbisDecoder.h +debian/tmp/opt/trinity/include/tde/mpeglib/oggvorbis/vorbisInfo.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/artsOutputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/audioTime.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/avSyncer.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/dspX11OutputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/outPlugin.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/outputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/pluginInfo.h +debian/tmp/opt/trinity/include/tde/mpeglib/output/threadSafeOutputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib/splay/mpegAudioFrame.h +debian/tmp/opt/trinity/include/tde/mpeglib/splay/mpegAudioInfo.h +debian/tmp/opt/trinity/include/tde/mpeglib/splay/splayDecoder.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/abstract/abs_thread.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/abstract/threadQueue.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/dynBuffer.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/file/fileAccess.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mm_accel.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mmx.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/mmx/mmx_asm.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/render/pictureArray.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/render/yuvPicture.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/syncClock.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/timeStamp.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/timeStampArray.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/timeWrapper.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/buffer.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/inputDecoder.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/inputInterface.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/outputInterface.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafcore/yaf_control.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderXPlayer.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/inputDecoderYAF.h +debian/tmp/opt/trinity/include/tde/mpeglib/util/yaf/yafxplayer/yafOutputStream.h +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject.h +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject.idl +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/decoderBaseObject_impl.h +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject.h +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject.idl +debian/tmp/opt/trinity/include/tde/mpeglib_artsplug/splayPlayObject_impl.h +debian/tmp/opt/trinity/include/tde/noatun/app.h +debian/tmp/opt/trinity/include/tde/noatun/controls.h +debian/tmp/opt/trinity/include/tde/noatun/conversion.h +debian/tmp/opt/trinity/include/tde/noatun/downloader.h +debian/tmp/opt/trinity/include/tde/noatun/effects.h +debian/tmp/opt/trinity/include/tde/noatun/engine.h +debian/tmp/opt/trinity/include/tde/noatun/equalizer.h +debian/tmp/opt/trinity/include/tde/noatun/noatunarts.h +debian/tmp/opt/trinity/include/tde/noatun/player.h +debian/tmp/opt/trinity/include/tde/noatun/playlist.h +debian/tmp/opt/trinity/include/tde/noatun/playlistsaver.h +debian/tmp/opt/trinity/include/tde/noatun/plugin.h +debian/tmp/opt/trinity/include/tde/noatun/pluginloader.h +debian/tmp/opt/trinity/include/tde/noatun/pref.h +debian/tmp/opt/trinity/include/tde/noatun/scrollinglabel.h +debian/tmp/opt/trinity/include/tde/noatun/stdaction.h +debian/tmp/opt/trinity/include/tde/noatun/stereobuttonaction.h +debian/tmp/opt/trinity/include/tde/noatun/tags.h +debian/tmp/opt/trinity/include/tde/noatun/vequalizer.h +debian/tmp/opt/trinity/include/tde/noatun/video.h +debian/tmp/opt/trinity/include/tde/noatun/winskinvis.h +debian/tmp/opt/trinity/include/tde/plugin_deps.h debian/tmp/opt/trinity/lib/libarts_mpeglib.so debian/tmp/opt/trinity/lib/libarts_splay.so debian/tmp/opt/trinity/lib/libartsbuilder.so diff --git a/ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk b/ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdenetwork/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdenetwork/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/tdenetwork/debian/kopete-trinity.install b/ubuntu/maverick/tdenetwork/debian/kopete-trinity.install index c4a342dc5..1901f005e 100644 --- a/ubuntu/maverick/tdenetwork/debian/kopete-trinity.install +++ b/ubuntu/maverick/tdenetwork/debian/kopete-trinity.install @@ -1,9 +1,9 @@ debian/tmp/opt/trinity/bin/kopete debian/tmp/opt/trinity/bin/kopete_latexconvert.sh -debian/tmp/opt/trinity/include/kde/kopete/kopetepicture.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteprefs.h -debian/tmp/opt/trinity/include/kde/kopete/ui/addressbooklinkwidget.h -debian/tmp/opt/trinity/include/kde/kopete/webcamwidget.h +debian/tmp/opt/trinity/include/tde/kopete/kopetepicture.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteprefs.h +debian/tmp/opt/trinity/include/tde/kopete/ui/addressbooklinkwidget.h +debian/tmp/opt/trinity/include/tde/kopete/webcamwidget.h debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-account-kconf_update debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-nameTracking-kconf_update debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-pluginloader2-kconf_update diff --git a/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - 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 +# 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 $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdenetwork/debian/rules b/ubuntu/maverick/tdenetwork/debian/rules index 90babf808..71afe376c 100755 --- a/ubuntu/maverick/tdenetwork/debian/rules +++ b/ubuntu/maverick/tdenetwork/debian/rules @@ -17,7 +17,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/tdenetwork/debian/tdenetwork-trinity-dev.install b/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install index cc69d4cba..4915aaa12 100644 --- a/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install +++ b/ubuntu/maverick/tdenetwork/debian/tdenetwork-trinity-dev.install @@ -1,66 +1,66 @@ -debian/tmp/opt/trinity/include/kde/kopete/kabcpersistence.h -debian/tmp/opt/trinity/include/kde/kopete/kopete_export.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteaccount.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteaccountmanager.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteaway.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteawayaction.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteawaydialog.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteblacklister.h -debian/tmp/opt/trinity/include/kde/kopete/kopetechatsession.h -debian/tmp/opt/trinity/include/kde/kopete/kopetechatsessionmanager.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecommandhandler.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecontact.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecontactlist.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecontactlistelement.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecontactproperty.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteeventpresentation.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteglobal.h -debian/tmp/opt/trinity/include/kde/kopete/kopetegroup.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemessage.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemessageevent.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemessagehandler.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemessagehandlerchain.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemetacontact.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemimetypehandler.h -debian/tmp/opt/trinity/include/kde/kopete/kopetenotifydataobject.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteonlinestatus.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteonlinestatusmanager.h -debian/tmp/opt/trinity/include/kde/kopete/kopetepassword.h -debian/tmp/opt/trinity/include/kde/kopete/kopetepasswordedaccount.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteplugin.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteprotocol.h -debian/tmp/opt/trinity/include/kde/kopete/kopetesimplemessagehandler.h -debian/tmp/opt/trinity/include/kde/kopete/kopetetask.h -debian/tmp/opt/trinity/include/kde/kopete/kopetetransfermanager.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteuiglobal.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteversion.h -debian/tmp/opt/trinity/include/kde/kopete/managedconnectionaccount.h -debian/tmp/opt/trinity/include/kde/kopete/ui/accountselector.h -debian/tmp/opt/trinity/include/kde/kopete/ui/addcontactpage.h -debian/tmp/opt/trinity/include/kde/kopete/ui/addressbookselectordialog.h -debian/tmp/opt/trinity/include/kde/kopete/ui/addressbookselectorwidget.h -debian/tmp/opt/trinity/include/kde/kopete/ui/editaccountwidget.h -debian/tmp/opt/trinity/include/kde/kopete/ui/fileconfirmbase.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteawaydialogbase.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetecontactaction.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetefileconfirmdialog.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistview.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistviewitem.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistviewsearchline.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepassworddialog.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepasswordwidget.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepasswordwidgetbase.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetestdaction.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteview.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteviewplugin.h -debian/tmp/opt/trinity/include/kde/kopete/ui/userinfodialog.h -debian/tmp/opt/trinity/include/kde/rss/article.h -debian/tmp/opt/trinity/include/kde/rss/document.h -debian/tmp/opt/trinity/include/kde/rss/global.h -debian/tmp/opt/trinity/include/kde/rss/image.h -debian/tmp/opt/trinity/include/kde/rss/librss.h -debian/tmp/opt/trinity/include/kde/rss/loader.h -debian/tmp/opt/trinity/include/kde/rss/textinput.h +debian/tmp/opt/trinity/include/tde/kopete/kabcpersistence.h +debian/tmp/opt/trinity/include/tde/kopete/kopete_export.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteaccount.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteaccountmanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteaway.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteawayaction.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteawaydialog.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteblacklister.h +debian/tmp/opt/trinity/include/tde/kopete/kopetechatsession.h +debian/tmp/opt/trinity/include/tde/kopete/kopetechatsessionmanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecommandhandler.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecontact.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecontactlist.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecontactlistelement.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecontactproperty.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteeventpresentation.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteglobal.h +debian/tmp/opt/trinity/include/tde/kopete/kopetegroup.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemessage.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemessageevent.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemessagehandler.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemessagehandlerchain.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemetacontact.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemimetypehandler.h +debian/tmp/opt/trinity/include/tde/kopete/kopetenotifydataobject.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteonlinestatus.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteonlinestatusmanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopetepassword.h +debian/tmp/opt/trinity/include/tde/kopete/kopetepasswordedaccount.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteplugin.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteprotocol.h +debian/tmp/opt/trinity/include/tde/kopete/kopetesimplemessagehandler.h +debian/tmp/opt/trinity/include/tde/kopete/kopetetask.h +debian/tmp/opt/trinity/include/tde/kopete/kopetetransfermanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteuiglobal.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteversion.h +debian/tmp/opt/trinity/include/tde/kopete/managedconnectionaccount.h +debian/tmp/opt/trinity/include/tde/kopete/ui/accountselector.h +debian/tmp/opt/trinity/include/tde/kopete/ui/addcontactpage.h +debian/tmp/opt/trinity/include/tde/kopete/ui/addressbookselectordialog.h +debian/tmp/opt/trinity/include/tde/kopete/ui/addressbookselectorwidget.h +debian/tmp/opt/trinity/include/tde/kopete/ui/editaccountwidget.h +debian/tmp/opt/trinity/include/tde/kopete/ui/fileconfirmbase.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteawaydialogbase.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetecontactaction.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetefileconfirmdialog.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistview.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistviewitem.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistviewsearchline.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepassworddialog.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepasswordwidget.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepasswordwidgetbase.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetestdaction.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteview.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteviewplugin.h +debian/tmp/opt/trinity/include/tde/kopete/ui/userinfodialog.h +debian/tmp/opt/trinity/include/tde/rss/article.h +debian/tmp/opt/trinity/include/tde/rss/document.h +debian/tmp/opt/trinity/include/tde/rss/global.h +debian/tmp/opt/trinity/include/tde/rss/image.h +debian/tmp/opt/trinity/include/tde/rss/librss.h +debian/tmp/opt/trinity/include/tde/rss/loader.h +debian/tmp/opt/trinity/include/tde/rss/textinput.h debian/tmp/opt/trinity/lib/libtdeinit_kdict.la debian/tmp/opt/trinity/lib/libtdeinit_ksirc.la debian/tmp/opt/trinity/lib/libkopete.la @@ -73,4 +73,4 @@ debian/tmp/opt/trinity/lib/libkopete_videodevice.la debian/tmp/opt/trinity/lib/libkopete_videodevice.so debian/tmp/opt/trinity/lib/librss.la debian/tmp/opt/trinity/lib/librss.so -debian/tmp/opt/trinity/include/kde/kopete/kopetepluginmanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopetepluginmanager.h diff --git a/ubuntu/maverick/tdepim/debian/changelog b/ubuntu/maverick/tdepim/debian/changelog index 24807570c..53b6c5851 100644 --- a/ubuntu/maverick/tdepim/debian/changelog +++ b/ubuntu/maverick/tdepim/debian/changelog @@ -706,7 +706,7 @@ tdepim (4:3.5.6-0ubuntu3) feisty; urgency=low - Activates networkstatus support for kmail (patch from SuSE) * debian/control: - New package networkstatus-dev - * ./libtdepim1-dev.install: added /usr/include/kde/kpimprefs.h + * ./libtdepim1-dev.install: added /usr/include/tde/kpimprefs.h -- Anthony Mercatante <tonio@ubuntu.com> Fri, 02 Feb 2007 15:37:42 +0100 diff --git a/ubuntu/maverick/tdepim/debian/libindex0-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libindex0-trinity-dev.install index acbb26191..8c2903ede 100644 --- a/ubuntu/maverick/tdepim/debian/libindex0-trinity-dev.install +++ b/ubuntu/maverick/tdepim/debian/libindex0-trinity-dev.install @@ -1,4 +1,4 @@ /opt/trinity/bin/indexlib-config -/opt/trinity/include/kde/index +/opt/trinity/include/tde/index /opt/trinity/lib/libindex.la /opt/trinity/lib/libindex.so diff --git a/ubuntu/maverick/tdepim/debian/libkcal2-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libkcal2-trinity-dev.install index 7dcc98ca7..75a5523ca 100644 --- a/ubuntu/maverick/tdepim/debian/libkcal2-trinity-dev.install +++ b/ubuntu/maverick/tdepim/debian/libkcal2-trinity-dev.install @@ -1,5 +1,5 @@ -/opt/trinity/include/kde/libemailfunctions/idmapper.h -/opt/trinity/include/kde/libkcal +/opt/trinity/include/tde/libemailfunctions/idmapper.h +/opt/trinity/include/tde/libkcal /opt/trinity/lib/libkcal.la /opt/trinity/lib/libkcal.so /opt/trinity/lib/libkcal_resourceremote.la diff --git a/ubuntu/maverick/tdepim/debian/libkgantt0-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libkgantt0-trinity-dev.install index c386be142..290f743b7 100644 --- a/ubuntu/maverick/tdepim/debian/libkgantt0-trinity-dev.install +++ b/ubuntu/maverick/tdepim/debian/libkgantt0-trinity-dev.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/kgantt +/opt/trinity/include/tde/kgantt /opt/trinity/lib/libkgantt.la /opt/trinity/lib/libkgantt.so diff --git a/ubuntu/maverick/tdepim/debian/libkleopatra1-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libkleopatra1-trinity-dev.install index cab0f039e..6015f5c08 100644 --- a/ubuntu/maverick/tdepim/debian/libkleopatra1-trinity-dev.install +++ b/ubuntu/maverick/tdepim/debian/libkleopatra1-trinity-dev.install @@ -1,6 +1,6 @@ -/opt/trinity/include/kde/gpgme++ -/opt/trinity/include/kde/kleo -/opt/trinity/include/kde/qgpgme +/opt/trinity/include/tde/gpgme++ +/opt/trinity/include/tde/kleo +/opt/trinity/include/tde/qgpgme /opt/trinity/lib/libgpgme++.la /opt/trinity/lib/libgpgme++.so /opt/trinity/lib/libkleopatra.la diff --git a/ubuntu/maverick/tdepim/debian/libkpimexchange1-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libkpimexchange1-trinity-dev.install index 8bf3b312e..ed8bb8407 100644 --- a/ubuntu/maverick/tdepim/debian/libkpimexchange1-trinity-dev.install +++ b/ubuntu/maverick/tdepim/debian/libkpimexchange1-trinity-dev.install @@ -1,4 +1,4 @@ -/opt/trinity/include/kde/tdepim/exchangeaccount.h -/opt/trinity/include/kde/tdepim/exchangeclient.h +/opt/trinity/include/tde/tdepim/exchangeaccount.h +/opt/trinity/include/tde/tdepim/exchangeclient.h /opt/trinity/lib/libkpimexchange.la /opt/trinity/lib/libkpimexchange.so diff --git a/ubuntu/maverick/tdepim/debian/libksieve0-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libksieve0-trinity-dev.install index 08cf59222..32aa3d12d 100644 --- a/ubuntu/maverick/tdepim/debian/libksieve0-trinity-dev.install +++ b/ubuntu/maverick/tdepim/debian/libksieve0-trinity-dev.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/ksieve +/opt/trinity/include/tde/ksieve /opt/trinity/lib/libksieve.la /opt/trinity/lib/libksieve.so diff --git a/ubuntu/maverick/tdepim/debian/libktnef1-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libktnef1-trinity-dev.install index 5c74d9348..1cea927e9 100644 --- a/ubuntu/maverick/tdepim/debian/libktnef1-trinity-dev.install +++ b/ubuntu/maverick/tdepim/debian/libktnef1-trinity-dev.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/ktnef +/opt/trinity/include/tde/ktnef /opt/trinity/lib/libktnef.la /opt/trinity/lib/libktnef.so diff --git a/ubuntu/maverick/tdepim/debian/libmimelib1-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libmimelib1-trinity-dev.install index c5092b6a9..3a5428f6e 100644 --- a/ubuntu/maverick/tdepim/debian/libmimelib1-trinity-dev.install +++ b/ubuntu/maverick/tdepim/debian/libmimelib1-trinity-dev.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/mimelib +/opt/trinity/include/tde/mimelib /opt/trinity/lib/libmimelib.la /opt/trinity/lib/libmimelib.so diff --git a/ubuntu/maverick/tdepim/debian/libtdepim1-trinity-dev.install b/ubuntu/maverick/tdepim/debian/libtdepim1-trinity-dev.install index 4f6d52f46..56ca2ebc8 100644 --- a/ubuntu/maverick/tdepim/debian/libtdepim1-trinity-dev.install +++ b/ubuntu/maverick/tdepim/debian/libtdepim1-trinity-dev.install @@ -1,3 +1,3 @@ -/opt/trinity/include/kde/tdepimmacros.h +/opt/trinity/include/tde/tdepimmacros.h /opt/trinity/lib/libtdepim.la /opt/trinity/lib/libtdepim.so diff --git a/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install b/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install index 848758727..b94111037 100644 --- a/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install +++ b/ubuntu/maverick/tdepim/debian/tdepim-trinity-dev.install @@ -1,15 +1,15 @@ -/opt/trinity/include/kde/KNotesAppIface.h -/opt/trinity/include/kde/KNotesIface.h -/opt/trinity/include/kde/akregator -/opt/trinity/include/kde/calendar -/opt/trinity/include/kde/kabc -/opt/trinity/include/kde/kaddressbook -/opt/trinity/include/kde/kmail -/opt/trinity/include/kde/kmailIface.h -/opt/trinity/include/kde/kmailicalIface.h -/opt/trinity/include/kde/kmailpartIface.h -/opt/trinity/include/kde/kontact -/opt/trinity/include/kde/korganizer +/opt/trinity/include/tde/KNotesAppIface.h +/opt/trinity/include/tde/KNotesIface.h +/opt/trinity/include/tde/akregator +/opt/trinity/include/tde/calendar +/opt/trinity/include/tde/kabc +/opt/trinity/include/tde/kaddressbook +/opt/trinity/include/tde/kmail +/opt/trinity/include/tde/kmailIface.h +/opt/trinity/include/tde/kmailicalIface.h +/opt/trinity/include/tde/kmailpartIface.h +/opt/trinity/include/tde/kontact +/opt/trinity/include/tde/korganizer /opt/trinity/lib/libkabckolab.la /opt/trinity/lib/libkabckolab.so /opt/trinity/lib/libkabcscalix.la @@ -81,4 +81,4 @@ /opt/trinity/lib/libgwsoap.la /opt/trinity/lib/libgwsoap.so -/opt/trinity/include/kde/kpimprefs.h +/opt/trinity/include/tde/kpimprefs.h diff --git a/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk b/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdesdk/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdesdk/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/tdesdk/debian/changelog b/ubuntu/maverick/tdesdk/debian/changelog index 276fb1d78..1bbe6e2e4 100644 --- a/ubuntu/maverick/tdesdk/debian/changelog +++ b/ubuntu/maverick/tdesdk/debian/changelog @@ -931,7 +931,7 @@ tdesdk (2.2.2-3) unstable; urgency=low tdesdk (2.2.2-2) unstable; urgency=low - * Moved kspy.h to /usr/include/kde (closes: Bug#122448, Bug#122449). + * Moved kspy.h to /usr/include/tde (closes: Bug#122448, Bug#122449). -- Ben Burton <benb@acm.org> Thu, 6 Dec 2001 09:50:47 -0600 diff --git a/ubuntu/maverick/tdesdk/debian/kbabel-trinity-dev.install b/ubuntu/maverick/tdesdk/debian/kbabel-trinity-dev.install index a792b2b6d..ace31ea6a 100644 --- a/ubuntu/maverick/tdesdk/debian/kbabel-trinity-dev.install +++ b/ubuntu/maverick/tdesdk/debian/kbabel-trinity-dev.install @@ -1,24 +1,24 @@ -debian/tmp/opt/trinity/include/kde/kbabel/catalog.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogfileplugin.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogitem.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogsettings.h -debian/tmp/opt/trinity/include/kde/kbabel/catalogview.h -debian/tmp/opt/trinity/include/kde/kbabel/dictchooser.h -debian/tmp/opt/trinity/include/kde/kbabel/dictionarymenu.h -debian/tmp/opt/trinity/include/kde/kbabel/editcmd.h -debian/tmp/opt/trinity/include/kde/kbabel/findoptions.h -debian/tmp/opt/trinity/include/kde/kbabel/itempart.h -debian/tmp/opt/trinity/include/kde/kbabel/kbabeldatatool.h -debian/tmp/opt/trinity/include/kde/kbabel/kbabeldictbox.h -debian/tmp/opt/trinity/include/kde/kbabel/kbabeldictiface.h -debian/tmp/opt/trinity/include/kde/kbabel/kbproject.h -debian/tmp/opt/trinity/include/kde/kbabel/kbprojectmanager.h -debian/tmp/opt/trinity/include/kde/kbabel/msgfmt.h -debian/tmp/opt/trinity/include/kde/kbabel/poinfo.h -debian/tmp/opt/trinity/include/kde/kbabel/projectsettings.h -debian/tmp/opt/trinity/include/kde/kbabel/regexpextractor.h -debian/tmp/opt/trinity/include/kde/kbabel/searchengine.h -debian/tmp/opt/trinity/include/kde/kbabel/tagextractor.h +debian/tmp/opt/trinity/include/tde/kbabel/catalog.h +debian/tmp/opt/trinity/include/tde/kbabel/catalogfileplugin.h +debian/tmp/opt/trinity/include/tde/kbabel/catalogitem.h +debian/tmp/opt/trinity/include/tde/kbabel/catalogsettings.h +debian/tmp/opt/trinity/include/tde/kbabel/catalogview.h +debian/tmp/opt/trinity/include/tde/kbabel/dictchooser.h +debian/tmp/opt/trinity/include/tde/kbabel/dictionarymenu.h +debian/tmp/opt/trinity/include/tde/kbabel/editcmd.h +debian/tmp/opt/trinity/include/tde/kbabel/findoptions.h +debian/tmp/opt/trinity/include/tde/kbabel/itempart.h +debian/tmp/opt/trinity/include/tde/kbabel/kbabeldatatool.h +debian/tmp/opt/trinity/include/tde/kbabel/kbabeldictbox.h +debian/tmp/opt/trinity/include/tde/kbabel/kbabeldictiface.h +debian/tmp/opt/trinity/include/tde/kbabel/kbproject.h +debian/tmp/opt/trinity/include/tde/kbabel/kbprojectmanager.h +debian/tmp/opt/trinity/include/tde/kbabel/msgfmt.h +debian/tmp/opt/trinity/include/tde/kbabel/poinfo.h +debian/tmp/opt/trinity/include/tde/kbabel/projectsettings.h +debian/tmp/opt/trinity/include/tde/kbabel/regexpextractor.h +debian/tmp/opt/trinity/include/tde/kbabel/searchengine.h +debian/tmp/opt/trinity/include/tde/kbabel/tagextractor.h debian/tmp/opt/trinity/lib/libkbabelcommon.la debian/tmp/opt/trinity/lib/libkbabelcommon.so debian/tmp/opt/trinity/lib/libkbabeldictplugin.la diff --git a/ubuntu/maverick/tdesdk/debian/kmtrace-trinity.install b/ubuntu/maverick/tdesdk/debian/kmtrace-trinity.install index 119b5196d..35b5af1a5 100644 --- a/ubuntu/maverick/tdesdk/debian/kmtrace-trinity.install +++ b/ubuntu/maverick/tdesdk/debian/kmtrace-trinity.install @@ -2,7 +2,7 @@ debian/tmp/opt/trinity/bin/demangle debian/tmp/opt/trinity/bin/kminspector debian/tmp/opt/trinity/bin/kmmatch debian/tmp/opt/trinity/bin/kmtrace -debian/tmp/opt/trinity/include/kde/ktrace.h +debian/tmp/opt/trinity/include/tde/ktrace.h debian/tmp/opt/trinity/lib/kmtrace/libktrace.la debian/tmp/opt/trinity/lib/kmtrace/libktrace.so debian/tmp/opt/trinity/lib/kmtrace/libktrace_s.a diff --git a/ubuntu/maverick/tdesdk/debian/kspy-trinity.install b/ubuntu/maverick/tdesdk/debian/kspy-trinity.install index 3b7d6d778..fc17ede2c 100644 --- a/ubuntu/maverick/tdesdk/debian/kspy-trinity.install +++ b/ubuntu/maverick/tdesdk/debian/kspy-trinity.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde/kspy.h +debian/tmp/opt/trinity/include/tde/kspy.h debian/tmp/opt/trinity/lib/libkspy.la debian/tmp/opt/trinity/lib/libkspy.so debian/tmp/opt/trinity/lib/libkspy.so.1 diff --git a/ubuntu/maverick/tdesdk/debian/kunittest-trinity.install b/ubuntu/maverick/tdesdk/debian/kunittest-trinity.install index f002cd796..e183f0e74 100644 --- a/ubuntu/maverick/tdesdk/debian/kunittest-trinity.install +++ b/ubuntu/maverick/tdesdk/debian/kunittest-trinity.install @@ -4,4 +4,4 @@ debian/tmp/opt/trinity/lib/libkunittestgui.la debian/tmp/opt/trinity/lib/libkunittestgui.so debian/tmp/opt/trinity/lib/libkunittestgui.so.0 debian/tmp/opt/trinity/lib/libkunittestgui.so.0.0.0 -debian/tmp/opt/trinity/include/kde/kunittest/runnergui.h +debian/tmp/opt/trinity/include/tde/kunittest/runnergui.h diff --git a/ubuntu/maverick/tdesdk/debian/libcvsservice-trinity-dev.install b/ubuntu/maverick/tdesdk/debian/libcvsservice-trinity-dev.install index ac87e6efb..566e0b7a1 100644 --- a/ubuntu/maverick/tdesdk/debian/libcvsservice-trinity-dev.install +++ b/ubuntu/maverick/tdesdk/debian/libcvsservice-trinity-dev.install @@ -1,6 +1,6 @@ -debian/tmp/opt/trinity/include/kde/cvsjob_stub.h -debian/tmp/opt/trinity/include/kde/cvsservice_stub.h -debian/tmp/opt/trinity/include/kde/repository_stub.h +debian/tmp/opt/trinity/include/tde/cvsjob_stub.h +debian/tmp/opt/trinity/include/tde/cvsservice_stub.h +debian/tmp/opt/trinity/include/tde/repository_stub.h debian/tmp/opt/trinity/lib/libcvsservice.la debian/tmp/opt/trinity/lib/libcvsservice.so debian/tmp/opt/trinity/lib/libtdeinit_cvsaskpass.la diff --git a/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - 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 +# 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 $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdesdk/debian/rules b/ubuntu/maverick/tdesdk/debian/rules index e7b228f2b..d63a59865 100755 --- a/ubuntu/maverick/tdesdk/debian/rules +++ b/ubuntu/maverick/tdesdk/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/tdesdk/debian/tdesdk-misc-trinity.install b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install index cc229ce19..4b2589f6c 100644 --- a/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install +++ b/ubuntu/maverick/tdesdk/debian/tdesdk-misc-trinity.install @@ -1,4 +1,4 @@ -debian/tmp/opt/trinity/include/kde/kprofilemethod.h +debian/tmp/opt/trinity/include/tde/kprofilemethod.h debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.la debian/tmp/opt/trinity/lib/trinity/kabcformat_kdeaccounts.so debian/tmp/opt/trinity/lib/trinity/plugins/styles/scheck.so diff --git a/ubuntu/maverick/tdetoys/debian/amor-trinity.install b/ubuntu/maverick/tdetoys/debian/amor-trinity.install index b616db701..56a51c1b0 100644 --- a/ubuntu/maverick/tdetoys/debian/amor-trinity.install +++ b/ubuntu/maverick/tdetoys/debian/amor-trinity.install @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/bin/amor -debian/tmp/opt/trinity/include/kde/AmorIface.h +debian/tmp/opt/trinity/include/tde/AmorIface.h debian/tmp/opt/trinity/share/apps/amor debian/tmp/opt/trinity/share/applications/kde/amor.desktop debian/tmp/opt/trinity/share/doc/kde/HTML/en/amor/*.bz2 diff --git a/ubuntu/maverick/tdetoys/debian/cdbs/kde.mk b/ubuntu/maverick/tdetoys/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdetoys/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdetoys/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/tdetoys/debian/changelog b/ubuntu/maverick/tdetoys/debian/changelog index 5406c86c9..232db2401 100644 --- a/ubuntu/maverick/tdetoys/debian/changelog +++ b/ubuntu/maverick/tdetoys/debian/changelog @@ -609,7 +609,7 @@ tdetoys (4:2.2.2-3) unstable; urgency=low tdetoys (4:2.2.2-2) unstable; urgency=low - * Moved AmorIface.h to /usr/include/kde (closes: Bug#122447). + * Moved AmorIface.h to /usr/include/tde (closes: Bug#122447). -- Ben Burton <benb@acm.org> Sun, 9 Dec 2001 09:07:02 -0600 diff --git a/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - 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 +# 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 $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdetoys/debian/rules b/ubuntu/maverick/tdetoys/debian/rules index 29a5978c3..57c3cf2c9 100755 --- a/ubuntu/maverick/tdetoys/debian/rules +++ b/ubuntu/maverick/tdetoys/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 --includedir="/opt/trinity/include/kde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" DEB_DH_STRIP_ARGS := --dbg-package=tdetoys-trinity-dbg diff --git a/ubuntu/maverick/tdeutils/debian/cdbs/kde.mk b/ubuntu/maverick/tdeutils/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdeutils/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdeutils/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/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - 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 +# 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 $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeutils/debian/rules b/ubuntu/maverick/tdeutils/debian/rules index f7cd135a4..a83c83fdf 100755 --- a/ubuntu/maverick/tdeutils/debian/rules +++ b/ubuntu/maverick/tdeutils/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/tdeutils/debian/tdeutils-trinity-dev.install b/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install index a3c425a38..ca7081194 100644 --- a/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install +++ b/ubuntu/maverick/tdeutils/debian/tdeutils-trinity-dev.install @@ -1,18 +1,18 @@ -debian/tmp/opt/trinity/include/kde/kmultiformlistbox.h -debian/tmp/opt/trinity/include/kde/kmultiformlistboxentry.h -debian/tmp/opt/trinity/include/kde/kmultiformlistboxfactory.h -debian/tmp/opt/trinity/include/kde/ksim/chart.h -debian/tmp/opt/trinity/include/kde/ksim/common.h -debian/tmp/opt/trinity/include/kde/ksim/ksimconfig.h -debian/tmp/opt/trinity/include/kde/ksim/label.h -debian/tmp/opt/trinity/include/kde/ksim/led.h -debian/tmp/opt/trinity/include/kde/ksim/pluginglobal.h -debian/tmp/opt/trinity/include/kde/ksim/pluginloader.h -debian/tmp/opt/trinity/include/kde/ksim/pluginmodule.h -debian/tmp/opt/trinity/include/kde/ksim/progress.h -debian/tmp/opt/trinity/include/kde/ksim/themeloader.h -debian/tmp/opt/trinity/include/kde/ksim/themetypes.h -debian/tmp/opt/trinity/include/kde/kwidgetstreamer.h +debian/tmp/opt/trinity/include/tde/kmultiformlistbox.h +debian/tmp/opt/trinity/include/tde/kmultiformlistboxentry.h +debian/tmp/opt/trinity/include/tde/kmultiformlistboxfactory.h +debian/tmp/opt/trinity/include/tde/ksim/chart.h +debian/tmp/opt/trinity/include/tde/ksim/common.h +debian/tmp/opt/trinity/include/tde/ksim/ksimconfig.h +debian/tmp/opt/trinity/include/tde/ksim/label.h +debian/tmp/opt/trinity/include/tde/ksim/led.h +debian/tmp/opt/trinity/include/tde/ksim/pluginglobal.h +debian/tmp/opt/trinity/include/tde/ksim/pluginloader.h +debian/tmp/opt/trinity/include/tde/ksim/pluginmodule.h +debian/tmp/opt/trinity/include/tde/ksim/progress.h +debian/tmp/opt/trinity/include/tde/ksim/themeloader.h +debian/tmp/opt/trinity/include/tde/ksim/themetypes.h +debian/tmp/opt/trinity/include/tde/kwidgetstreamer.h debian/tmp/opt/trinity/lib/libkcmlaptop.la debian/tmp/opt/trinity/lib/libkcmlaptop.so debian/tmp/opt/trinity/lib/libtdeinit_ark.la diff --git a/ubuntu/maverick/tdevelop/debian/cdbs/kde.mk b/ubuntu/maverick/tdevelop/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdevelop/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdevelop/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/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/include/tde/kde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -15,11 +15,11 @@ - 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 +# 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 $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdevelop/debian/rules b/ubuntu/maverick/tdevelop/debian/rules index f5bce32b3..21f2c166a 100755 --- a/ubuntu/maverick/tdevelop/debian/rules +++ b/ubuntu/maverick/tdevelop/debian/rules @@ -9,7 +9,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/tdevelop/debian/tdevelop-trinity-dev.install b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-dev.install index 5c24ba5bb..f9f8c82ab 100644 --- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-dev.install +++ b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity-dev.install @@ -1,3 +1,3 @@ -debian/tmp/opt/trinity/include/kde +debian/tmp/opt/trinity/include/tde debian/tmp/opt/trinity/lib/lib*.so debian/tmp/opt/trinity/lib/lib*.la diff --git a/ubuntu/maverick/tdewebdev/debian/cdbs/kde.mk b/ubuntu/maverick/tdewebdev/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdewebdev/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdewebdev/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/tdewebdev/debian/kommander-trinity-dev.install b/ubuntu/maverick/tdewebdev/debian/kommander-trinity-dev.install index 54d904432..8d8db707b 100644 --- a/ubuntu/maverick/tdewebdev/debian/kommander-trinity-dev.install +++ b/ubuntu/maverick/tdewebdev/debian/kommander-trinity-dev.install @@ -1,7 +1,7 @@ -debian/tmp/opt/trinity/include/kde/kommander* +debian/tmp/opt/trinity/include/tde/kommander* debian/tmp/opt/trinity/lib/libkommanderplugin.la debian/tmp/opt/trinity/lib/libkommanderplugin.so debian/tmp/opt/trinity/lib/libkommanderwidget.la debian/tmp/opt/trinity/lib/libkommanderwidget.so debian/tmp/opt/trinity/lib/libkommanderwidgets.so -debian/tmp/opt/trinity/include/kde/specials.h +debian/tmp/opt/trinity/include/tde/specials.h diff --git a/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff index 1f825f642..698deb926 100644 --- a/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ 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" @@ -15,11 +15,11 @@ - 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 +# 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 $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdewebdev/debian/rules b/ubuntu/maverick/tdewebdev/debian/rules index 2dcf9658d..888f66bcf 100755 --- a/ubuntu/maverick/tdewebdev/debian/rules +++ b/ubuntu/maverick/tdewebdev/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 |