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

4 files changed, 12 insertions, 12 deletions

diff --git a/debian/squeeze/tdelibs/debian/cdbs/kde.mk b/debian/squeeze/tdelibs/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/debian/squeeze/tdelibs/debian/cdbs/kde.mk
+++ b/debian/squeeze/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/debian/squeeze/tdelibs/debian/changelog b/debian/squeeze/tdelibs/debian/changelog
index dd416c496..8eda5d307 100644
--- a/debian/squeeze/tdelibs/debian/changelog
+++ b/debian/squeeze/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/debian/squeeze/tdelibs/debian/rules b/debian/squeeze/tdelibs/debian/rules
index 24b56bf2a..2e2bdf3ee 100755
--- a/debian/squeeze/tdelibs/debian/rules
+++ b/debian/squeeze/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/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install b/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
index 3d2e8e43b..a9044b322 100644
--- a/debian/squeeze/tdelibs/debian/tdelibs4-trinity-dev.install
+++ b/debian/squeeze/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