diff options
Diffstat (limited to 'ubuntu')
54 files changed, 101 insertions, 101 deletions
diff --git a/ubuntu/lucid_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff index 782118729..de663438c 100644 --- a/ubuntu/lucid_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -16,5 +16,5 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot if ! test -f $kdepotpath; then - kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot + kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot fi diff --git a/ubuntu/lucid_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdelibs/debian/changelog b/ubuntu/lucid_automake/kdelibs/debian/changelog index bc7c7eed5..6a65281c1 100644 --- a/ubuntu/lucid_automake/kdelibs/debian/changelog +++ b/ubuntu/lucid_automake/kdelibs/debian/changelog @@ -2087,7 +2087,7 @@ kdelibs (4:3.4.0-0pre5) alioth; urgency=low 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 - located at TDEDIR/include/tde.pot. This allows the use of targets such as + located at TDEDIR/include/kde.pot. This allows the use of targets such as "package-messages" without specifying includedir. (Closes: #283858) * Now that graphviz is in main, add it to Build-Depends-Indep together with diff --git a/ubuntu/lucid_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/lucid_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/lucid_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/lucid_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff index 698deb926..aca9df12a 100644 --- a/ubuntu/lucid_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/lucid_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff index 782118729..de663438c 100644 --- a/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -16,5 +16,5 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot if ! test -f $kdepotpath; then - kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot + kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot fi diff --git a/ubuntu/maverick/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/kdegraphics.automake/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeaddons/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeadmin/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdebindings/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeedu/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdegames/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog index 8eda5d307..dd416c496 100644 --- a/ubuntu/maverick/tdelibs/debian/changelog +++ b/ubuntu/maverick/tdelibs/debian/changelog @@ -2087,7 +2087,7 @@ tdelibs (4:3.4.0-0pre5) alioth; urgency=low 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 - located at TDEDIR/include/tde.pot. This allows the use of targets such as + located at TDEDIR/include/kde.pot. This allows the use of targets such as "package-messages" without specifying includedir. (Closes: #283858) * Now that graphviz is in main, add it to Build-Depends-Indep together with diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install index a9044b322..637e5ff60 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install @@ -203,7 +203,7 @@ debian/tmp/opt/trinity/include/tdedmodule.h debian/tmp/opt/trinity/include/tde_file.h debian/tmp/opt/trinity/include/tdelibs_export.h debian/tmp/opt/trinity/include/tdemacros.h -debian/tmp/opt/trinity/include/tde.pot +debian/tmp/opt/trinity/include/kde.pot debian/tmp/opt/trinity/include/tdeprint/driver.h debian/tmp/opt/trinity/include/tdeprint/kiconselectaction.h debian/tmp/opt/trinity/include/tdeprint/kmjob.h diff --git a/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdenetwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdetoys/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff index c02687784..e154eb334 100644 --- a/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdevelop/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff index 698deb926..aca9df12a 100644 --- a/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff index 782118729..de663438c 100644 --- a/ubuntu/maverick_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/applications/keep/debian/patches/kubuntu_01_kdepot.diff @@ -16,5 +16,5 @@ diff -Nur keep-0.4.0/admin/cvs.sh keep-0.4.0.new/admin/cvs.sh - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot if ! test -f $kdepotpath; then - kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot + kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot fi diff --git a/ubuntu/maverick_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdeaccessibility/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdeaddons/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdeadmin/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdeartwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdebindings/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdeedu/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdegames/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdegraphics/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdelibs/debian/changelog b/ubuntu/maverick_automake/kdelibs/debian/changelog index bc7c7eed5..6a65281c1 100644 --- a/ubuntu/maverick_automake/kdelibs/debian/changelog +++ b/ubuntu/maverick_automake/kdelibs/debian/changelog @@ -2087,7 +2087,7 @@ kdelibs (4:3.4.0-0pre5) alioth; urgency=low 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 - located at TDEDIR/include/tde.pot. This allows the use of targets such as + located at TDEDIR/include/kde.pot. This allows the use of targets such as "package-messages" without specifying includedir. (Closes: #283858) * Now that graphviz is in main, add it to Build-Depends-Indep together with diff --git a/ubuntu/maverick_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdemultimedia/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdenetwork/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdepim/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdesdk/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdetoys/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdeutils/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff index e705cf83b..b26f84af1 100644 --- a/ubuntu/maverick_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdevelop/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ diff --git a/ubuntu/maverick_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff index 698deb926..aca9df12a 100644 --- a/ubuntu/maverick_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick_automake/kdewebdev/debian/patches/common/kubuntu_01_kdepot.diff @@ -15,11 +15,11 @@ - kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot - if ! test -f $kdepotpath; then -- kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot +- kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot - fi +# kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot +# if ! test -f $kdepotpath; then -+# kdepotpath=`kde-config --expandvars --prefix`/include/tde.pot ++# kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot +# fi $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ |