summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/applications/koffice
diff options
context:
space:
mode:
authorPawel "l0ner" Soltys <pwslts@gmail.com>2012-02-07 20:37:58 +0100
committerPawel "l0ner" Soltys <pwslts@gmail.com>2012-02-07 20:37:58 +0100
commit413e1748b4f6634573311f24e9cce4ad099d9f15 (patch)
tree453a30388e10d148aa1f05c9dc1f89d6283e8dda /ubuntu/maverick/applications/koffice
parent79b18e9f0f943ca0c3a60e5c6a24a3a0d0afad5d (diff)
parent784405e8180ea3d82b9c983dc6980b395a10099b (diff)
downloadtde-packaging-413e1748b4f6634573311f24e9cce4ad099d9f15.tar.gz
tde-packaging-413e1748b4f6634573311f24e9cce4ad099d9f15.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/applications/koffice')
-rw-r--r--ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk2
-rw-r--r--ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install2
-rwxr-xr-xubuntu/maverick/applications/koffice/debian/rules2
3 files changed, 3 insertions, 3 deletions
diff --git a/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk b/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk
index 5b6508f8c..7842ef980 100644
--- a/ubuntu/maverick/applications/koffice/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/koffice/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/applications/koffice/debian/koffice-dev-trinity.install b/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install
index 936153c99..4b80b83ec 100644
--- a/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install
+++ b/ubuntu/maverick/applications/koffice/debian/koffice-dev-trinity.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/trinity/include/kde
+debian/tmp/opt/trinity/include/tde
debian/tmp/opt/trinity/lib/libkarboncommon.la
debian/tmp/opt/trinity/lib/libkarboncommon.so
debian/tmp/opt/trinity/lib/libkchartcommon.la
diff --git a/ubuntu/maverick/applications/koffice/debian/rules b/ubuntu/maverick/applications/koffice/debian/rules
index 9bc0b9c76..0c94bbdc9 100755
--- a/ubuntu/maverick/applications/koffice/debian/rules
+++ b/ubuntu/maverick/applications/koffice/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/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