Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

6 files changed, 10 insertions, 10 deletions

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::