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

4 files changed, 62 insertions, 62 deletions

diff --git a/ubuntu/maverick_automake/kdebase/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdebase/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/kdebase/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/kdebase/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/kdebase/debian/kdebase-kde3-dev.install b/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3-dev.install
index b96074298..4b611029f 100644
--- a/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3-dev.install
+++ b/ubuntu/maverick_automake/kdebase/debian/kdebase-kde3-dev.install
@@ -1,42 +1,42 @@
-debian/tmp/opt/kde3/include/kde/kate/application.h
-debian/tmp/opt/kde3/include/kde/kate/documentmanager.h
-debian/tmp/opt/kde3/include/kde/kate/mainwindow.h
-debian/tmp/opt/kde3/include/kde/kate/pluginconfiginterfaceextension.h
-debian/tmp/opt/kde3/include/kde/kate/pluginconfiginterface.h
-debian/tmp/opt/kde3/include/kde/kate/plugin.h
-debian/tmp/opt/kde3/include/kde/kate/pluginmanager.h
-debian/tmp/opt/kde3/include/kde/kate/toolviewmanager.h
-debian/tmp/opt/kde3/include/kde/kate/utils/dockviewbase.h
-debian/tmp/opt/kde3/include/kde/kate/utils/listboxview.h
-debian/tmp/opt/kde3/include/kde/kate/utils/messageview.h
-debian/tmp/opt/kde3/include/kde/kate/viewmanager.h
-debian/tmp/opt/kde3/include/kde/KBackgroundIface.h
-debian/tmp/opt/kde3/include/kde/kcommondecoration.h
-debian/tmp/opt/kde3/include/kde/kdecorationfactory.h
-debian/tmp/opt/kde3/include/kde/kdecoration.h
-debian/tmp/opt/kde3/include/kde/kdecoration_p.h
-debian/tmp/opt/kde3/include/kde/kdecoration_plugins_p.h
-debian/tmp/opt/kde3/include/kde/KDesktopIface.h
-debian/tmp/opt/kde3/include/kde/kgreeterplugin.h
-debian/tmp/opt/kde3/include/kde/konqsidebarplugin.h
-debian/tmp/opt/kde3/include/kde/KonquerorIface.h
-debian/tmp/opt/kde3/include/kde/KScreensaverIface.h
-debian/tmp/opt/kde3/include/kde/ksgrd/HostConnector.h
-debian/tmp/opt/kde3/include/kde/ksgrd/SensorAgent.h
-debian/tmp/opt/kde3/include/kde/ksgrd/SensorClient.h
-debian/tmp/opt/kde3/include/kde/ksgrd/SensorManager.h
-debian/tmp/opt/kde3/include/kde/ksgrd/SensorShellAgent.h
-debian/tmp/opt/kde3/include/kde/ksgrd/SensorSocketAgent.h
-debian/tmp/opt/kde3/include/kde/ksgrd/StyleEngine.h
-debian/tmp/opt/kde3/include/kde/ksgrd/StyleSettings.h
-debian/tmp/opt/kde3/include/kde/ksgrd/TimerSettings.h
-debian/tmp/opt/kde3/include/kde/ksplash/objkstheme.h
-debian/tmp/opt/kde3/include/kde/ksplash/themeengine.h
-debian/tmp/opt/kde3/include/kde/kwin/client.h
-debian/tmp/opt/kde3/include/kde/KWinInterface.h
-debian/tmp/opt/kde3/include/kde/kwin/kwinbutton.h
-debian/tmp/opt/kde3/include/kde/kwin/options.h
-debian/tmp/opt/kde3/include/kde/kwin/workspace.h
+debian/tmp/opt/kde3/include/tde/kate/application.h
+debian/tmp/opt/kde3/include/tde/kate/documentmanager.h
+debian/tmp/opt/kde3/include/tde/kate/mainwindow.h
+debian/tmp/opt/kde3/include/tde/kate/pluginconfiginterfaceextension.h
+debian/tmp/opt/kde3/include/tde/kate/pluginconfiginterface.h
+debian/tmp/opt/kde3/include/tde/kate/plugin.h
+debian/tmp/opt/kde3/include/tde/kate/pluginmanager.h
+debian/tmp/opt/kde3/include/tde/kate/toolviewmanager.h
+debian/tmp/opt/kde3/include/tde/kate/utils/dockviewbase.h
+debian/tmp/opt/kde3/include/tde/kate/utils/listboxview.h
+debian/tmp/opt/kde3/include/tde/kate/utils/messageview.h
+debian/tmp/opt/kde3/include/tde/kate/viewmanager.h
+debian/tmp/opt/kde3/include/tde/KBackgroundIface.h
+debian/tmp/opt/kde3/include/tde/kcommondecoration.h
+debian/tmp/opt/kde3/include/tde/kdecorationfactory.h
+debian/tmp/opt/kde3/include/tde/kdecoration.h
+debian/tmp/opt/kde3/include/tde/kdecoration_p.h
+debian/tmp/opt/kde3/include/tde/kdecoration_plugins_p.h
+debian/tmp/opt/kde3/include/tde/KDesktopIface.h
+debian/tmp/opt/kde3/include/tde/kgreeterplugin.h
+debian/tmp/opt/kde3/include/tde/konqsidebarplugin.h
+debian/tmp/opt/kde3/include/tde/KonquerorIface.h
+debian/tmp/opt/kde3/include/tde/KScreensaverIface.h
+debian/tmp/opt/kde3/include/tde/ksgrd/HostConnector.h
+debian/tmp/opt/kde3/include/tde/ksgrd/SensorAgent.h
+debian/tmp/opt/kde3/include/tde/ksgrd/SensorClient.h
+debian/tmp/opt/kde3/include/tde/ksgrd/SensorManager.h
+debian/tmp/opt/kde3/include/tde/ksgrd/SensorShellAgent.h
+debian/tmp/opt/kde3/include/tde/ksgrd/SensorSocketAgent.h
+debian/tmp/opt/kde3/include/tde/ksgrd/StyleEngine.h
+debian/tmp/opt/kde3/include/tde/ksgrd/StyleSettings.h
+debian/tmp/opt/kde3/include/tde/ksgrd/TimerSettings.h
+debian/tmp/opt/kde3/include/tde/ksplash/objkstheme.h
+debian/tmp/opt/kde3/include/tde/ksplash/themeengine.h
+debian/tmp/opt/kde3/include/tde/kwin/client.h
+debian/tmp/opt/kde3/include/tde/KWinInterface.h
+debian/tmp/opt/kde3/include/tde/kwin/kwinbutton.h
+debian/tmp/opt/kde3/include/tde/kwin/options.h
+debian/tmp/opt/kde3/include/tde/kwin/workspace.h
 debian/tmp/opt/kde3/lib/libkasbar.la
 debian/tmp/opt/kde3/lib/libkasbar.so
 debian/tmp/opt/kde3/lib/libkateinterfaces.la
