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

4 files changed, 87 insertions, 87 deletions

diff --git a/ubuntu/maverick_automake/dependencies/arts/debian/libarts1-kde3-dev.install b/ubuntu/maverick_automake/dependencies/arts/debian/libarts1-kde3-dev.install
index 2ba1c47dd..00ed82c53 100644
--- a/ubuntu/maverick_automake/dependencies/arts/debian/libarts1-kde3-dev.install
+++ b/ubuntu/maverick_automake/dependencies/arts/debian/libarts1-kde3-dev.install
@@ -1,85 +1,85 @@
 debian/tmp/opt/kde3/bin/mcopidl
-debian/tmp/opt/kde3/include/kde/arts/anyref.h
-debian/tmp/opt/kde3/include/kde/arts/arts_export.h
-debian/tmp/opt/kde3/include/kde/arts/artsflow.h
-debian/tmp/opt/kde3/include/kde/arts/artsflow.idl
-debian/tmp/opt/kde3/include/kde/arts/artsversion.h
-debian/tmp/opt/kde3/include/kde/arts/asyncstream.h
-debian/tmp/opt/kde3/include/kde/arts/audioio.h
-debian/tmp/opt/kde3/include/kde/arts/audiosubsys.h
-debian/tmp/opt/kde3/include/kde/arts/buffer.h
-debian/tmp/opt/kde3/include/kde/arts/bufferqueue.h
-debian/tmp/opt/kde3/include/kde/arts/cache.h
-debian/tmp/opt/kde3/include/kde/arts/cachedwav.h
-debian/tmp/opt/kde3/include/kde/arts/common.h
-debian/tmp/opt/kde3/include/kde/arts/connect.h
-debian/tmp/opt/kde3/include/kde/arts/connection.h
-debian/tmp/opt/kde3/include/kde/arts/convert.h
-debian/tmp/opt/kde3/include/kde/arts/core.h
-debian/tmp/opt/kde3/include/kde/arts/core.idl
-debian/tmp/opt/kde3/include/kde/arts/cpuinfo.h
-debian/tmp/opt/kde3/include/kde/arts/datapacket.h
-debian/tmp/opt/kde3/include/kde/arts/debug.h
-debian/tmp/opt/kde3/include/kde/arts/delayedreturn.h
-debian/tmp/opt/kde3/include/kde/arts/dispatcher.h
-debian/tmp/opt/kde3/include/kde/arts/dynamicrequest.h
-debian/tmp/opt/kde3/include/kde/arts/dynamicskeleton.h
-debian/tmp/opt/kde3/include/kde/arts/extensionloader.h
-debian/tmp/opt/kde3/include/kde/arts/factory.h
-debian/tmp/opt/kde3/include/kde/arts/fft.h
-debian/tmp/opt/kde3/include/kde/arts/flowsystem.h
-debian/tmp/opt/kde3/include/kde/arts/giomanager.h
-debian/tmp/opt/kde3/include/kde/arts/gsl/gslcommon.h
-debian/tmp/opt/kde3/include/kde/arts/gsl/gslconfig.h
-debian/tmp/opt/kde3/include/kde/arts/gsl/gslconvert.h
-debian/tmp/opt/kde3/include/kde/arts/gsl/gsldatacache.h
-debian/tmp/opt/kde3/include/kde/arts/gsl/gsldatahandle-mad.h
-debian/tmp/opt/kde3/include/kde/arts/gsl/gsldatahandle-vorbis.h
-debian/tmp/opt/kde3/include/kde/arts/gsl/gsldatahandle.h
-debian/tmp/opt/kde3/include/kde/arts/gsl/gsldatautils.h
-debian/tmp/opt/kde3/include/kde/arts/gsl/gsldefs.h
-debian/tmp/opt/kde3/include/kde/arts/gsl/gslengine.h
-debian/tmp/opt/kde3/include/kde/arts/gsl/gslfft.h
-debian/tmp/opt/kde3/include/kde/arts/gsl/gslfilter.h
-debian/tmp/opt/kde3/include/kde/arts/gsl/gslieee754.h
-debian/tmp/opt/kde3/include/kde/arts/gsl/gslloader.h
-debian/tmp/opt/kde3/include/kde/arts/gsl/gslmagic.h
-debian/tmp/opt/kde3/include/kde/arts/gsl/gslmath.h
-debian/tmp/opt/kde3/include/kde/arts/gsl/gsloscillator.h
-debian/tmp/opt/kde3/include/kde/arts/gsl/gslosctable.h
-debian/tmp/opt/kde3/include/kde/arts/gsl/gslsignal.h
-debian/tmp/opt/kde3/include/kde/arts/gsl/gslwavechunk.h
-debian/tmp/opt/kde3/include/kde/arts/gsl/gslwaveosc.h
-debian/tmp/opt/kde3/include/kde/arts/gslschedule.h
-debian/tmp/opt/kde3/include/kde/arts/idlfilereg.h
-debian/tmp/opt/kde3/include/kde/arts/ifacerepo_impl.h
-debian/tmp/opt/kde3/include/kde/arts/iomanager.h
-debian/tmp/opt/kde3/include/kde/arts/kmedia2.h
-debian/tmp/opt/kde3/include/kde/arts/kmedia2.idl
-debian/tmp/opt/kde3/include/kde/arts/mcopconfig.h
-debian/tmp/opt/kde3/include/kde/arts/mcoputils.h
-debian/tmp/opt/kde3/include/kde/arts/notification.h
-debian/tmp/opt/kde3/include/kde/arts/object.h
-debian/tmp/opt/kde3/include/kde/arts/objectmanager.h
-debian/tmp/opt/kde3/include/kde/arts/pipebuffer.h
-debian/tmp/opt/kde3/include/kde/arts/pool.h
-debian/tmp/opt/kde3/include/kde/arts/qiomanager.h
-debian/tmp/opt/kde3/include/kde/arts/reference.h
-debian/tmp/opt/kde3/include/kde/arts/referenceclean.h
-debian/tmp/opt/kde3/include/kde/arts/resample.h
-debian/tmp/opt/kde3/include/kde/arts/socketconnection.h
-debian/tmp/opt/kde3/include/kde/arts/soundserver.h
-debian/tmp/opt/kde3/include/kde/arts/soundserver.idl
-debian/tmp/opt/kde3/include/kde/arts/startupmanager.h
-debian/tmp/opt/kde3/include/kde/arts/stdsynthmodule.h
-debian/tmp/opt/kde3/include/kde/arts/synthschedule.h
-debian/tmp/opt/kde3/include/kde/arts/tcpconnection.h
-debian/tmp/opt/kde3/include/kde/arts/tcpserver.h
-debian/tmp/opt/kde3/include/kde/arts/thread.h
-debian/tmp/opt/kde3/include/kde/arts/type.h
-debian/tmp/opt/kde3/include/kde/arts/unixconnection.h
-debian/tmp/opt/kde3/include/kde/arts/unixserver.h
-debian/tmp/opt/kde3/include/kde/arts/weakreference.h
+debian/tmp/opt/kde3/include/tde/arts/anyref.h
+debian/tmp/opt/kde3/include/tde/arts/arts_export.h
+debian/tmp/opt/kde3/include/tde/arts/artsflow.h
+debian/tmp/opt/kde3/include/tde/arts/artsflow.idl
+debian/tmp/opt/kde3/include/tde/arts/artsversion.h
+debian/tmp/opt/kde3/include/tde/arts/asyncstream.h
+debian/tmp/opt/kde3/include/tde/arts/audioio.h
+debian/tmp/opt/kde3/include/tde/arts/audiosubsys.h
+debian/tmp/opt/kde3/include/tde/arts/buffer.h
+debian/tmp/opt/kde3/include/tde/arts/bufferqueue.h
+debian/tmp/opt/kde3/include/tde/arts/cache.h
+debian/tmp/opt/kde3/include/tde/arts/cachedwav.h
+debian/tmp/opt/kde3/include/tde/arts/common.h
+debian/tmp/opt/kde3/include/tde/arts/connect.h
+debian/tmp/opt/kde3/include/tde/arts/connection.h
+debian/tmp/opt/kde3/include/tde/arts/convert.h
+debian/tmp/opt/kde3/include/tde/arts/core.h
+debian/tmp/opt/kde3/include/tde/arts/core.idl
+debian/tmp/opt/kde3/include/tde/arts/cpuinfo.h
+debian/tmp/opt/kde3/include/tde/arts/datapacket.h
+debian/tmp/opt/kde3/include/tde/arts/debug.h
+debian/tmp/opt/kde3/include/tde/arts/delayedreturn.h
+debian/tmp/opt/kde3/include/tde/arts/dispatcher.h
+debian/tmp/opt/kde3/include/tde/arts/dynamicrequest.h
+debian/tmp/opt/kde3/include/tde/arts/dynamicskeleton.h
+debian/tmp/opt/kde3/include/tde/arts/extensionloader.h
+debian/tmp/opt/kde3/include/tde/arts/factory.h
+debian/tmp/opt/kde3/include/tde/arts/fft.h
+debian/tmp/opt/kde3/include/tde/arts/flowsystem.h
+debian/tmp/opt/kde3/include/tde/arts/giomanager.h
+debian/tmp/opt/kde3/include/tde/arts/gsl/gslcommon.h
+debian/tmp/opt/kde3/include/tde/arts/gsl/gslconfig.h
+debian/tmp/opt/kde3/include/tde/arts/gsl/gslconvert.h
+debian/tmp/opt/kde3/include/tde/arts/gsl/gsldatacache.h
+debian/tmp/opt/kde3/include/tde/arts/gsl/gsldatahandle-mad.h
+debian/tmp/opt/kde3/include/tde/arts/gsl/gsldatahandle-vorbis.h
+debian/tmp/opt/kde3/include/tde/arts/gsl/gsldatahandle.h
+debian/tmp/opt/kde3/include/tde/arts/gsl/gsldatautils.h
+debian/tmp/opt/kde3/include/tde/arts/gsl/gsldefs.h
+debian/tmp/opt/kde3/include/tde/arts/gsl/gslengine.h
+debian/tmp/opt/kde3/include/tde/arts/gsl/gslfft.h
+debian/tmp/opt/kde3/include/tde/arts/gsl/gslfilter.h
+debian/tmp/opt/kde3/include/tde/arts/gsl/gslieee754.h
+debian/tmp/opt/kde3/include/tde/arts/gsl/gslloader.h
+debian/tmp/opt/kde3/include/tde/arts/gsl/gslmagic.h
+debian/tmp/opt/kde3/include/tde/arts/gsl/gslmath.h
+debian/tmp/opt/kde3/include/tde/arts/gsl/gsloscillator.h
+debian/tmp/opt/kde3/include/tde/arts/gsl/gslosctable.h
+debian/tmp/opt/kde3/include/tde/arts/gsl/gslsignal.h
+debian/tmp/opt/kde3/include/tde/arts/gsl/gslwavechunk.h
+debian/tmp/opt/kde3/include/tde/arts/gsl/gslwaveosc.h
+debian/tmp/opt/kde3/include/tde/arts/gslschedule.h
+debian/tmp/opt/kde3/include/tde/arts/idlfilereg.h
+debian/tmp/opt/kde3/include/tde/arts/ifacerepo_impl.h
+debian/tmp/opt/kde3/include/tde/arts/iomanager.h
+debian/tmp/opt/kde3/include/tde/arts/kmedia2.h
+debian/tmp/opt/kde3/include/tde/arts/kmedia2.idl
+debian/tmp/opt/kde3/include/tde/arts/mcopconfig.h
+debian/tmp/opt/kde3/include/tde/arts/mcoputils.h
+debian/tmp/opt/kde3/include/tde/arts/notification.h
+debian/tmp/opt/kde3/include/tde/arts/object.h
+debian/tmp/opt/kde3/include/tde/arts/objectmanager.h
+debian/tmp/opt/kde3/include/tde/arts/pipebuffer.h
+debian/tmp/opt/kde3/include/tde/arts/pool.h
+debian/tmp/opt/kde3/include/tde/arts/qiomanager.h
+debian/tmp/opt/kde3/include/tde/arts/reference.h
+debian/tmp/opt/kde3/include/tde/arts/referenceclean.h
+debian/tmp/opt/kde3/include/tde/arts/resample.h
+debian/tmp/opt/kde3/include/tde/arts/socketconnection.h
+debian/tmp/opt/kde3/include/tde/arts/soundserver.h
+debian/tmp/opt/kde3/include/tde/arts/soundserver.idl
+debian/tmp/opt/kde3/include/tde/arts/startupmanager.h
+debian/tmp/opt/kde3/include/tde/arts/stdsynthmodule.h
+debian/tmp/opt/kde3/include/tde/arts/synthschedule.h
+debian/tmp/opt/kde3/include/tde/arts/tcpconnection.h
+debian/tmp/opt/kde3/include/tde/arts/tcpserver.h
+debian/tmp/opt/kde3/include/tde/arts/thread.h
+debian/tmp/opt/kde3/include/tde/arts/type.h
+debian/tmp/opt/kde3/include/tde/arts/unixconnection.h
+debian/tmp/opt/kde3/include/tde/arts/unixserver.h
+debian/tmp/opt/kde3/include/tde/arts/weakreference.h
 debian/tmp/opt/kde3/lib/libartscbackend.a
 debian/tmp/opt/kde3/lib/libartscbackend.so
 debian/tmp/opt/kde3/lib/libartsdsp.a
diff --git a/ubuntu/maverick_automake/dependencies/arts/debian/libartsc0-kde3-dev.install b/ubuntu/maverick_automake/dependencies/arts/debian/libartsc0-kde3-dev.install
index b666dca4c..555afb521 100644
--- a/ubuntu/maverick_automake/dependencies/arts/debian/libartsc0-kde3-dev.install
+++ b/ubuntu/maverick_automake/dependencies/arts/debian/libartsc0-kde3-dev.install
@@ -1,6 +1,6 @@
 debian/tmp/opt/kde3/bin/artsc-config
-debian/tmp/opt/kde3/include/kde/artsc/artsc.h
-debian/tmp/opt/kde3/include/kde/artsc/artsc_export.h
+debian/tmp/opt/kde3/include/tde/artsc/artsc.h
+debian/tmp/opt/kde3/include/tde/artsc/artsc_export.h
 debian/tmp/opt/kde3/lib/libartsc.a
 debian/tmp/opt/kde3/lib/libartsc.la
 debian/tmp/opt/kde3/lib/libartsc.so
diff --git a/ubuntu/maverick_automake/dependencies/arts/debian/rules b/ubuntu/maverick_automake/dependencies/arts/debian/rules
index 4bd2d699f..40b5818aa 100755
--- a/ubuntu/maverick_automake/dependencies/arts/debian/rules
+++ b/ubuntu/maverick_automake/dependencies/arts/debian/rules
@@ -6,14 +6,14 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include debian/cdbs/debian-qt-kde.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
 
 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_SKIP_RPATH=OFF -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/kde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/kde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib"
+DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_SKIP_RPATH=OFF -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/tde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/tde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib"
 DEB_DH_STRIP_ARGS := --dbg-package=arts-kde3-dbg
 
 PACKAGES_WITH_LIBS := libarts1c2a-kde3 libartsc0-kde3
diff --git a/ubuntu/maverick_automake/dependencies/tqtinterface/debian/rules b/ubuntu/maverick_automake/dependencies/tqtinterface/debian/rules
index dadefb425..79f24ff9a 100755
--- a/ubuntu/maverick_automake/dependencies/tqtinterface/debian/rules
+++ b/ubuntu/maverick_automake/dependencies/tqtinterface/debian/rules
@@ -11,14 +11,14 @@ DEB_KDE_APIDOX := yes
 version=Debian Package $(DEB_VERSION)
 DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION)
 
-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
 
 cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
-DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/kde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/kde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib"
+DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_LIBRARY_PATH="/opt/kde3/lib" -DCMAKE_INCLUDE_PATH="/opt/kde3/include/tde" -DCMAKE_CXX_FLAGS="-I/opt/kde3/include/tde" -DCMAKE_LDFLAGS="-L/opt/kde3/lib"
 
 DEB_CONFIGURE_EXTRA_FLAGS := \
 	--enable-mitshm --with-alsa --enable-dnotify --enable-inotify \