From 784405e8180ea3d82b9c983dc6980b395a10099b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 7 Feb 2012 13:25:53 -0600
Subject: Update Debian and Ubuntu packaging files for new TDE include
 directory name

---
 ubuntu/maverick_automake/kdebindings/debian/cdbs/kde.mk             | 2 +-
 .../kdebindings/debian/libkjsembed-kde3-dev.install                 | 2 +-
 .../kdebindings/debian/libsmokeqt-kde3-dev.install                  | 2 +-
 .../kdebindings/debian/patches/common/kubuntu_01_kdepot.diff        | 6 +++---
 ubuntu/maverick_automake/kdebindings/debian/rules                   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'ubuntu/maverick_automake/kdebindings/debian')

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..e705cf83b 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"
@@ -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/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
-- 
cgit v1.2.1