diff options
Diffstat (limited to 'ubuntu/maverick_automake/kdeedu/debian')
6 files changed, 10 insertions, 10 deletions
diff --git a/ubuntu/maverick_automake/kdeedu/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdeedu/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/kdeedu/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/kdeedu/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/kdeedu/debian/kstars-kde3.install b/ubuntu/maverick_automake/kdeedu/debian/kstars-kde3.install index 2fe8d7878..ce3c1d777 100644 --- a/ubuntu/maverick_automake/kdeedu/debian/kstars-kde3.install +++ b/ubuntu/maverick_automake/kdeedu/debian/kstars-kde3.install @@ -1,7 +1,7 @@ etc/kde3/kstarsrc opt/kde3/bin/kstars -/opt/kde3/include/kde/kstarsinterface.h -/opt/kde3/include/kde/simclockinterface.h +/opt/kde3/include/tde/kstarsinterface.h +/opt/kde3/include/tde/simclockinterface.h /opt/kde3/share/applications/kde/kstars.desktop /opt/kde3/share/config.kcfg/kstars.kcfg /opt/kde3/share/doc/kde/HTML/en/kstars/common diff --git a/ubuntu/maverick_automake/kdeedu/debian/libkdeedu-dev-kde3.install b/ubuntu/maverick_automake/kdeedu/debian/libkdeedu-dev-kde3.install index e4c27b132..2010f69d7 100644 --- a/ubuntu/maverick_automake/kdeedu/debian/libkdeedu-dev-kde3.install +++ b/ubuntu/maverick_automake/kdeedu/debian/libkdeedu-dev-kde3.install @@ -1,4 +1,4 @@ -/opt/kde3/include/kde/libkdeedu +/opt/kde3/include/tde/libkdeedu opt/kde3/lib/libextdate.la opt/kde3/lib/libextdate.so opt/kde3/lib/libkdeeducore.la diff --git a/ubuntu/maverick_automake/kdeedu/debian/libkiten-dev-kde3.install b/ubuntu/maverick_automake/kdeedu/debian/libkiten-dev-kde3.install index 172b79ec4..e5d3b77e2 100644 --- a/ubuntu/maverick_automake/kdeedu/debian/libkiten-dev-kde3.install +++ b/ubuntu/maverick_automake/kdeedu/debian/libkiten-dev-kde3.install @@ -1,3 +1,3 @@ -/opt/kde3/include/kde/libkiten +/opt/kde3/include/tde/libkiten opt/kde3/lib/libkiten.la opt/kde3/lib/libkiten.so diff --git a/ubuntu/maverick_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/maverick_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdeedu/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/kdeedu/debian/rules b/ubuntu/maverick_automake/kdeedu/debian/rules index 42eadbc48..8d08807f7 100755 --- a/ubuntu/maverick_automake/kdeedu/debian/rules +++ b/ubuntu/maverick_automake/kdeedu/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 @@ -14,7 +14,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine DEB_DH_INSTALL_SOURCEDIR := $(DEB_DESTDIR) -DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --includedir="/opt/kde3/include/kde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info" +DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/kde3 --with-extra-libs=/opt/kde3/lib --includedir="/opt/kde3/include/tde" --mandir="/opt/kde3/share/man" --infodir="/opt/kde3/share/info" # Ensure that kig's python scripting built successfully. common-build-arch:: |