diff options
| author | Robert Xu <robxu9@gmail.com> | 2012-03-31 14:28:30 -0400 |
|---|---|---|
| committer | Robert Xu <robxu9@gmail.com> | 2012-03-31 14:28:30 -0400 |
| commit | 8334f62eb4c103256204708eef6ea1077744ae67 (patch) | |
| tree | c54a5afd119b408df8dff0e38f284710ac97b755 /ubuntu/maverick/tdesdk/debian | |
| parent | 59dd46ef985a719579132efa6a9aa49bfeeae112 (diff) | |
| parent | de0c80d8630d52a67dc316b36e3e7b3af29ecb01 (diff) | |
| download | tde-packaging-8334f62eb4c103256204708eef6ea1077744ae67.tar.gz tde-packaging-8334f62eb4c103256204708eef6ea1077744ae67.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/tdesdk/debian')
| -rw-r--r-- | ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff | 8 |
1 files changed, 4 insertions, 4 deletions
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 e154eb334..20ad1b0b7 100644 --- a/ubuntu/maverick/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff +++ b/ubuntu/maverick/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=. \ |