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

5 files changed, 73 insertions, 73 deletions

diff --git a/ubuntu/lucid_automake/kdenetwork/debian/cdbs/kde.mk b/ubuntu/lucid_automake/kdenetwork/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/lucid_automake/kdenetwork/debian/cdbs/kde.mk
+++ b/ubuntu/lucid_automake/kdenetwork/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/lucid_automake/kdenetwork/debian/kdenetwork-kde3-dev.install b/ubuntu/lucid_automake/kdenetwork/debian/kdenetwork-kde3-dev.install
index 4fe8b41d9..cefc34345 100644
--- a/ubuntu/lucid_automake/kdenetwork/debian/kdenetwork-kde3-dev.install
+++ b/ubuntu/lucid_automake/kdenetwork/debian/kdenetwork-kde3-dev.install
@@ -1,66 +1,66 @@
-debian/tmp/opt/kde3/include/kde/kopete/kabcpersistence.h
-debian/tmp/opt/kde3/include/kde/kopete/kopete_export.h
-debian/tmp/opt/kde3/include/kde/kopete/kopeteaccount.h
-debian/tmp/opt/kde3/include/kde/kopete/kopeteaccountmanager.h
-debian/tmp/opt/kde3/include/kde/kopete/kopeteaway.h
-debian/tmp/opt/kde3/include/kde/kopete/kopeteawayaction.h
-debian/tmp/opt/kde3/include/kde/kopete/kopeteawaydialog.h
-debian/tmp/opt/kde3/include/kde/kopete/kopeteblacklister.h
-debian/tmp/opt/kde3/include/kde/kopete/kopetechatsession.h
-debian/tmp/opt/kde3/include/kde/kopete/kopetechatsessionmanager.h
-debian/tmp/opt/kde3/include/kde/kopete/kopetecommandhandler.h
-debian/tmp/opt/kde3/include/kde/kopete/kopetecontact.h
-debian/tmp/opt/kde3/include/kde/kopete/kopetecontactlist.h
-debian/tmp/opt/kde3/include/kde/kopete/kopetecontactlistelement.h
-debian/tmp/opt/kde3/include/kde/kopete/kopetecontactproperty.h
-debian/tmp/opt/kde3/include/kde/kopete/kopeteeventpresentation.h
-debian/tmp/opt/kde3/include/kde/kopete/kopeteglobal.h
-debian/tmp/opt/kde3/include/kde/kopete/kopetegroup.h
-debian/tmp/opt/kde3/include/kde/kopete/kopetemessage.h
-debian/tmp/opt/kde3/include/kde/kopete/kopetemessageevent.h
-debian/tmp/opt/kde3/include/kde/kopete/kopetemessagehandler.h
-debian/tmp/opt/kde3/include/kde/kopete/kopetemessagehandlerchain.h
-debian/tmp/opt/kde3/include/kde/kopete/kopetemetacontact.h
-debian/tmp/opt/kde3/include/kde/kopete/kopetemimetypehandler.h
-debian/tmp/opt/kde3/include/kde/kopete/kopetenotifydataobject.h
-debian/tmp/opt/kde3/include/kde/kopete/kopeteonlinestatus.h
-debian/tmp/opt/kde3/include/kde/kopete/kopeteonlinestatusmanager.h
-debian/tmp/opt/kde3/include/kde/kopete/kopetepassword.h
-debian/tmp/opt/kde3/include/kde/kopete/kopetepasswordedaccount.h
-debian/tmp/opt/kde3/include/kde/kopete/kopeteplugin.h
-debian/tmp/opt/kde3/include/kde/kopete/kopeteprotocol.h
-debian/tmp/opt/kde3/include/kde/kopete/kopetesimplemessagehandler.h
-debian/tmp/opt/kde3/include/kde/kopete/kopetetask.h
-debian/tmp/opt/kde3/include/kde/kopete/kopetetransfermanager.h
-debian/tmp/opt/kde3/include/kde/kopete/kopeteuiglobal.h
-debian/tmp/opt/kde3/include/kde/kopete/kopeteversion.h
-debian/tmp/opt/kde3/include/kde/kopete/managedconnectionaccount.h
-debian/tmp/opt/kde3/include/kde/kopete/ui/accountselector.h
-debian/tmp/opt/kde3/include/kde/kopete/ui/addcontactpage.h
-debian/tmp/opt/kde3/include/kde/kopete/ui/addressbookselectordialog.h
-debian/tmp/opt/kde3/include/kde/kopete/ui/addressbookselectorwidget.h
-debian/tmp/opt/kde3/include/kde/kopete/ui/editaccountwidget.h
-debian/tmp/opt/kde3/include/kde/kopete/ui/fileconfirmbase.h
-debian/tmp/opt/kde3/include/kde/kopete/ui/kopeteawaydialogbase.h
-debian/tmp/opt/kde3/include/kde/kopete/ui/kopetecontactaction.h
-debian/tmp/opt/kde3/include/kde/kopete/ui/kopetefileconfirmdialog.h
-debian/tmp/opt/kde3/include/kde/kopete/ui/kopetelistview.h
-debian/tmp/opt/kde3/include/kde/kopete/ui/kopetelistviewitem.h
-debian/tmp/opt/kde3/include/kde/kopete/ui/kopetelistviewsearchline.h
-debian/tmp/opt/kde3/include/kde/kopete/ui/kopetepassworddialog.h
-debian/tmp/opt/kde3/include/kde/kopete/ui/kopetepasswordwidget.h
-debian/tmp/opt/kde3/include/kde/kopete/ui/kopetepasswordwidgetbase.h
-debian/tmp/opt/kde3/include/kde/kopete/ui/kopetestdaction.h
-debian/tmp/opt/kde3/include/kde/kopete/ui/kopeteview.h
-debian/tmp/opt/kde3/include/kde/kopete/ui/kopeteviewplugin.h
-debian/tmp/opt/kde3/include/kde/kopete/ui/userinfodialog.h
-debian/tmp/opt/kde3/include/kde/rss/article.h
-debian/tmp/opt/kde3/include/kde/rss/document.h
-debian/tmp/opt/kde3/include/kde/rss/global.h
-debian/tmp/opt/kde3/include/kde/rss/image.h
-debian/tmp/opt/kde3/include/kde/rss/librss.h
-debian/tmp/opt/kde3/include/kde/rss/loader.h
-debian/tmp/opt/kde3/include/kde/rss/textinput.h
+debian/tmp/opt/kde3/include/tde/kopete/kabcpersistence.h
+debian/tmp/opt/kde3/include/tde/kopete/kopete_export.h
+debian/tmp/opt/kde3/include/tde/kopete/kopeteaccount.h
+debian/tmp/opt/kde3/include/tde/kopete/kopeteaccountmanager.h
+debian/tmp/opt/kde3/include/tde/kopete/kopeteaway.h
+debian/tmp/opt/kde3/include/tde/kopete/kopeteawayaction.h
+debian/tmp/opt/kde3/include/tde/kopete/kopeteawaydialog.h
+debian/tmp/opt/kde3/include/tde/kopete/kopeteblacklister.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetechatsession.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetechatsessionmanager.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetecommandhandler.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetecontact.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetecontactlist.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetecontactlistelement.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetecontactproperty.h
+debian/tmp/opt/kde3/include/tde/kopete/kopeteeventpresentation.h
+debian/tmp/opt/kde3/include/tde/kopete/kopeteglobal.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetegroup.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetemessage.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetemessageevent.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetemessagehandler.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetemessagehandlerchain.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetemetacontact.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetemimetypehandler.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetenotifydataobject.h
+debian/tmp/opt/kde3/include/tde/kopete/kopeteonlinestatus.h
+debian/tmp/opt/kde3/include/tde/kopete/kopeteonlinestatusmanager.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetepassword.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetepasswordedaccount.h
+debian/tmp/opt/kde3/include/tde/kopete/kopeteplugin.h
+debian/tmp/opt/kde3/include/tde/kopete/kopeteprotocol.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetesimplemessagehandler.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetetask.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetetransfermanager.h
+debian/tmp/opt/kde3/include/tde/kopete/kopeteuiglobal.h
+debian/tmp/opt/kde3/include/tde/kopete/kopeteversion.h
+debian/tmp/opt/kde3/include/tde/kopete/managedconnectionaccount.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/accountselector.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/addcontactpage.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/addressbookselectordialog.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/addressbookselectorwidget.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/editaccountwidget.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/fileconfirmbase.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/kopeteawaydialogbase.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/kopetecontactaction.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/kopetefileconfirmdialog.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/kopetelistview.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/kopetelistviewitem.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/kopetelistviewsearchline.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/kopetepassworddialog.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/kopetepasswordwidget.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/kopetepasswordwidgetbase.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/kopetestdaction.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/kopeteview.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/kopeteviewplugin.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/userinfodialog.h
+debian/tmp/opt/kde3/include/tde/rss/article.h
+debian/tmp/opt/kde3/include/tde/rss/document.h
+debian/tmp/opt/kde3/include/tde/rss/global.h
+debian/tmp/opt/kde3/include/tde/rss/image.h
+debian/tmp/opt/kde3/include/tde/rss/librss.h
+debian/tmp/opt/kde3/include/tde/rss/loader.h
+debian/tmp/opt/kde3/include/tde/rss/textinput.h
 debian/tmp/opt/kde3/lib/libkdeinit_kdict.la
 debian/tmp/opt/kde3/lib/libkdeinit_ksirc.la
 debian/tmp/opt/kde3/lib/libkopete.la
