diff options
| author | Timothy Pearson <[email protected]> | 2012-02-07 13:25:53 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-02-07 13:25:53 -0600 |
| commit | 784405e8180ea3d82b9c983dc6980b395a10099b (patch) | |
| tree | e2814c3397205246d9a29033088623f53565bef3 /ubuntu/maverick/tdewebdev/debian | |
| 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/tdewebdev/debian')
4 files changed, 7 insertions, 7 deletions
diff --git a/ubuntu/maverick/tdewebdev/debian/cdbs/kde.mk b/ubuntu/maverick/tdewebdev/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdewebdev/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdewebdev/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/tdewebdev/debian/kommander-trinity-dev.install b/ubuntu/maverick/tdewebdev/debian/kommander-trinity-dev.install index 54d904432..8d8db707b 100644 --- a/ubuntu/maverick/tdewebdev/debian/kommander-trinity-dev.install +++ b/ubuntu/maverick/tdewebdev/debian/kommander-trinity-dev.install @@ -1,7 +1,7 @@ -debian/tmp/opt/trinity/include/kde/kommander* +debian/tmp/opt/trinity/include/tde/kommander* debian/tmp/opt/trinity/lib/libkommanderplugin.la debian/tmp/opt/trinity/lib/libkommanderplugin.so debian/tmp/opt/trinity/lib/libkommanderwidget.la debian/tmp/opt/trinity/lib/libkommanderwidget.so debian/tmp/opt/trinity/lib/libkommanderwidgets.so -debian/tmp/opt/trinity/include/kde/specials.h +debian/tmp/opt/trinity/include/tde/specials.h diff --git a/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff index 1f825f642..698deb926 100644 --- a/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/usr/include/kde/kde.pot ++kdepotpath=/usr/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/tdewebdev/debian/rules b/ubuntu/maverick/tdewebdev/debian/rules index 2dcf9658d..888f66bcf 100755 --- a/ubuntu/maverick/tdewebdev/debian/rules +++ b/ubuntu/maverick/tdewebdev/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/trinity/include/kde +DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde DEB_CONFIGURE_MANDIR := /opt/trinity/share/man DEB_CONFIGURE_PREFIX := /opt/trinity DEB_CONFIGURE_INFODIR := /opt/trinity/share/info |