diff options
Diffstat (limited to 'debian')
40 files changed, 126 insertions, 126 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 de663438c..ebdf4630a 100644 --- a/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/debian/lenny/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot if ! test -f $kdepotpath; then - kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot + kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot fi diff --git a/debian/lenny/libraries/pytdeextensions/debian/changelog b/debian/lenny/libraries/pytdeextensions/debian/changelog index 4f1eb90be..119a3e420 100644 --- a/debian/lenny/libraries/pytdeextensions/debian/changelog +++ b/debian/lenny/libraries/pytdeextensions/debian/changelog @@ -100,7 +100,7 @@ pytdeextensions (0.4.0-3) unstable; urgency=low * Added pycompat and pyversions * Force to use python2.4 (Closes: #375618) * Added to Build-Depends: python-support, python-all-dev, - tdelibs4c2a (for kde-config) + tdelibs4c2a (for tde-config) * Updated libpythonize0-dev, libpythonize0, and pytdextensions install files * Cleaned up rules * Added 12_force_python2.4_script.diff to force python2.4 in scripts 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 e154eb334..20ad1b0b7 100644 --- a/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdegames/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/lenny/tdelibs/debian/changelog b/debian/lenny/tdelibs/debian/changelog index dd416c496..d75004323 100644 --- a/debian/lenny/tdelibs/debian/changelog +++ b/debian/lenny/tdelibs/debian/changelog @@ -2083,7 +2083,7 @@ tdelibs (4:3.4.0-0pre5) alioth; urgency=low page. (Closes: #257588). * [cdbs/kde.mk] Use escaped variables in the definitions of kde_htmldir and - the like instead of absolute paths, so that /usr/bin/kde-config doesn't + the like instead of absolute paths, so that /usr/bin/tde-config doesn't output them expanded even when --expandvars is not used. (Closes: #287822) * Fixed the ability of the build system to find kde.pot, even when it is not diff --git a/debian/lenny/tdelibs/debian/man/kde-config-trinity.sgml b/debian/lenny/tdelibs/debian/man/tde-config-trinity.sgml index 7be0ec30c..9e1fa9b3d 100644 --- a/debian/lenny/tdelibs/debian/man/kde-config-trinity.sgml +++ b/debian/lenny/tdelibs/debian/man/tde-config-trinity.sgml @@ -27,7 +27,7 @@ manpage.1: manpage.sgml <!ENTITY dhemail "<email>ccheney@debian.org</email>"> <!ENTITY dhusername "Chris Cheney"> <!ENTITY dhucpackage "<refentrytitle>KDE-CONFIG</refentrytitle>"> - <!ENTITY dhpackage "kde-config"> + <!ENTITY dhpackage "tde-config"> <!ENTITY debian "<productname>Debian</productname>"> <!ENTITY gnu "<acronym>GNU</acronym>"> diff --git a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install index 3887f606d..46340c78b 100644 --- a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install +++ b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.install @@ -18,7 +18,7 @@ debian/tmp/opt/trinity/bin/kaddprinterwizard debian/tmp/opt/trinity/bin/kbuildsycoca debian/tmp/opt/trinity/bin/kconf_update debian/tmp/opt/trinity/bin/kcookiejar -debian/tmp/opt/trinity/bin/kde-config +debian/tmp/opt/trinity/bin/tde-config debian/tmp/opt/trinity/bin/kded debian/tmp/opt/trinity/bin/tdeinit debian/tmp/opt/trinity/bin/tdeinit_shutdown diff --git a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.manpages b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.manpages index 00ed3a04e..ef5a28c2f 100644 --- a/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.manpages +++ b/debian/lenny/tdelibs/debian/tdelibs4c2a-trinity.manpages @@ -8,7 +8,7 @@ debian/man/out/kaddprinterwizard-trinity.1 debian/man/out/kbuildsycoca-trinity.1 debian/man/out/kconf_update-trinity.1 debian/man/out/kcookiejar-trinity.1 -debian/man/out/kde-config-trinity.1 +debian/man/out/tde-config-trinity.1 debian/man/out/kded-trinity.1 debian/man/out/kdontchangethehostname-trinity.1 debian/man/out/kfile-trinity.1 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 e154eb334..20ad1b0b7 100644 --- a/debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 aca9df12a..47aee4140 100644 --- a/debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/lenny/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 de663438c..ebdf4630a 100644 --- a/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/debian/squeeze/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot if ! test -f $kdepotpath; then - kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot + kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot fi diff --git a/debian/squeeze/libraries/pytdeextensions/debian/changelog b/debian/squeeze/libraries/pytdeextensions/debian/changelog index 4f1eb90be..119a3e420 100644 --- a/debian/squeeze/libraries/pytdeextensions/debian/changelog +++ b/debian/squeeze/libraries/pytdeextensions/debian/changelog @@ -100,7 +100,7 @@ pytdeextensions (0.4.0-3) unstable; urgency=low * Added pycompat and pyversions * Force to use python2.4 (Closes: #375618) * Added to Build-Depends: python-support, python-all-dev, - tdelibs4c2a (for kde-config) + tdelibs4c2a (for tde-config) * Updated libpythonize0-dev, libpythonize0, and pytdextensions install files * Cleaned up rules * Added 12_force_python2.4_script.diff to force python2.4 in scripts 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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdegames/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/debian/squeeze/tdelibs/debian/changelog b/debian/squeeze/tdelibs/debian/changelog index dd416c496..d75004323 100644 --- a/debian/squeeze/tdelibs/debian/changelog +++ b/debian/squeeze/tdelibs/debian/changelog @@ -2083,7 +2083,7 @@ tdelibs (4:3.4.0-0pre5) alioth; urgency=low page. (Closes: #257588). * [cdbs/kde.mk] Use escaped variables in the definitions of kde_htmldir and - the like instead of absolute paths, so that /usr/bin/kde-config doesn't + the like instead of absolute paths, so that /usr/bin/tde-config doesn't output them expanded even when --expandvars is not used. (Closes: #287822) * Fixed the ability of the build system to find kde.pot, even when it is not diff --git a/debian/squeeze/tdelibs/debian/man/kde-config-trinity.sgml b/debian/squeeze/tdelibs/debian/man/tde-config-trinity.sgml index 7be0ec30c..9e1fa9b3d 100644 --- a/debian/squeeze/tdelibs/debian/man/kde-config-trinity.sgml +++ b/debian/squeeze/tdelibs/debian/man/tde-config-trinity.sgml @@ -27,7 +27,7 @@ manpage.1: manpage.sgml <!ENTITY dhemail "<email>ccheney@debian.org</email>"> <!ENTITY dhusername "Chris Cheney"> <!ENTITY dhucpackage "<refentrytitle>KDE-CONFIG</refentrytitle>"> - <!ENTITY dhpackage "kde-config"> + <!ENTITY dhpackage "tde-config"> <!ENTITY debian "<productname>Debian</productname>"> <!ENTITY gnu "<acronym>GNU</acronym>"> diff --git a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install index 3887f606d..46340c78b 100644 --- a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install +++ b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.install @@ -18,7 +18,7 @@ debian/tmp/opt/trinity/bin/kaddprinterwizard debian/tmp/opt/trinity/bin/kbuildsycoca debian/tmp/opt/trinity/bin/kconf_update debian/tmp/opt/trinity/bin/kcookiejar -debian/tmp/opt/trinity/bin/kde-config +debian/tmp/opt/trinity/bin/tde-config debian/tmp/opt/trinity/bin/kded debian/tmp/opt/trinity/bin/tdeinit debian/tmp/opt/trinity/bin/tdeinit_shutdown diff --git a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.manpages b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.manpages index 00ed3a04e..ef5a28c2f 100644 --- a/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.manpages +++ b/debian/squeeze/tdelibs/debian/tdelibs4c2a-trinity.manpages @@ -8,7 +8,7 @@ debian/man/out/kaddprinterwizard-trinity.1 debian/man/out/kbuildsycoca-trinity.1 debian/man/out/kconf_update-trinity.1 debian/man/out/kcookiejar-trinity.1 -debian/man/out/kde-config-trinity.1 +debian/man/out/tde-config-trinity.1 debian/man/out/kded-trinity.1 debian/man/out/kdontchangethehostname-trinity.1 debian/man/out/kfile-trinity.1 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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 e154eb334..20ad1b0b7 100644 --- a/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.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 aca9df12a..47aee4140 100644 --- a/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/debian/squeeze/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff @@ -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:-`kde-config --expandvars --install include`}/kde.pot +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +- kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot - fi -+# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot ++# kdepotpath=`tde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ |