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

10 files changed, 34 insertions, 34 deletions

diff --git a/ubuntu/maverick_automake/kdesdk/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdesdk/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/kdesdk/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_automake/kdesdk/debian/changelog b/ubuntu/maverick_automake/kdesdk/debian/changelog
index 6e4dc71dc..e089652fe 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/changelog
+++ b/ubuntu/maverick_automake/kdesdk/debian/changelog
@@ -931,7 +931,7 @@ kdesdk (2.2.2-3) unstable; urgency=low
 
 kdesdk (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/ubuntu/maverick_automake/kdesdk/debian/kbabel-kde3-dev.install b/ubuntu/maverick_automake/kdesdk/debian/kbabel-kde3-dev.install
index 01b76ead6..030fdce15 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/kbabel-kde3-dev.install
+++ b/ubuntu/maverick_automake/kdesdk/debian/kbabel-kde3-dev.install
@@ -1,24 +1,24 @@
-debian/tmp/opt/kde3/include/kde/kbabel/catalog.h
-debian/tmp/opt/kde3/include/kde/kbabel/catalogfileplugin.h
-debian/tmp/opt/kde3/include/kde/kbabel/catalogitem.h
-debian/tmp/opt/kde3/include/kde/kbabel/catalogsettings.h
-debian/tmp/opt/kde3/include/kde/kbabel/catalogview.h
-debian/tmp/opt/kde3/include/kde/kbabel/dictchooser.h
-debian/tmp/opt/kde3/include/kde/kbabel/dictionarymenu.h
-debian/tmp/opt/kde3/include/kde/kbabel/editcmd.h
-debian/tmp/opt/kde3/include/kde/kbabel/findoptions.h
-debian/tmp/opt/kde3/include/kde/kbabel/itempart.h
-debian/tmp/opt/kde3/include/kde/kbabel/kbabeldatatool.h
-debian/tmp/opt/kde3/include/kde/kbabel/kbabeldictbox.h
-debian/tmp/opt/kde3/include/kde/kbabel/kbabeldictiface.h
-debian/tmp/opt/kde3/include/kde/kbabel/kbproject.h
-debian/tmp/opt/kde3/include/kde/kbabel/kbprojectmanager.h
-debian/tmp/opt/kde3/include/kde/kbabel/msgfmt.h
-debian/tmp/opt/kde3/include/kde/kbabel/poinfo.h
-debian/tmp/opt/kde3/include/kde/kbabel/projectsettings.h
-debian/tmp/opt/kde3/include/kde/kbabel/regexpextractor.h
-debian/tmp/opt/kde3/include/kde/kbabel/searchengine.h
-debian/tmp/opt/kde3/include/kde/kbabel/tagextractor.h
+debian/tmp/opt/kde3/include/tde/kbabel/catalog.h
+debian/tmp/opt/kde3/include/tde/kbabel/catalogfileplugin.h
+debian/tmp/opt/kde3/include/tde/kbabel/catalogitem.h
+debian/tmp/opt/kde3/include/tde/kbabel/catalogsettings.h
+debian/tmp/opt/kde3/include/tde/kbabel/catalogview.h
+debian/tmp/opt/kde3/include/tde/kbabel/dictchooser.h
+debian/tmp/opt/kde3/include/tde/kbabel/dictionarymenu.h
+debian/tmp/opt/kde3/include/tde/kbabel/editcmd.h
+debian/tmp/opt/kde3/include/tde/kbabel/findoptions.h
+debian/tmp/opt/kde3/include/tde/kbabel/itempart.h
+debian/tmp/opt/kde3/include/tde/kbabel/kbabeldatatool.h
+debian/tmp/opt/kde3/include/tde/kbabel/kbabeldictbox.h
+debian/tmp/opt/kde3/include/tde/kbabel/kbabeldictiface.h
+debian/tmp/opt/kde3/include/tde/kbabel/kbproject.h
+debian/tmp/opt/kde3/include/tde/kbabel/kbprojectmanager.h
+debian/tmp/opt/kde3/include/tde/kbabel/msgfmt.h
+debian/tmp/opt/kde3/include/tde/kbabel/poinfo.h
+debian/tmp/opt/kde3/include/tde/kbabel/projectsettings.h
+debian/tmp/opt/kde3/include/tde/kbabel/regexpextractor.h
+debian/tmp/opt/kde3/include/tde/kbabel/searchengine.h
+debian/tmp/opt/kde3/include/tde/kbabel/tagextractor.h
 debian/tmp/opt/kde3/lib/libkbabelcommon.la
 debian/tmp/opt/kde3/lib/libkbabelcommon.so
 debian/tmp/opt/kde3/lib/libkbabeldictplugin.la
diff --git a/ubuntu/maverick_automake/kdesdk/debian/kdesdk-misc-kde3.install b/ubuntu/maverick_automake/kdesdk/debian/kdesdk-misc-kde3.install
index 590f0fec5..39d07410e 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/kdesdk-misc-kde3.install
+++ b/ubuntu/maverick_automake/kdesdk/debian/kdesdk-misc-kde3.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/kde3/include/kde/kprofilemethod.h
+debian/tmp/opt/kde3/include/tde/kprofilemethod.h
 debian/tmp/opt/kde3/lib/kde3/kabcformat_kdeaccounts.la
 debian/tmp/opt/kde3/lib/kde3/kabcformat_kdeaccounts.so
 debian/tmp/opt/kde3/lib/kde3/plugins/styles/scheck.so
diff --git a/ubuntu/maverick_automake/kdesdk/debian/kmtrace-kde3.install b/ubuntu/maverick_automake/kdesdk/debian/kmtrace-kde3.install
index 5b7bd4476..b3d168f86 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/kmtrace-kde3.install
+++ b/ubuntu/maverick_automake/kdesdk/debian/kmtrace-kde3.install
@@ -2,7 +2,7 @@ debian/tmp/opt/kde3/bin/demangle
 debian/tmp/opt/kde3/bin/kminspector
 debian/tmp/opt/kde3/bin/kmmatch
 debian/tmp/opt/kde3/bin/kmtrace
-debian/tmp/opt/kde3/include/kde/ktrace.h
+debian/tmp/opt/kde3/include/tde/ktrace.h
 debian/tmp/opt/kde3/lib/kmtrace/libktrace.la
 debian/tmp/opt/kde3/lib/kmtrace/libktrace.so
 debian/tmp/opt/kde3/lib/kmtrace/libktrace_s.a
diff --git a/ubuntu/maverick_automake/kdesdk/debian/kspy-kde3.install b/ubuntu/maverick_automake/kdesdk/debian/kspy-kde3.install
index 08b701cce..ef88ab5a0 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/kspy-kde3.install
+++ b/ubuntu/maverick_automake/kdesdk/debian/kspy-kde3.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/kde3/include/kde/kspy.h
+debian/tmp/opt/kde3/include/tde/kspy.h
 debian/tmp/opt/kde3/lib/libkspy.la
 debian/tmp/opt/kde3/lib/libkspy.so
 debian/tmp/opt/kde3/lib/libkspy.so.1
diff --git a/ubuntu/maverick_automake/kdesdk/debian/kunittest-kde3.install b/ubuntu/maverick_automake/kdesdk/debian/kunittest-kde3.install
index 91dbea778..0be1336e4 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/kunittest-kde3.install
+++ b/ubuntu/maverick_automake/kdesdk/debian/kunittest-kde3.install
@@ -4,4 +4,4 @@ debian/tmp/opt/kde3/lib/libkunittestgui.la
 debian/tmp/opt/kde3/lib/libkunittestgui.so
 debian/tmp/opt/kde3/lib/libkunittestgui.so.0
 debian/tmp/opt/kde3/lib/libkunittestgui.so.0.0.0
-debian/tmp/opt/kde3/include/kde/kunittest/runnergui.h
+debian/tmp/opt/kde3/include/tde/kunittest/runnergui.h
diff --git a/ubuntu/maverick_automake/kdesdk/debian/libcvsservice-kde3-dev.install b/ubuntu/maverick_automake/kdesdk/debian/libcvsservice-kde3-dev.install
index b541cf5c1..308a82cde 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/libcvsservice-kde3-dev.install
+++ b/ubuntu/maverick_automake/kdesdk/debian/libcvsservice-kde3-dev.install
@@ -1,6 +1,6 @@
-debian/tmp/opt/kde3/include/kde/cvsjob_stub.h
-debian/tmp/opt/kde3/include/kde/cvsservice_stub.h
-debian/tmp/opt/kde3/include/kde/repository_stub.h
+debian/tmp/opt/kde3/include/tde/cvsjob_stub.h
+debian/tmp/opt/kde3/include/tde/cvsservice_stub.h
+debian/tmp/opt/kde3/include/tde/repository_stub.h
 debian/tmp/opt/kde3/lib/libcvsservice.la
 debian/tmp/opt/kde3/lib/libcvsservice.so
 debian/tmp/opt/kde3/lib/libkdeinit_cvsaskpass.la
diff --git a/ubuntu/maverick_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff
index 3d5dc7628..e705cf83b 100644
--- a/ubuntu/maverick_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/maverick_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff
@@ -4,7 +4,7 @@
  if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
  export EXTRACTRC PREPARETIPS
  
-+kdepotpath=/opt/kde3/include/kde/kde.pot
++kdepotpath=/opt/kde3/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_automake/kdesdk/debian/rules b/ubuntu/maverick_automake/kdesdk/debian/rules
index bab4e2b82..1a91a4065 100755
--- a/ubuntu/maverick_automake/kdesdk/debian/rules
+++ b/ubuntu/maverick_automake/kdesdk/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