diff options
| author | albator <albator@arcadia.vtf> | 2011-11-05 11:51:44 +0100 |
|---|---|---|
| committer | albator <albator@arcadia.vtf> | 2011-11-05 11:51:44 +0100 |
| commit | 70bc259aa3f4dbd83bd239030690759449ee714b (patch) | |
| tree | b61af2d70c64ca12dbec49053c0b20dae8ba7926 /ubuntu/maverick/tdewebdev/debian/patches/common | |
| parent | 1f3a44f73fa43d3c30f47ff8c4f5c414d83f4765 (diff) | |
| parent | 169853a068683db6540e3b77542d5139bb7867d1 (diff) | |
| download | tde-packaging-70bc259aa3f4dbd83bd239030690759449ee714b.tar.gz tde-packaging-70bc259aa3f4dbd83bd239030690759449ee714b.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/tdewebdev/debian/patches/common')
| -rw-r--r-- | ubuntu/maverick/tdewebdev/debian/patches/common/README | 14 | ||||
| -rw-r--r-- | ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff | 26 |
2 files changed, 40 insertions, 0 deletions
diff --git a/ubuntu/maverick/tdewebdev/debian/patches/common/README b/ubuntu/maverick/tdewebdev/debian/patches/common/README new file mode 100644 index 000000000..01a880c08 --- /dev/null +++ b/ubuntu/maverick/tdewebdev/debian/patches/common/README @@ -0,0 +1,14 @@ +Common patches across KDE Debian packages +========================================= + + These directory should contain patches to the admin/ subdir of KDE + modules that are meant to be applied to all packaged modules. As the + admin/ subdir is shared across modules (and so, it's identical for all + modules at a certain version), I think it makes sense to have these + patches in a central location, and update them here. + + The script update.sh takes care of automatically updating the patches + that update autotools and libtool. You need to pass the location of an + admin/ directory as the first argument. + + -- Adeodato Simó, 2005-02-26 diff --git a/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff new file mode 100644 index 000000000..1f825f642 --- /dev/null +++ b/ubuntu/maverick/tdewebdev/debian/patches/common/kubuntu_01_kdepot.diff @@ -0,0 +1,26 @@ +--- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000 ++++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000 +@@ -537,6 +537,8 @@ + if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi + export EXTRACTRC PREPARETIPS + ++kdepotpath=/usr/include/kde/kde.pot ++ + for subdir in $dirs; do + test -z "$VERBOSE" || echo "Making messages in $subdir" + (cd $subdir +@@ -554,10 +556,10 @@ + 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 +- if ! test -f $kdepotpath; then +- 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/kde.pot ++# fi + + $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ + XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages |