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

10 files changed, 34 insertions, 34 deletions

diff --git a/debian/squeeze/tdesdk/debian/cdbs/kde.mk b/debian/squeeze/tdesdk/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/tdesdk/debian/cdbs/kde.mk
+++ b/debian/squeeze/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/debian/squeeze/tdesdk/debian/changelog b/debian/squeeze/tdesdk/debian/changelog
index 276fb1d78..1bbe6e2e4 100644
--- a/debian/squeeze/tdesdk/debian/changelog
+++ b/debian/squeeze/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/debian/squeeze/tdesdk/debian/kbabel-trinity-dev.install b/debian/squeeze/tdesdk/debian/kbabel-trinity-dev.install
index a792b2b6d..ace31ea6a 100644
--- a/debian/squeeze/tdesdk/debian/kbabel-trinity-dev.install
+++ b/debian/squeeze/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/debian/squeeze/tdesdk/debian/kmtrace-trinity.install b/debian/squeeze/tdesdk/debian/kmtrace-trinity.install
index 119b5196d..35b5af1a5 100644
--- a/debian/squeeze/tdesdk/debian/kmtrace-trinity.install
+++ b/debian/squeeze/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/debian/squeeze/tdesdk/debian/kspy-trinity.install b/debian/squeeze/tdesdk/debian/kspy-trinity.install
index 3b7d6d778..fc17ede2c 100644
--- a/debian/squeeze/tdesdk/debian/kspy-trinity.install
+++ b/debian/squeeze/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/debian/squeeze/tdesdk/debian/kunittest-trinity.install b/debian/squeeze/tdesdk/debian/kunittest-trinity.install
index f002cd796..e183f0e74 100644
--- a/debian/squeeze/tdesdk/debian/kunittest-trinity.install
+++ b/debian/squeeze/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/debian/squeeze/tdesdk/debian/libcvsservice-trinity-dev.install b/debian/squeeze/tdesdk/debian/libcvsservice-trinity-dev.install
index ac87e6efb..566e0b7a1 100644
--- a/debian/squeeze/tdesdk/debian/libcvsservice-trinity-dev.install
+++ b/debian/squeeze/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/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..c02687784 100644
--- a/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/squeeze/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/debian/squeeze/tdesdk/debian/rules b/debian/squeeze/tdesdk/debian/rules
index e7b228f2b..d63a59865 100755
--- a/debian/squeeze/tdesdk/debian/rules
+++ b/debian/squeeze/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/debian/squeeze/tdesdk/debian/tdesdk-misc-trinity.install b/debian/squeeze/tdesdk/debian/tdesdk-misc-trinity.install
index cc229ce19..4b2589f6c 100644
--- a/debian/squeeze/tdesdk/debian/tdesdk-misc-trinity.install
+++ b/debian/squeeze/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