Update Debian and Ubuntu packaging files for new TDE include directory name

14 files changed, 24 insertions, 24 deletions

diff --git a/ubuntu/lucid_automake/libraries/kipi-plugins/debian/cdbs/kde.mk b/ubuntu/lucid_automake/libraries/kipi-plugins/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/lucid_automake/libraries/kipi-plugins/debian/cdbs/kde.mk
+++ b/ubuntu/lucid_automake/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/lucid_automake/libraries/kipi-plugins/debian/rules b/ubuntu/lucid_automake/libraries/kipi-plugins/debian/rules
index 45d9a55b4..847bdb8ef 100755
--- a/ubuntu/lucid_automake/libraries/kipi-plugins/debian/rules
+++ b/ubuntu/lucid_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
 DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
 DEB_CONFIGURE_PREFIX := /opt/kde3
 DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
 
 clean ::
 	rm -f po/*/*.gmo
diff --git a/ubuntu/lucid_automake/libraries/libkdcraw/debian/cdbs/kde.mk b/ubuntu/lucid_automake/libraries/libkdcraw/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/lucid_automake/libraries/libkdcraw/debian/cdbs/kde.mk
+++ b/ubuntu/lucid_automake/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/lucid_automake/libraries/libkdcraw/debian/rules b/ubuntu/lucid_automake/libraries/libkdcraw/debian/rules
index f2eb3f948..7e04f9653 100755
--- a/ubuntu/lucid_automake/libraries/libkdcraw/debian/rules
+++ b/ubuntu/lucid_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
 DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
 DEB_CONFIGURE_PREFIX := /opt/kde3
 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/lucid_automake/libraries/libkexiv2/debian/cdbs/kde.mk b/ubuntu/lucid_automake/libraries/libkexiv2/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/lucid_automake/libraries/libkexiv2/debian/cdbs/kde.mk
+++ b/ubuntu/lucid_automake/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/lucid_automake/libraries/libkexiv2/debian/rules b/ubuntu/lucid_automake/libraries/libkexiv2/debian/rules
index 213669cac..f5721b2e3 100755
--- a/ubuntu/lucid_automake/libraries/libkexiv2/debian/rules
+++ b/ubuntu/lucid_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
 DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
 DEB_CONFIGURE_PREFIX := /opt/kde3
 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/lucid_automake/libraries/libkipi/debian/cdbs/kde.mk b/ubuntu/lucid_automake/libraries/libkipi/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/lucid_automake/libraries/libkipi/debian/cdbs/kde.mk
+++ b/ubuntu/lucid_automake/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/lucid_automake/libraries/libkipi/debian/rules b/ubuntu/lucid_automake/libraries/libkipi/debian/rules
index a2ce2c395..6d35aa5b2 100755
--- a/ubuntu/lucid_automake/libraries/libkipi/debian/rules
+++ b/ubuntu/lucid_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
 DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
 DEB_CONFIGURE_PREFIX := /opt/kde3
 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/lucid_automake/libraries/libksquirrel/debian/rules b/ubuntu/lucid_automake/libraries/libksquirrel/debian/rules
index 566a88117..eb2e91d1a 100755
--- a/ubuntu/lucid_automake/libraries/libksquirrel/debian/rules
+++ b/ubuntu/lucid_automake/libraries/libksquirrel/debian/rules
@@ -9,7 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
 DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
 DEB_CONFIGURE_PREFIX := /opt/kde3
 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/lucid_automake/libraries/mlt++/debian/rules b/ubuntu/lucid_automake/libraries/mlt++/debian/rules
index 7858faac4..f16e3b0e3 100755
--- a/ubuntu/lucid_automake/libraries/mlt++/debian/rules
+++ b/ubuntu/lucid_automake/libraries/mlt++/debian/rules
@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
 DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
 DEB_CONFIGURE_PREFIX := /opt/kde3
 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
diff --git a/ubuntu/lucid_automake/libraries/mlt/debian/rules b/ubuntu/lucid_automake/libraries/mlt/debian/rules
index 70d23bb1b..9bb8d7a03 100755
--- a/ubuntu/lucid_automake/libraries/mlt/debian/rules
+++ b/ubuntu/lucid_automake/libraries/mlt/debian/rules
@@ -3,7 +3,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
 DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
 DEB_CONFIGURE_PREFIX := /opt/kde3
 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
@@ -47,10 +47,10 @@ configure-stamp:
 
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 
-	CFLAGS="$(CFLAGS)" PATH=/opt/kde3/bin:$(PATH) LD_LIBRARY_PATH=/opt/kde3/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde ./configure --enable-gpl \
+	CFLAGS="$(CFLAGS)" PATH=/opt/kde3/bin:$(PATH) LD_LIBRARY_PATH=/opt/kde3/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde ./configure --enable-gpl \
 	--luma-compress --disable-mmx $(CONFIGURE_OPTS) \
 	--avformat-shared=/usr --avformat-swscale \
-	--prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+	--prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
 
 	touch configure-stamp
 
@@ -58,7 +58,7 @@ build: configure-stamp build-stamp
 build-stamp:
 	dh_testdir
 
-	env PATH=/opt/kde3/bin:$(PATH) LD_LIBRARY_PATH=/opt/kde3/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) -j $(NCPUS)
+	env PATH=/opt/kde3/bin:$(PATH) LD_LIBRARY_PATH=/opt/kde3/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) -j $(NCPUS)
 
 	touch build-stamp
 
@@ -81,7 +81,7 @@ install: build
 	dh_clean -k 
 	dh_installdirs opt/kde3/lib/mlt0.2.5/modules opt/kde3/share/mlt0.2.5
 
-	env PATH=/opt/kde3/bin:$(PATH) LD_LIBRARY_PATH=/opt/kde3/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/kde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	env PATH=/opt/kde3/bin:$(PATH) LD_LIBRARY_PATH=/opt/kde3/lib:$(LD_LIBRARY_PATH) CMAKE_LIBRARY_PATH=/opt/kde3/lib CMAKE_INCLUDE_PATH=/opt/kde3/include/tde $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 #	mkdir debian/tmp/opt/kde3
 #	mv debian/tmp/opt/kde3/lib debian/tmp/opt/kde3/
diff --git a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install
index fa6727d83..c1b3787e8 100644
--- a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install
+++ b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/libpythonize0-kde3-dev.install
@@ -1,4 +1,4 @@
-opt/kde3/include/kde/pythonize.h
+opt/kde3/include/tde/pythonize.h
 opt/kde3/lib/libpythonize.a
 opt/kde3/lib/libpythonize.la
 opt/kde3/lib/libpythonize.so
diff --git a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/rules b/ubuntu/lucid_automake/libraries/pytdeextensions/debian/rules
index f6a1d85e6..96ccfd714 100755
--- a/ubuntu/lucid_automake/libraries/pytdeextensions/debian/rules
+++ b/ubuntu/lucid_automake/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/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
 DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
 DEB_CONFIGURE_PREFIX := /opt/kde3
 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
@@ -16,7 +16,7 @@ DEB_CONFIGURE_INFODIR := /opt/kde3/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/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/kde
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --with-extra-includes=/opt/kde3/include/tde
 
 install/pytdeextensions-kde3::
 	# We have no idea if the built product is site-packages or dist-packages
@@ -45,8 +45,8 @@ install/libpythonize0-kde3::
 	# fix binary-or-shlib-defines-rpath
 	chrpath -d debian/tmp/opt/kde3/lib/libpythonize.so.*
 	# fix include directory location
-	mkdir -p debian/tmp/opt/kde3/include/kde
-	mv debian/tmp/opt/kde3/include/*.h debian/tmp/opt/kde3/include/kde
+	mkdir -p debian/tmp/opt/kde3/include/tde
+	mv debian/tmp/opt/kde3/include/*.h debian/tmp/opt/kde3/include/tde
 
 clean::
 	rm -rf build
diff --git a/ubuntu/lucid_automake/libraries/python-kde3/debian/rules b/ubuntu/lucid_automake/libraries/python-kde3/debian/rules
index 553c08f56..ed917cdc0 100755
--- a/ubuntu/lucid_automake/libraries/python-kde3/debian/rules
+++ b/ubuntu/lucid_automake/libraries/python-kde3/debian/rules
@@ -4,7 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/kde
+DEB_CONFIGURE_INCLUDEDIR := /opt/kde3/include/tde
 DEB_CONFIGURE_MANDIR := /opt/kde3/share/man
 DEB_CONFIGURE_PREFIX := /opt/kde3
 DEB_CONFIGURE_INFODIR := /opt/kde3/share/info
@@ -43,7 +43,7 @@ build-%/configure-stamp: patch-stamp
 	dh_testdir
 	mkdir -p build-$*
 	cd build-$* && python$* ../configure.py \
-		-c -u -k /opt/kde3 -o /opt/kde3/include/kde -n /opt/kde3/lib \
+		-c -u -k /opt/kde3 -o /opt/kde3/include/tde -n /opt/kde3/lib \
 		-v /opt/kde3/share/sip/kde3 -j $(SPLIT)
 	touch $@
 
@@ -51,7 +51,7 @@ dbg-build-%/configure-stamp: patch-stamp
 	dh_testdir
 	mkdir -p dbg-build-$*
 	cd dbg-build-$* && python$*-dbg ../configure.py \
-		-c -u -k /opt/kde3 -o /opt/kde3/include/kde -n /opt/kde3/lib \
+		-c -u -k /opt/kde3 -o /opt/kde3/include/tde -n /opt/kde3/lib \
 		-v /opt/kde3/share/sip/kde3 -j $(SPLIT)
 	touch $@