summaryrefslogtreecommitdiffstats
path: root/ubuntu/lucid_automake/kdepim/debian
diff options
context:
space:
mode:
authorRobert Xu <robxu9@gmail.com>2012-02-21 19:27:13 -0500
committerRobert Xu <robxu9@gmail.com>2012-02-21 19:27:13 -0500
commit5d7b5e6defb05f81691d286d40f67260c4733d00 (patch)
treeb2bfcca86b05179cad334dc61c5609e54ac7674d /ubuntu/lucid_automake/kdepim/debian
parent580ce2082fe5054c9ad0e4f666cee9b4bfb2d0b6 (diff)
parenta14ac9de2f5843036c9f452f1188979fef17ae6d (diff)
downloadtde-packaging-5d7b5e6defb05f81691d286d40f67260c4733d00.tar.gz
tde-packaging-5d7b5e6defb05f81691d286d40f67260c4733d00.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/lucid_automake/kdepim/debian')
-rw-r--r--ubuntu/lucid_automake/kdepim/debian/cdbs/kde.mk2
-rw-r--r--ubuntu/lucid_automake/kdepim/debian/changelog2
-rw-r--r--ubuntu/lucid_automake/kdepim/debian/kdepim-kde3-dev.install28
-rw-r--r--ubuntu/lucid_automake/kdepim/debian/libindex0-kde3-dev.install2
-rw-r--r--ubuntu/lucid_automake/kdepim/debian/libkcal2-kde3-dev.install4
-rw-r--r--ubuntu/lucid_automake/kdepim/debian/libkdepim1-kde3-dev.install2
-rw-r--r--ubuntu/lucid_automake/kdepim/debian/libkgantt0-kde3-dev.install2
-rw-r--r--ubuntu/lucid_automake/kdepim/debian/libkleopatra1-kde3-dev.install6
-rw-r--r--ubuntu/lucid_automake/kdepim/debian/libkpimexchange1-kde3-dev.install4
-rw-r--r--ubuntu/lucid_automake/kdepim/debian/libksieve0-kde3-dev.install2
-rw-r--r--ubuntu/lucid_automake/kdepim/debian/libktnef1-kde3-dev.install2
-rw-r--r--ubuntu/lucid_automake/kdepim/debian/libmimelib1-kde3-dev.install2
-rw-r--r--ubuntu/lucid_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xubuntu/lucid_automake/kdepim/debian/rules2
14 files changed, 31 insertions, 31 deletions
diff --git a/ubuntu/lucid_automake/kdepim/debian/cdbs/kde.mk b/ubuntu/lucid_automake/kdepim/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/lucid_automake/kdepim/debian/cdbs/kde.mk
+++ b/ubuntu/lucid_automake/kdepim/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/kdepim/debian/changelog b/ubuntu/lucid_automake/kdepim/debian/changelog
index 01141c0ae..026234536 100644
--- a/ubuntu/lucid_automake/kdepim/debian/changelog
+++ b/ubuntu/lucid_automake/kdepim/debian/changelog
@@ -706,7 +706,7 @@ kdepim (4:3.5.6-0ubuntu3) feisty; urgency=low
- Activates networkstatus support for kmail (patch from SuSE)
* debian/control:
- New package networkstatus-dev
- * ./libkdepim1-dev.install: added /usr/include/kde/kpimprefs.h
+ * ./libkdepim1-dev.install: added /usr/include/tde/kpimprefs.h
-- Anthony Mercatante <tonio@ubuntu.com> Fri, 02 Feb 2007 15:37:42 +0100
diff --git a/ubuntu/lucid_automake/kdepim/debian/kdepim-kde3-dev.install b/ubuntu/lucid_automake/kdepim/debian/kdepim-kde3-dev.install
index daabf121f..a1511b996 100644
--- a/ubuntu/lucid_automake/kdepim/debian/kdepim-kde3-dev.install
+++ b/ubuntu/lucid_automake/kdepim/debian/kdepim-kde3-dev.install
@@ -1,16 +1,16 @@
-/opt/kde3/include/kde/KNotesAppIface.h
-/opt/kde3/include/kde/KNotesIface.h
-/opt/kde3/include/kde/akregator
-/opt/kde3/include/kde/calendar
-/opt/kde3/include/kde/kabc
-/opt/kde3/include/kde/kaddressbook
-/opt/kde3/include/kde/kmail
-/opt/kde3/include/kde/kmailIface.h
-/opt/kde3/include/kde/kmailicalIface.h
-/opt/kde3/include/kde/kmailpartIface.h
-/opt/kde3/include/kde/kontact
-/opt/kde3/include/kde/korganizer
-/opt/kde3/include/kde/kpilot
+/opt/kde3/include/tde/KNotesAppIface.h
+/opt/kde3/include/tde/KNotesIface.h
+/opt/kde3/include/tde/akregator
+/opt/kde3/include/tde/calendar
+/opt/kde3/include/tde/kabc
+/opt/kde3/include/tde/kaddressbook
+/opt/kde3/include/tde/kmail
+/opt/kde3/include/tde/kmailIface.h
+/opt/kde3/include/tde/kmailicalIface.h
+/opt/kde3/include/tde/kmailpartIface.h
+/opt/kde3/include/tde/kontact
+/opt/kde3/include/tde/korganizer
+/opt/kde3/include/tde/kpilot
/opt/kde3/lib/libkabckolab.la
/opt/kde3/lib/libkabckolab.so
/opt/kde3/lib/libkabcscalix.la
@@ -84,4 +84,4 @@
/opt/kde3/lib/libgwsoap.la
/opt/kde3/lib/libgwsoap.so
-/opt/kde3/include/kde/kpimprefs.h
+/opt/kde3/include/tde/kpimprefs.h
diff --git a/ubuntu/lucid_automake/kdepim/debian/libindex0-kde3-dev.install b/ubuntu/lucid_automake/kdepim/debian/libindex0-kde3-dev.install
index 7178aebcd..d12928992 100644
--- a/ubuntu/lucid_automake/kdepim/debian/libindex0-kde3-dev.install
+++ b/ubuntu/lucid_automake/kdepim/debian/libindex0-kde3-dev.install
@@ -1,4 +1,4 @@
/opt/kde3/bin/indexlib-config
-/opt/kde3/include/kde/index
+/opt/kde3/include/tde/index
/opt/kde3/lib/libindex.la
/opt/kde3/lib/libindex.so
diff --git a/ubuntu/lucid_automake/kdepim/debian/libkcal2-kde3-dev.install b/ubuntu/lucid_automake/kdepim/debian/libkcal2-kde3-dev.install
index ab75de0de..e31e5ec64 100644
--- a/ubuntu/lucid_automake/kdepim/debian/libkcal2-kde3-dev.install
+++ b/ubuntu/lucid_automake/kdepim/debian/libkcal2-kde3-dev.install
@@ -1,5 +1,5 @@
-/opt/kde3/include/kde/libemailfunctions/idmapper.h
-/opt/kde3/include/kde/libkcal
+/opt/kde3/include/tde/libemailfunctions/idmapper.h
+/opt/kde3/include/tde/libkcal
/opt/kde3/lib/libkcal.la
/opt/kde3/lib/libkcal.so
/opt/kde3/lib/libkcal_resourceremote.la
diff --git a/ubuntu/lucid_automake/kdepim/debian/libkdepim1-kde3-dev.install b/ubuntu/lucid_automake/kdepim/debian/libkdepim1-kde3-dev.install
index 59dcd3d31..b569474e6 100644
--- a/ubuntu/lucid_automake/kdepim/debian/libkdepim1-kde3-dev.install
+++ b/ubuntu/lucid_automake/kdepim/debian/libkdepim1-kde3-dev.install
@@ -1,3 +1,3 @@
-/opt/kde3/include/kde/kdepimmacros.h
+/opt/kde3/include/tde/kdepimmacros.h
/opt/kde3/lib/libkdepim.la
/opt/kde3/lib/libkdepim.so
diff --git a/ubuntu/lucid_automake/kdepim/debian/libkgantt0-kde3-dev.install b/ubuntu/lucid_automake/kdepim/debian/libkgantt0-kde3-dev.install
index aa3f140b6..e48e946aa 100644
--- a/ubuntu/lucid_automake/kdepim/debian/libkgantt0-kde3-dev.install
+++ b/ubuntu/lucid_automake/kdepim/debian/libkgantt0-kde3-dev.install
@@ -1,3 +1,3 @@
-/opt/kde3/include/kde/kgantt
+/opt/kde3/include/tde/kgantt
/opt/kde3/lib/libkgantt.la
/opt/kde3/lib/libkgantt.so
diff --git a/ubuntu/lucid_automake/kdepim/debian/libkleopatra1-kde3-dev.install b/ubuntu/lucid_automake/kdepim/debian/libkleopatra1-kde3-dev.install
index 9b59b31e8..879d897b9 100644
--- a/ubuntu/lucid_automake/kdepim/debian/libkleopatra1-kde3-dev.install
+++ b/ubuntu/lucid_automake/kdepim/debian/libkleopatra1-kde3-dev.install
@@ -1,6 +1,6 @@
-/opt/kde3/include/kde/gpgme++
-/opt/kde3/include/kde/kleo
-/opt/kde3/include/kde/qgpgme
+/opt/kde3/include/tde/gpgme++
+/opt/kde3/include/tde/kleo
+/opt/kde3/include/tde/qgpgme
/opt/kde3/lib/libgpgme++.la
/opt/kde3/lib/libgpgme++.so
/opt/kde3/lib/libkleopatra.la
diff --git a/ubuntu/lucid_automake/kdepim/debian/libkpimexchange1-kde3-dev.install b/ubuntu/lucid_automake/kdepim/debian/libkpimexchange1-kde3-dev.install
index cc80303d4..eb0e05ec0 100644
--- a/ubuntu/lucid_automake/kdepim/debian/libkpimexchange1-kde3-dev.install
+++ b/ubuntu/lucid_automake/kdepim/debian/libkpimexchange1-kde3-dev.install
@@ -1,4 +1,4 @@
-/opt/kde3/include/kde/kdepim/exchangeaccount.h
-/opt/kde3/include/kde/kdepim/exchangeclient.h
+/opt/kde3/include/tde/kdepim/exchangeaccount.h
+/opt/kde3/include/tde/kdepim/exchangeclient.h
/opt/kde3/lib/libkpimexchange.la
/opt/kde3/lib/libkpimexchange.so
diff --git a/ubuntu/lucid_automake/kdepim/debian/libksieve0-kde3-dev.install b/ubuntu/lucid_automake/kdepim/debian/libksieve0-kde3-dev.install
index ee25b7de7..97ca5ac36 100644
--- a/ubuntu/lucid_automake/kdepim/debian/libksieve0-kde3-dev.install
+++ b/ubuntu/lucid_automake/kdepim/debian/libksieve0-kde3-dev.install
@@ -1,3 +1,3 @@
-/opt/kde3/include/kde/ksieve
+/opt/kde3/include/tde/ksieve
/opt/kde3/lib/libksieve.la
/opt/kde3/lib/libksieve.so
diff --git a/ubuntu/lucid_automake/kdepim/debian/libktnef1-kde3-dev.install b/ubuntu/lucid_automake/kdepim/debian/libktnef1-kde3-dev.install
index b40b89af7..38eba15a5 100644
--- a/ubuntu/lucid_automake/kdepim/debian/libktnef1-kde3-dev.install
+++ b/ubuntu/lucid_automake/kdepim/debian/libktnef1-kde3-dev.install
@@ -1,3 +1,3 @@
-/opt/kde3/include/kde/ktnef
+/opt/kde3/include/tde/ktnef
/opt/kde3/lib/libktnef.la
/opt/kde3/lib/libktnef.so
diff --git a/ubuntu/lucid_automake/kdepim/debian/libmimelib1-kde3-dev.install b/ubuntu/lucid_automake/kdepim/debian/libmimelib1-kde3-dev.install
index 648201a0a..7bf3b93d1 100644
--- a/ubuntu/lucid_automake/kdepim/debian/libmimelib1-kde3-dev.install
+++ b/ubuntu/lucid_automake/kdepim/debian/libmimelib1-kde3-dev.install
@@ -1,3 +1,3 @@
-/opt/kde3/include/kde/mimelib
+/opt/kde3/include/tde/mimelib
/opt/kde3/lib/libmimelib.la
/opt/kde3/lib/libmimelib.so
diff --git a/ubuntu/lucid_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff
index 3d5dc7628..b26f84af1 100644
--- a/ubuntu/lucid_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/lucid_automake/kdepim/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"
diff --git a/ubuntu/lucid_automake/kdepim/debian/rules b/ubuntu/lucid_automake/kdepim/debian/rules
index 8fe5739ca..07e167879 100755
--- a/ubuntu/lucid_automake/kdepim/debian/rules
+++ b/ubuntu/lucid_automake/kdepim/debian/rules
@@ -8,7 +8,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