summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick_automake/kdebindings
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/maverick_automake/kdebindings
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/maverick_automake/kdebindings')
-rw-r--r--ubuntu/maverick_automake/kdebindings/debian/cdbs/kde.mk2
-rw-r--r--ubuntu/maverick_automake/kdebindings/debian/libkjsembed-kde3-dev.install2
-rw-r--r--ubuntu/maverick_automake/kdebindings/debian/libsmokeqt-kde3-dev.install2
-rw-r--r--ubuntu/maverick_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff2
-rwxr-xr-xubuntu/maverick_automake/kdebindings/debian/rules2
5 files changed, 5 insertions, 5 deletions
diff --git a/ubuntu/maverick_automake/kdebindings/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdebindings/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/maverick_automake/kdebindings/debian/cdbs/kde.mk
+++ b/ubuntu/maverick_automake/kdebindings/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/kdebindings/debian/libkjsembed-kde3-dev.install b/ubuntu/maverick_automake/kdebindings/debian/libkjsembed-kde3-dev.install
index 464862e4b..46e0e8860 100644
--- a/ubuntu/maverick_automake/kdebindings/debian/libkjsembed-kde3-dev.install
+++ b/ubuntu/maverick_automake/kdebindings/debian/libkjsembed-kde3-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/opt/kde3/include/kde/kjsembed/*
+debian/tmp/opt/kde3/include/tde/kjsembed/*
debian/tmp/opt/kde3/lib/libkjsembed.so
debian/tmp/opt/kde3/lib/libkjsembed.la
diff --git a/ubuntu/maverick_automake/kdebindings/debian/libsmokeqt-kde3-dev.install b/ubuntu/maverick_automake/kdebindings/debian/libsmokeqt-kde3-dev.install
index c577f4705..2816b0725 100644
--- a/ubuntu/maverick_automake/kdebindings/debian/libsmokeqt-kde3-dev.install
+++ b/ubuntu/maverick_automake/kdebindings/debian/libsmokeqt-kde3-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/opt/kde3/include/kde/smoke.h
+debian/tmp/opt/kde3/include/tde/smoke.h
debian/tmp/opt/kde3/lib/libsmokeqt.so
debian/tmp/opt/kde3/lib/libsmokeqt.la
diff --git a/ubuntu/maverick_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff
index 3d5dc7628..b26f84af1 100644
--- a/ubuntu/maverick_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/maverick_automake/kdebindings/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/maverick_automake/kdebindings/debian/rules b/ubuntu/maverick_automake/kdebindings/debian/rules
index ef053cb4f..2c8f64002 100755
--- a/ubuntu/maverick_automake/kdebindings/debian/rules
+++ b/ubuntu/maverick_automake/kdebindings/debian/rules
@@ -11,7 +11,7 @@ DEB_BUILDDIR := $(DEB_SRCDIR)
include /usr/share/cdbs/1/rules/patchsys-quilt.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