------------------------------------------------------------ revno: 3671 committer: Matthew East <[EMAIL PROTECTED]> branch nick: ubuntu-hardy timestamp: Sat 2008-02-16 18:34:17 +0000 message: synching with latest gutsy package (was out of date) modified: debian/README debian/README.Debian debian/changelog debian/rules
=== modified file 'debian/README' --- a/debian/README 2006-08-02 18:55:39 +0000 +++ b/debian/README 2008-02-16 18:34:17 +0000 @@ -9,6 +9,3 @@ are localised, and have pictures) o No scrollkeeper-update errors -When building the package, we do this command to filter out unwanted folders from the source package (see the list in README.Debian): - -svn export https://docteam.ubuntu.com/repos/trunk/; cd trunk; grep -E ^"\*" debian/README.Debian | sed 's/^\*\ //' | xargs rm -rf === modified file 'debian/README.Debian' --- a/debian/README.Debian 2006-08-02 18:55:39 +0000 +++ b/debian/README.Debian 2008-02-16 18:34:17 +0000 @@ -5,6 +5,7 @@ * incoming/ * kubuntu/ * teamstuff/ +* libs/pdf * generic/images/ * generic/installguide/ === modified file 'debian/changelog' --- a/debian/changelog 2008-02-16 14:49:35 +0000 +++ b/debian/changelog 2008-02-16 18:34:17 +0000 @@ -1,10 +1,47 @@ ubuntu-docs (8.02.1) hardy; urgency=low - * New bzr checkout - numerous text fixes - * Changing 7.10 to "Hardy Heron" in browser homepage (LP: #176678) - * Removing packagingguide package - now maintained on wiki - - -- Matthew East <[EMAIL PROTECTED]> Sat, 16 Feb 2008 14:33:46 +0000 + * New bzr checkout - loads of text fixes and improvements + * First release for hardy + + -- Matthew East <[EMAIL PROTECTED]> Sat, 16 Feb 2008 18:31:20 +0000 + +ubuntu-docs (7.10.4) gutsy; urgency=low + + * Fix broken link in "windows" document (LP: #144796) + + -- Matthew East <[EMAIL PROTECTED]> Fri, 12 Oct 2007 08:36:57 +0100 + +ubuntu-docs (7.10.3) gutsy; urgency=low + + * Advanced Topics - changing link to more useful doc for programming reference + + -- Matthew East <[EMAIL PROTECTED]> Sun, 07 Oct 2007 12:34:41 +0100 + +ubuntu-docs (7.10.2) gutsy; urgency=low + + * New translation export from rosetta + * Restoring translations over 40% complete + * Including all languages in ubuntu-serverguide package (LP: #110863) + * Last package upload before gutsy (LP: #149993) + + -- Matthew East <[EMAIL PROTECTED]> Sat, 06 Oct 2007 15:25:19 +0100 + +ubuntu-docs (7.10.1) gutsy; urgency=low + + * Adding translations to source package + * Don't install libs/pdf directory + * Restore symlink-dupes script to eliminate duplicate files (LP: 149040) + * Fix debian/rules to take account of new location for pot files (thanks to Martin Pitt) + * Only install translations which are >90% complete (temporary measure to keep package size small) + + -- Matthew East <[EMAIL PROTECTED]> Thu, 04 Oct 2007 08:17:06 +0100 + +ubuntu-docs (7.09.3) gutsy; urgency=low + + * Strip out unwanted directories from the source package in + debian/rules rather than manually. + + -- Matthew East <[EMAIL PROTECTED]> Mon, 17 Sep 2007 08:46:53 +0100 ubuntu-docs (7.09.2) gutsy; urgency=low === modified file 'debian/rules' --- a/debian/rules 2008-02-16 14:49:35 +0000 +++ b/debian/rules 2008-02-16 18:34:17 +0000 @@ -17,6 +17,10 @@ preptrans=prepare-firefox-startpage-translations preptransdir=debian/ubuntu-docs/usr/share/ubuntu-docs/common +clean:: + @grep -E ^"\*" debian/README.Debian | sed 's/^\*\ //' | xargs rm -rf + @echo "---" + common-binary-post-install-indep:: mv debian/ubuntu-docs/usr/share/ubuntu-artwork/home/index.html debian/ubuntu-docs/usr/share/ubuntu-artwork/home/firefox-index.html $(install755) -d $(preptransdir) @@ -27,15 +31,15 @@ /usr/share/ubuntu-artwork/home/locales-ubuntu \ ../index.html -# Install the documents; skip documents which are less than 30% translated +# Install the documents; skip documents which are less than 40% translated - for doc in `cat ubuntu/libs/shipped-docs`; do \ - numstrings=`LANG=C msgfmt --statistics ubuntu/$$doc/po/*.pot 2>&1 | sed -r 's/^.* ([[:digit:]]+) untranslated.*$$/\1/'`; \ + set -x; for doc in `cat ubuntu/libs/shipped-docs`; do \ + numstrings=`LANG=C msgfmt --statistics ubuntu/$$doc/*.pot 2>&1 | sed -r 's/^.* ([[:digit:]]+) untranslated.*$$/\1/'`; \ for lang in `ls ubuntu/$$doc/`; do \ if [ -e ubuntu/$$doc/po/$$lang.po ]; then \ translated=`LANG=C msgfmt -o /dev/null --statistics ubuntu/$$doc/po/$$lang.po 2>&1| cut -f1 -d\ `; \ - if [ "`echo "$$translated./$$numstrings > 0.3" | bc -l`" = "0" ]; then \ - echo "$$doc $$lang is less than 30% translated, skipping"; \ + if [ "`echo "$$translated./$$numstrings > 0.4" | bc -l`" = "0" ]; then \ + echo "$$doc $$lang is less than 40% translated, skipping"; \ continue; \ fi; \ fi; \ @@ -53,12 +57,12 @@ # Server material is done slightly differently for doc in server; do \ - numstrings=`LANG=C msgfmt --statistics generic/serverguide/po/*.pot 2>&1 | sed -r 's/^.* ([[:digit:]]+) untranslated.*$$/\1/'`; \ + numstrings=`LANG=C msgfmt --statistics generic/serverguide/*.pot 2>&1 | sed -r 's/^.* ([[:digit:]]+) untranslated.*$$/\1/'`; \ for lang in `ls generic/$$doc/`; do \ if [ -e generic/serverguide/po/$$lang.po ]; then \ translated=`LANG=C msgfmt -o /dev/null --statistics generic/serverguide/po/$$lang.po 2>&1| cut -f1 -d\ `; \ - if [ "`echo "$$translated./$$numstrings > 0.30" | bc -l`" = "0" ]; then \ - echo "$$doc $$lang is less than 30% translated, skipping"; \ + if [ "`echo "$$translated./$$numstrings > 0.40" | bc -l`" = "0" ]; then \ + echo "$$doc $$lang is less than 40% translated, skipping"; \ continue; \ fi; \ fi; \ @@ -66,12 +70,16 @@ mkdir -p debian/ubuntu-docs/usr/share/gnome/help/$$doc/$$lang; \ cp -r generic/$$doc/$$lang/*xml debian/ubuntu-docs/usr/share/gnome/help/$$doc/$$lang/; \ fi; \ + if [ -e generic/$$doc/$$lang/*.omf ]; then \ + mkdir -p debian/ubuntu-docs/usr/share/omf/$$doc; \ + cp generic/$$doc/$$lang/*omf debian/ubuntu-docs/usr/share/omf/$$doc/; \ + fi; \ done; \ done; \ # Common documents - cp -r common debian/ubuntu-docs/usr/share/ubuntu-docs/ + cp -r common debian/ubuntu-docs/usr/share/ubuntu-docs/ # Scrollkeeper loving @@ -87,3 +95,6 @@ cp -R generic/serverguide/sample/ debian/ubuntu-serverguide/usr/share/ubuntu-serverguide/html/ cp ubuntu/libs/ubuntu-book.css debian/ubuntu-serverguide/usr/share/ubuntu-serverguide/common/ cp -R build/ubuntu/serverguide/* debian/ubuntu-serverguide/usr/share/ubuntu-serverguide/html/ + +binary-fixup/ubuntu-docs:: + (cd debian/ubuntu-docs; ../../symlink-dupes) -- https://code.launchpad.net/~ubuntu-core-doc/ubuntu-doc/ubuntu-hardy You are receiving this branch notification because you are subscribed to it. -- ubuntu-doc-commits mailing list ubuntu-doc-commits@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-doc-commits