diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-09-29 23:57:37 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-09-29 23:57:37 +0200 |
| commit | f7aa0df3f50f1c79fe6629670e96a8763be886f7 (patch) | |
| tree | 873e53d3cf46aa5cbd6ad08cfab9dcfc460209b1 /debian | |
| parent | 037141d3e4d940052f2a21036b42567f63c845e7 (diff) | |
| parent | 167a4bbc63e8ed41a2a241946f6cefcd234c2e7d (diff) | |
| download | tde-packaging-f7aa0df3f50f1c79fe6629670e96a8763be886f7.tar.gz tde-packaging-f7aa0df3f50f1c79fe6629670e96a8763be886f7.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'debian')
30 files changed, 146 insertions, 146 deletions
diff --git a/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff index ebdf4630a..696f9093c 100644 --- a/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -5,7 +5,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/usr/include/tde/kde.pot ++kdepotpath=/usr/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -14,7 +14,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot if ! test -f $kdepotpath; then - kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot + kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot fi diff --git a/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeaccessibility/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeadmin/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdebindings/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeedu/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdegames/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdegraphics/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdemultimedia/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdenetwork/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdesdk/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdetoys/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeutils/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdevelop/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff index 47aee4140..28c95742b 100644 --- a/debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/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/tde/kde.pot ++kdepotpath=/usr/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff index ebdf4630a..696f9093c 100644 --- a/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -5,7 +5,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi export EXTRACTRC PREPARETIPS -+kdepotpath=/usr/include/tde/kde.pot ++kdepotpath=/usr/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -14,7 +14,7 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot if ! test -f $kdepotpath; then - kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot + kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot fi diff --git a/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeaccessibility/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeadmin/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdebindings/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeedu/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdegames/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdegraphics/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdemultimedia/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdenetwork/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdesdk/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdetoys/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeutils/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff index 20ad1b0b7..39dd7745e 100644 --- a/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdevelop/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/tde/kde.pot ++kdepotpath=/opt/trinity/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff index 47aee4140..28c95742b 100644 --- a/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/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/tde/kde.pot ++kdepotpath=/usr/include/tde/tde.pot + for subdir in $dirs; do test -z "$VERBOSE" || echo "Making messages in $subdir" @@ -13,13 +13,13 @@ fi perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile -- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot - fi -+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ |