summaryrefslogtreecommitdiffstats
path: root/ubuntu/lucid_automake/kdeutils/debian
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/lucid_automake/kdeutils/debian
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/lucid_automake/kdeutils/debian')
-rw-r--r--ubuntu/lucid_automake/kdeutils/debian/cdbs/kde.mk2
-rw-r--r--ubuntu/lucid_automake/kdeutils/debian/kdeutils-kde3-dev.install30
-rw-r--r--ubuntu/lucid_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff6
-rwxr-xr-xubuntu/lucid_automake/kdeutils/debian/rules2
4 files changed, 20 insertions, 20 deletions
diff --git a/ubuntu/lucid_automake/kdeutils/debian/cdbs/kde.mk b/ubuntu/lucid_automake/kdeutils/debian/cdbs/kde.mk
index 9e4117558..21965ceef 100644
--- a/ubuntu/lucid_automake/kdeutils/debian/cdbs/kde.mk
+++ b/ubuntu/lucid_automake/kdeutils/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/kdeutils/debian/kdeutils-kde3-dev.install b/ubuntu/lucid_automake/kdeutils/debian/kdeutils-kde3-dev.install
index 6c561c622..f7092a5fd 100644
--- a/ubuntu/lucid_automake/kdeutils/debian/kdeutils-kde3-dev.install
+++ b/ubuntu/lucid_automake/kdeutils/debian/kdeutils-kde3-dev.install
@@ -1,18 +1,18 @@
-debian/tmp/opt/kde3/include/kde/kmultiformlistbox.h
-debian/tmp/opt/kde3/include/kde/kmultiformlistboxentry.h
-debian/tmp/opt/kde3/include/kde/kmultiformlistboxfactory.h
-debian/tmp/opt/kde3/include/kde/ksim/chart.h
-debian/tmp/opt/kde3/include/kde/ksim/common.h
-debian/tmp/opt/kde3/include/kde/ksim/ksimconfig.h
-debian/tmp/opt/kde3/include/kde/ksim/label.h
-debian/tmp/opt/kde3/include/kde/ksim/led.h
-debian/tmp/opt/kde3/include/kde/ksim/pluginglobal.h
-debian/tmp/opt/kde3/include/kde/ksim/pluginloader.h
-debian/tmp/opt/kde3/include/kde/ksim/pluginmodule.h
-debian/tmp/opt/kde3/include/kde/ksim/progress.h
-debian/tmp/opt/kde3/include/kde/ksim/themeloader.h
-debian/tmp/opt/kde3/include/kde/ksim/themetypes.h
-debian/tmp/opt/kde3/include/kde/kwidgetstreamer.h
+debian/tmp/opt/kde3/include/tde/kmultiformlistbox.h
+debian/tmp/opt/kde3/include/tde/kmultiformlistboxentry.h
+debian/tmp/opt/kde3/include/tde/kmultiformlistboxfactory.h
+debian/tmp/opt/kde3/include/tde/ksim/chart.h
+debian/tmp/opt/kde3/include/tde/ksim/common.h
+debian/tmp/opt/kde3/include/tde/ksim/ksimconfig.h
+debian/tmp/opt/kde3/include/tde/ksim/label.h
+debian/tmp/opt/kde3/include/tde/ksim/led.h
+debian/tmp/opt/kde3/include/tde/ksim/pluginglobal.h
+debian/tmp/opt/kde3/include/tde/ksim/pluginloader.h
+debian/tmp/opt/kde3/include/tde/ksim/pluginmodule.h
+debian/tmp/opt/kde3/include/tde/ksim/progress.h
+debian/tmp/opt/kde3/include/tde/ksim/themeloader.h
+debian/tmp/opt/kde3/include/tde/ksim/themetypes.h
+debian/tmp/opt/kde3/include/tde/kwidgetstreamer.h
debian/tmp/opt/kde3/lib/libkcmlaptop.la
debian/tmp/opt/kde3/lib/libkcmlaptop.so
debian/tmp/opt/kde3/lib/libkdeinit_ark.la
diff --git a/ubuntu/lucid_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff
index 3d5dc7628..e705cf83b 100644
--- a/ubuntu/lucid_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff
+++ b/ubuntu/lucid_automake/kdeutils/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/kdeutils/debian/rules b/ubuntu/lucid_automake/kdeutils/debian/rules
index 658aea6bf..7cca0eada 100755
--- a/ubuntu/lucid_automake/kdeutils/debian/rules
+++ b/ubuntu/lucid_automake/kdeutils/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/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