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

5 files changed, 8 insertions, 8 deletions

diff --git a/debian/lenny/tdetoys/debian/amor-trinity.install b/debian/lenny/tdetoys/debian/amor-trinity.install
index b616db701..56a51c1b0 100644
--- a/debian/lenny/tdetoys/debian/amor-trinity.install
+++ b/debian/lenny/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/debian/lenny/tdetoys/debian/cdbs/kde.mk b/debian/lenny/tdetoys/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/lenny/tdetoys/debian/cdbs/kde.mk
+++ b/debian/lenny/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/debian/lenny/tdetoys/debian/changelog b/debian/lenny/tdetoys/debian/changelog
index 5406c86c9..232db2401 100644
--- a/debian/lenny/tdetoys/debian/changelog
+++ b/debian/lenny/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 <[email protected]>  Sun,  9 Dec 2001 09:07:02 -0600
 
diff --git a/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff
index 0caf5361a..c02687784 100644
--- a/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/debian/lenny/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/debian/lenny/tdetoys/debian/rules b/debian/lenny/tdetoys/debian/rules
index 29a5978c3..57c3cf2c9 100755
--- a/debian/lenny/tdetoys/debian/rules
+++ b/debian/lenny/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