From 784405e8180ea3d82b9c983dc6980b395a10099b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 7 Feb 2012 13:25:53 -0600 Subject: Update Debian and Ubuntu packaging files for new TDE include directory name --- debian/lenny/tdenetwork/debian/cdbs/kde.mk | 2 +- .../lenny/tdenetwork/debian/kopete-trinity.install | 8 +- .../debian/patches/common/kubuntu_01_kdepot.diff | 6 +- debian/lenny/tdenetwork/debian/rules | 2 +- .../debian/tdenetwork-trinity-dev.install | 128 ++++++++++----------- 5 files changed, 73 insertions(+), 73 deletions(-) (limited to 'debian/lenny/tdenetwork') diff --git a/debian/lenny/tdenetwork/debian/cdbs/kde.mk b/debian/lenny/tdenetwork/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/debian/lenny/tdenetwork/debian/cdbs/kde.mk +++ b/debian/lenny/tdenetwork/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/debian/lenny/tdenetwork/debian/kopete-trinity.install b/debian/lenny/tdenetwork/debian/kopete-trinity.install index c4a342dc5..1901f005e 100644 --- a/debian/lenny/tdenetwork/debian/kopete-trinity.install +++ b/debian/lenny/tdenetwork/debian/kopete-trinity.install @@ -1,9 +1,9 @@ debian/tmp/opt/trinity/bin/kopete debian/tmp/opt/trinity/bin/kopete_latexconvert.sh -debian/tmp/opt/trinity/include/kde/kopete/kopetepicture.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteprefs.h -debian/tmp/opt/trinity/include/kde/kopete/ui/addressbooklinkwidget.h -debian/tmp/opt/trinity/include/kde/kopete/webcamwidget.h +debian/tmp/opt/trinity/include/tde/kopete/kopetepicture.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteprefs.h +debian/tmp/opt/trinity/include/tde/kopete/ui/addressbooklinkwidget.h +debian/tmp/opt/trinity/include/tde/kopete/webcamwidget.h debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-account-kconf_update debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-nameTracking-kconf_update debian/tmp/opt/trinity/lib/kconf_update_bin/kopete-pluginloader2-kconf_update diff --git a/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdenetwork/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/debian/lenny/tdenetwork/debian/rules b/debian/lenny/tdenetwork/debian/rules index 90babf808..71afe376c 100755 --- a/debian/lenny/tdenetwork/debian/rules +++ b/debian/lenny/tdenetwork/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/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 diff --git a/debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install b/debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install index cc69d4cba..4915aaa12 100644 --- a/debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install +++ b/debian/lenny/tdenetwork/debian/tdenetwork-trinity-dev.install @@ -1,66 +1,66 @@ -debian/tmp/opt/trinity/include/kde/kopete/kabcpersistence.h -debian/tmp/opt/trinity/include/kde/kopete/kopete_export.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteaccount.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteaccountmanager.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteaway.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteawayaction.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteawaydialog.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteblacklister.h -debian/tmp/opt/trinity/include/kde/kopete/kopetechatsession.h -debian/tmp/opt/trinity/include/kde/kopete/kopetechatsessionmanager.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecommandhandler.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecontact.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecontactlist.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecontactlistelement.h -debian/tmp/opt/trinity/include/kde/kopete/kopetecontactproperty.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteeventpresentation.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteglobal.h -debian/tmp/opt/trinity/include/kde/kopete/kopetegroup.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemessage.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemessageevent.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemessagehandler.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemessagehandlerchain.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemetacontact.h -debian/tmp/opt/trinity/include/kde/kopete/kopetemimetypehandler.h -debian/tmp/opt/trinity/include/kde/kopete/kopetenotifydataobject.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteonlinestatus.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteonlinestatusmanager.h -debian/tmp/opt/trinity/include/kde/kopete/kopetepassword.h -debian/tmp/opt/trinity/include/kde/kopete/kopetepasswordedaccount.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteplugin.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteprotocol.h -debian/tmp/opt/trinity/include/kde/kopete/kopetesimplemessagehandler.h -debian/tmp/opt/trinity/include/kde/kopete/kopetetask.h -debian/tmp/opt/trinity/include/kde/kopete/kopetetransfermanager.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteuiglobal.h -debian/tmp/opt/trinity/include/kde/kopete/kopeteversion.h -debian/tmp/opt/trinity/include/kde/kopete/managedconnectionaccount.h -debian/tmp/opt/trinity/include/kde/kopete/ui/accountselector.h -debian/tmp/opt/trinity/include/kde/kopete/ui/addcontactpage.h -debian/tmp/opt/trinity/include/kde/kopete/ui/addressbookselectordialog.h -debian/tmp/opt/trinity/include/kde/kopete/ui/addressbookselectorwidget.h -debian/tmp/opt/trinity/include/kde/kopete/ui/editaccountwidget.h -debian/tmp/opt/trinity/include/kde/kopete/ui/fileconfirmbase.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteawaydialogbase.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetecontactaction.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetefileconfirmdialog.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistview.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistviewitem.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetelistviewsearchline.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepassworddialog.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepasswordwidget.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetepasswordwidgetbase.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopetestdaction.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteview.h -debian/tmp/opt/trinity/include/kde/kopete/ui/kopeteviewplugin.h -debian/tmp/opt/trinity/include/kde/kopete/ui/userinfodialog.h -debian/tmp/opt/trinity/include/kde/rss/article.h -debian/tmp/opt/trinity/include/kde/rss/document.h -debian/tmp/opt/trinity/include/kde/rss/global.h -debian/tmp/opt/trinity/include/kde/rss/image.h -debian/tmp/opt/trinity/include/kde/rss/librss.h -debian/tmp/opt/trinity/include/kde/rss/loader.h -debian/tmp/opt/trinity/include/kde/rss/textinput.h +debian/tmp/opt/trinity/include/tde/kopete/kabcpersistence.h +debian/tmp/opt/trinity/include/tde/kopete/kopete_export.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteaccount.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteaccountmanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteaway.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteawayaction.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteawaydialog.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteblacklister.h +debian/tmp/opt/trinity/include/tde/kopete/kopetechatsession.h +debian/tmp/opt/trinity/include/tde/kopete/kopetechatsessionmanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecommandhandler.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecontact.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecontactlist.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecontactlistelement.h +debian/tmp/opt/trinity/include/tde/kopete/kopetecontactproperty.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteeventpresentation.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteglobal.h +debian/tmp/opt/trinity/include/tde/kopete/kopetegroup.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemessage.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemessageevent.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemessagehandler.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemessagehandlerchain.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemetacontact.h +debian/tmp/opt/trinity/include/tde/kopete/kopetemimetypehandler.h +debian/tmp/opt/trinity/include/tde/kopete/kopetenotifydataobject.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteonlinestatus.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteonlinestatusmanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopetepassword.h +debian/tmp/opt/trinity/include/tde/kopete/kopetepasswordedaccount.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteplugin.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteprotocol.h +debian/tmp/opt/trinity/include/tde/kopete/kopetesimplemessagehandler.h +debian/tmp/opt/trinity/include/tde/kopete/kopetetask.h +debian/tmp/opt/trinity/include/tde/kopete/kopetetransfermanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteuiglobal.h +debian/tmp/opt/trinity/include/tde/kopete/kopeteversion.h +debian/tmp/opt/trinity/include/tde/kopete/managedconnectionaccount.h +debian/tmp/opt/trinity/include/tde/kopete/ui/accountselector.h +debian/tmp/opt/trinity/include/tde/kopete/ui/addcontactpage.h +debian/tmp/opt/trinity/include/tde/kopete/ui/addressbookselectordialog.h +debian/tmp/opt/trinity/include/tde/kopete/ui/addressbookselectorwidget.h +debian/tmp/opt/trinity/include/tde/kopete/ui/editaccountwidget.h +debian/tmp/opt/trinity/include/tde/kopete/ui/fileconfirmbase.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteawaydialogbase.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetecontactaction.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetefileconfirmdialog.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistview.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistviewitem.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetelistviewsearchline.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepassworddialog.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepasswordwidget.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetepasswordwidgetbase.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopetestdaction.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteview.h +debian/tmp/opt/trinity/include/tde/kopete/ui/kopeteviewplugin.h +debian/tmp/opt/trinity/include/tde/kopete/ui/userinfodialog.h +debian/tmp/opt/trinity/include/tde/rss/article.h +debian/tmp/opt/trinity/include/tde/rss/document.h +debian/tmp/opt/trinity/include/tde/rss/global.h +debian/tmp/opt/trinity/include/tde/rss/image.h +debian/tmp/opt/trinity/include/tde/rss/librss.h +debian/tmp/opt/trinity/include/tde/rss/loader.h +debian/tmp/opt/trinity/include/tde/rss/textinput.h debian/tmp/opt/trinity/lib/libtdeinit_kdict.la debian/tmp/opt/trinity/lib/libtdeinit_ksirc.la debian/tmp/opt/trinity/lib/libkopete.la @@ -73,4 +73,4 @@ debian/tmp/opt/trinity/lib/libkopete_videodevice.la debian/tmp/opt/trinity/lib/libkopete_videodevice.so debian/tmp/opt/trinity/lib/librss.la debian/tmp/opt/trinity/lib/librss.so -debian/tmp/opt/trinity/include/kde/kopete/kopetepluginmanager.h +debian/tmp/opt/trinity/include/tde/kopete/kopetepluginmanager.h -- cgit v1.2.3