@@ -73,4 +73,4 @@ debian/tmp/opt/kde3/lib/libkopete_videodevice.la
 debian/tmp/opt/kde3/lib/libkopete_videodevice.so
 debian/tmp/opt/kde3/lib/librss.la
 debian/tmp/opt/kde3/lib/librss.so
-debian/tmp/opt/kde3/include/kde/kopete/kopetepluginmanager.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetepluginmanager.h
diff --git a/ubuntu/lucid_automake/kdenetwork/debian/kopete-kde3.install b/ubuntu/lucid_automake/kdenetwork/debian/kopete-kde3.install
index 3d90f7d98..b3ed39ab3 100644
--- a/ubuntu/lucid_automake/kdenetwork/debian/kopete-kde3.install
+++ b/ubuntu/lucid_automake/kdenetwork/debian/kopete-kde3.install
@@ -1,9 +1,9 @@
 debian/tmp/opt/kde3/bin/kopete
 debian/tmp/opt/kde3/bin/kopete_latexconvert.sh
-debian/tmp/opt/kde3/include/kde/kopete/kopetepicture.h
-debian/tmp/opt/kde3/include/kde/kopete/kopeteprefs.h
-debian/tmp/opt/kde3/include/kde/kopete/ui/addressbooklinkwidget.h
-debian/tmp/opt/kde3/include/kde/kopete/webcamwidget.h
+debian/tmp/opt/kde3/include/tde/kopete/kopetepicture.h
+debian/tmp/opt/kde3/include/tde/kopete/kopeteprefs.h
+debian/tmp/opt/kde3/include/tde/kopete/ui/addressbooklinkwidget.h
+debian/tmp/opt/kde3/include/tde/kopete/webcamwidget.h
 debian/tmp/opt/kde3/lib/kconf_update_bin/kopete-account-kconf_update
 debian/tmp/opt/kde3/lib/kconf_update_bin/kopete-nameTracking-kconf_update
 debian/tmp/opt/kde3/lib/kconf_update_bin/kopete-pluginloader2-kconf_update
diff --git a/ubuntu/lucid_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
index 3d5dc7628..e705cf83b 100644
--- a/ubuntu/lucid_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/lucid_automake/kdenetwork/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/lucid_automake/kdenetwork/debian/rules b/ubuntu/lucid_automake/kdenetwork/debian/rules
index f28dd880c..3f1d50b69 100755
--- a/ubuntu/lucid_automake/kdenetwork/debian/rules
+++ b/ubuntu/lucid_automake/kdenetwork/debian/rules
@@ -17,7 +17,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