diff --git a/ubuntu/maverick_automake/kdebase/debian/libkonq4-kde3-dev.install b/ubuntu/maverick_automake/kdebase/debian/libkonq4-kde3-dev.install
index df661989e..0a992e7a3 100644
--- a/ubuntu/maverick_automake/kdebase/debian/libkonq4-kde3-dev.install
+++ b/ubuntu/maverick_automake/kdebase/debian/libkonq4-kde3-dev.install
@@ -1,23 +1,23 @@
-debian/tmp/opt/kde3/include/kde/kfileivi.h
-debian/tmp/opt/kde3/include/kde/kivdirectoryoverlay.h
-debian/tmp/opt/kde3/include/kde/knewmenu.h
-debian/tmp/opt/kde3/include/kde/konqbookmarkmanager.h
-debian/tmp/opt/kde3/include/kde/konq_defaults.h
-debian/tmp/opt/kde3/include/kde/konq_dirpart.h
-debian/tmp/opt/kde3/include/kde/konq_drag.h
-debian/tmp/opt/kde3/include/kde/konq_events.h
-debian/tmp/opt/kde3/include/kde/konq_faviconmgr.h
-debian/tmp/opt/kde3/include/kde/konq_filetip.h
-debian/tmp/opt/kde3/include/kde/konq_historycomm.h
-debian/tmp/opt/kde3/include/kde/konq_historymgr.h
-debian/tmp/opt/kde3/include/kde/konq_iconviewwidget.h
-debian/tmp/opt/kde3/include/kde/konq_operations.h
-debian/tmp/opt/kde3/include/kde/konq_pixmapprovider.h
-debian/tmp/opt/kde3/include/kde/konq_popupmenu.h
-debian/tmp/opt/kde3/include/kde/konq_propsview.h
-debian/tmp/opt/kde3/include/kde/konq_settings.h
-debian/tmp/opt/kde3/include/kde/konq_undo.h
-debian/tmp/opt/kde3/include/kde/konq_xmlguiclient.h
-debian/tmp/opt/kde3/include/kde/libkonq_export.h
+debian/tmp/opt/kde3/include/tde/kfileivi.h
+debian/tmp/opt/kde3/include/tde/kivdirectoryoverlay.h
+debian/tmp/opt/kde3/include/tde/knewmenu.h
+debian/tmp/opt/kde3/include/tde/konqbookmarkmanager.h
+debian/tmp/opt/kde3/include/tde/konq_defaults.h
+debian/tmp/opt/kde3/include/tde/konq_dirpart.h
+debian/tmp/opt/kde3/include/tde/konq_drag.h
+debian/tmp/opt/kde3/include/tde/konq_events.h
+debian/tmp/opt/kde3/include/tde/konq_faviconmgr.h
+debian/tmp/opt/kde3/include/tde/konq_filetip.h
+debian/tmp/opt/kde3/include/tde/konq_historycomm.h
+debian/tmp/opt/kde3/include/tde/konq_historymgr.h
+debian/tmp/opt/kde3/include/tde/konq_iconviewwidget.h
+debian/tmp/opt/kde3/include/tde/konq_operations.h
+debian/tmp/opt/kde3/include/tde/konq_pixmapprovider.h
+debian/tmp/opt/kde3/include/tde/konq_popupmenu.h
+debian/tmp/opt/kde3/include/tde/konq_propsview.h
+debian/tmp/opt/kde3/include/tde/konq_settings.h
+debian/tmp/opt/kde3/include/tde/konq_undo.h
+debian/tmp/opt/kde3/include/tde/konq_xmlguiclient.h
+debian/tmp/opt/kde3/include/tde/libkonq_export.h
 debian/tmp/opt/kde3/lib/libkonq.la
 debian/tmp/opt/kde3/lib/libkonq.so
diff --git a/ubuntu/maverick_automake/kdebase/debian/rules b/ubuntu/maverick_automake/kdebase/debian/rules
index 5451ff821..6a3938cba 100755
--- a/ubuntu/maverick_automake/kdebase/debian/rules
+++ b/ubuntu/maverick_automake/kdebase/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