diff options
| author | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-07 20:37:58 +0100 |
|---|---|---|
| committer | Pawel "l0ner" Soltys <pwslts@gmail.com> | 2012-02-07 20:37:58 +0100 |
| commit | 413e1748b4f6634573311f24e9cce4ad099d9f15 (patch) | |
| tree | 453a30388e10d148aa1f05c9dc1f89d6283e8dda /ubuntu/maverick/tdeaddons/debian | |
| parent | 79b18e9f0f943ca0c3a60e5c6a24a3a0d0afad5d (diff) | |
| parent | 784405e8180ea3d82b9c983dc6980b395a10099b (diff) | |
| download | tde-packaging-413e1748b4f6634573311f24e9cce4ad099d9f15.tar.gz tde-packaging-413e1748b4f6634573311f24e9cce4ad099d9f15.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/tdeaddons/debian')
| -rw-r--r-- | ubuntu/maverick/tdeaddons/debian/cdbs/kde.mk | 2 | ||||
| -rw-r--r-- | ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff | 6 | ||||
| -rwxr-xr-x | ubuntu/maverick/tdeaddons/debian/rules | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ubuntu/maverick/tdeaddons/debian/cdbs/kde.mk b/ubuntu/maverick/tdeaddons/debian/cdbs/kde.mk index 5b6508f8c..7842ef980 100644 --- a/ubuntu/maverick/tdeaddons/debian/cdbs/kde.mk +++ b/ubuntu/maverick/tdeaddons/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/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff index 0caf5361a..c02687784 100644 --- a/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff @@ -4,7 +4,7 @@ if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/opt/trinity/include/kde/kde.pot ++kdepotpath=/opt/trinity/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/tdeaddons/debian/rules b/ubuntu/maverick/tdeaddons/debian/rules index c872980f3..5d337bfab 100755 --- a/ubuntu/maverick/tdeaddons/debian/rules +++ b/ubuntu/maverick/tdeaddons/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 |