diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-07 13:25:53 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-07 13:25:53 -0600 |
| commit | 784405e8180ea3d82b9c983dc6980b395a10099b (patch) | |
| tree | e2814c3397205246d9a29033088623f53565bef3 /ubuntu/maverick_automake/kdeadmin | |
| parent | f85e858c12e3b3b90e10a6f990c8688c1cb810ed (diff) | |
| download | tde-packaging-784405e8180ea3d82b9c983dc6980b395a10099b.tar.gz tde-packaging-784405e8180ea3d82b9c983dc6980b395a10099b.zip | |
Update Debian and Ubuntu packaging files for new TDE include directory name
Diffstat (limited to 'ubuntu/maverick_automake/kdeadmin')
3 files changed, 5 insertions, 5 deletions
diff --git a/ubuntu/maverick_automake/kdeadmin/debian/cdbs/kde.mk b/ubuntu/maverick_automake/kdeadmin/debian/cdbs/kde.mk index 9e4117558..21965ceef 100644 --- a/ubuntu/maverick_automake/kdeadmin/debian/cdbs/kde.mk +++ b/ubuntu/maverick_automake/kdeadmin/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/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff index 3d5dc7628..e705cf83b 100644 --- a/ubuntu/maverick_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdeadmin/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/kdeadmin/debian/rules b/ubuntu/maverick_automake/kdeadmin/debian/rules index 569175f46..079a2b2ed 100755 --- a/ubuntu/maverick_automake/kdeadmin/debian/rules +++ b/ubuntu/maverick_automake/kdeadmin/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 |