[docteam-commits] r4076 - branches/feisty/debian
Author: mantha Date: Sun Apr 8 09:43:34 2007 New Revision: 4076 Modified: branches/feisty/debian/changelog branches/feisty/debian/control branches/feisty/debian/rules Log: * synced to Martin Pitt's upload of 7.04-2 Modified: branches/feisty/debian/changelog == --- branches/feisty/debian/changelog(original) +++ branches/feisty/debian/changelogSun Apr 8 09:43:34 2007 @@ -1,3 +1,12 @@ +ubuntu-docs (7.04.2) feisty; urgency=low + + * Package diet to stop being so ridiculously space inefficient: +- debian/rules: Use bzip2 compression. +- Add symlink-dupes and run it in debian/rules, to symlink duplicate + files. Add fdupes build dependency for that. + + -- Martin Pitt [EMAIL PROTECTED] Thu, 5 Apr 2007 12:32:17 +0200 + ubuntu-docs (7.04.1) feisty; urgency=low * Adding translations for all documents Modified: branches/feisty/debian/control == --- branches/feisty/debian/control (original) +++ branches/feisty/debian/control Sun Apr 8 09:43:34 2007 @@ -4,7 +4,7 @@ Maintainer: Ubuntu Documentation Team [EMAIL PROTECTED] Uploaders: Daniel Holbach [EMAIL PROTECTED] Build-Depends: debhelper (= 5.0.0), cdbs -Build-Depends-Indep: xsltproc, docbook-xsl, perl, perl-modules, gnome-doc-utils, docbook-xml +Build-Depends-Indep: xsltproc, docbook-xsl, perl, perl-modules, gnome-doc-utils, docbook-xml, fdupes Standards-Version: 3.7.2 Package: ubuntu-docs Modified: branches/feisty/debian/rules == --- branches/feisty/debian/rules(original) +++ branches/feisty/debian/rulesSun Apr 8 09:43:34 2007 @@ -4,6 +4,7 @@ include /usr/share/cdbs/1/class/makefile.mk DEB_DH_INSTALL_ARGS = -X.svn +DEB_DH_BUILDDEB_ARGS := -- -Z bzip2 DEB_SRCDIR = ubuntu @@ -81,3 +82,6 @@ cp -R generic/packagingguide/files/ debian/packaging-guide/usr/share/packaging-guide/ cp ubuntu/libs/ubuntu-book.css debian/packaging-guide/usr/share/packaging-guide/common/ cp -R build/ubuntu/packagingguide/C/*.html debian/packaging-guide/usr/share/packaging-guide/html/C/ + +binary-fixup/ubuntu-docs:: + (cd debian/ubuntu-docs; ../../symlink-dupes) -- ubuntu-doc-commits mailing list ubuntu-doc-commits@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-doc-commits
[docteam-commits] r4077 - branches/feisty/debian
Author: mdke Date: Sun Apr 8 10:28:44 2007 New Revision: 4077 Modified: branches/feisty/debian/changelog branches/feisty/debian/rules Log: new package Modified: branches/feisty/debian/changelog == --- branches/feisty/debian/changelog(original) +++ branches/feisty/debian/changelogSun Apr 8 10:28:44 2007 @@ -1,3 +1,11 @@ +ubuntu-docs (7.04.3) feisty; urgency=low + + * Update translations from Rosetta + * Install translations for ubuntu-serverguide + * Unbreak about-ubuntu panel menu entry + + -- Matthew East [EMAIL PROTECTED] Sun, 8 Apr 2007 10:26:54 +0100 + ubuntu-docs (7.04.2) feisty; urgency=low * Package diet to stop being so ridiculously space inefficient: Modified: branches/feisty/debian/rules == --- branches/feisty/debian/rules(original) +++ branches/feisty/debian/rulesSun Apr 8 10:28:44 2007 @@ -70,7 +70,7 @@ cp -R build/ubuntu/images/ debian/ubuntu-serverguide/usr/share/ubuntu-serverguide/ cp -R generic/serverguide/sample/ debian/ubuntu-serverguide/usr/share/ubuntu-serverguide/ cp ubuntu/libs/ubuntu-book.css debian/ubuntu-serverguide/usr/share/ubuntu-serverguide/common/ - cp -R build/ubuntu/serverguide/C/*.html debian/ubuntu-serverguide/usr/share/ubuntu-serverguide/html/C/ + cp -R build/ubuntu/serverguide/* debian/ubuntu-serverguide/usr/share/ubuntu-serverguide/html/ build/packaging-guide:: cd ubuntu; $(MAKE) package -- ubuntu-doc-commits mailing list ubuntu-doc-commits@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-doc-commits
[docteam-commits] r4079 - branches/feisty/generic
Author: mdke
Date: Sun Apr 8 10:30:17 2007
New Revision: 4079
Added:
branches/feisty/generic/translate.sh (contents, props changed)
Log:
translate script
Added: branches/feisty/generic/translate.sh
==
--- (empty file)
+++ branches/feisty/generic/translate.shSun Apr 8 10:30:17 2007
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+
+# Copyright (C) 2005-2006 Ubuntu Documentation Project ([EMAIL PROTECTED])
+#This program is free software; you can redistribute it and/or modify
+#it under the terms of the GNU General Public License as published by
+#the Free Software Foundation; either version 2 of the License, or
+#(at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#On Debian based systems a copy of the GPL can be found
+#at /usr/share/common-licenses/GPL
+
+
+# NB - DON'T ATTEMPT TO USE THIS YET, IT HASN'T BEEN TESTED MUCH.
+#
+# This script is for generating XML documents from po files downloaded from
Launchpad
+# Put your freshly downloaded po files into the po folder under each document,
then run:
+#
+# $ translate.sh
+#
+# Optional parameters:
+# -ddocumentname
+# -llanguage
+#
+
+translate () {
+ y=$(basename ${1} .po)
+ echo ${y}
+ mkdir -p ${y}
+ for i in C/*xml; do
+ j=$(basename ${i} C/)
+ echo ${j}
+ k=$(basename ${j} .xml)
+ echo ${k}
+ xml2po -e -p po/${y}.po C/${j} ${y}/${j}
+ done
+ if [ -e C/${document}-C.omf ]; then
+ echo Generating omf file for ${document}
+ xml2po -e -p ${1} C/${document}-C.omf ${y}/${document}-${y}.omf
+ sed -i -e [EMAIL PROTECTED]C\@\${y}\@g -e [EMAIL
PROTECTED]/@${y}/@g ${y}/${document}-${y}.omf
+ fi
+ ../../validate.sh ${y}/${document}.xml
+ svn add ${y}
+}
+
+choose_language () {
+ echo Entering ${1}
+ cd ${1}
+ if [ ${2} ]; then
+ translate po/${2}.po
+ else
+ for x in po/*; do
+ translate ${x}
+ done
+ fi
+ rm .xml2po.mo
+ cd ..
+}
+
+while getopts d:l: Option
+do
+ case ${Option} in
+ d) document=${OPTARG};;
+ l) lang=${OPTARG};;
+ *) echo Please specify an argument.;;
+ esac
+done
+
+if [ ${document} ]; then
+ choose_language ${document} ${lang}
+else
+ for doc in serverguide
+ do
+ choose_language ${doc} ${lang}
+ done
+fi
+
--
ubuntu-doc-commits mailing list
ubuntu-doc-commits@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-doc-commits
[docteam-commits] r4081 - branches/feisty
Author: mdke Date: Sun Apr 8 11:52:16 2007 New Revision: 4081 Added: branches/feisty/symlink-dupes (contents, props changed) Log: pitti's script Added: branches/feisty/symlink-dupes == --- (empty file) +++ branches/feisty/symlink-dupes Sun Apr 8 11:52:16 2007 @@ -0,0 +1,33 @@ +#!/usr/bin/python + +import os, subprocess + +def pathsplit(p, rest=[]): +(h,t) = os.path.split(p) +if len(h) 1: return [t]+rest +if len(t) 1: return [h]+rest +return pathsplit(h,[t]+rest) + +def commonpath(l1, l2, common=[]): +if len(l1) 1: return (common, l1, l2) +if len(l2) 1: return (common, l1, l2) +if l1[0] != l2[0]: return (common, l1, l2) +return commonpath(l1[1:], l2[1:], common+[l1[0]]) + +def relpath(p1, p2): +(common,l1,l2) = commonpath(pathsplit(p1), pathsplit(p2)) +p = [] +if len(l1) 0: +p = [ '../' * len(l1) ] +p = p + l2 +return os.path.join( *p ) + +fdupes = subprocess.Popen(['fdupes', '-r', '--sameline', '.'], stdout=subprocess.PIPE) +for l in fdupes.stdout: +files = l.split() +master = files.pop(0) +for dup in files: +target = relpath(os.path.dirname(dup), master) +os.unlink(dup) +os.symlink(target, dup) +print dup, '-', target -- ubuntu-doc-commits mailing list ubuntu-doc-commits@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-doc-commits
[docteam-commits] r4085 - trunk/ubuntu/about-ubuntu/C
Author: philbull Date: Sun Apr 8 23:45:23 2007 New Revision: 4085 Modified: trunk/ubuntu/about-ubuntu/C/about-ubuntu.xml Log: Changed RedHat Red Hat, should resolve 104534 Modified: trunk/ubuntu/about-ubuntu/C/about-ubuntu.xml == --- trunk/ubuntu/about-ubuntu/C/about-ubuntu.xml(original) +++ trunk/ubuntu/about-ubuntu/C/about-ubuntu.xmlSun Apr 8 23:45:23 2007 @@ -112,7 +112,7 @@ sect1 id=ubuntu-difference status=complete titleThe Difference/title paraThere are many different operating systems based on Linux: -Debian, SuSE, Gentoo, RedHat, and Mandriva are examples. +Debian, SuSE, Gentoo, Red Hat, and Mandriva are examples. Ubuntu is yet another contender in what is already a highly competitive world. So what makes Ubuntu different? -- ubuntu-doc-commits mailing list ubuntu-doc-commits@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-doc-commits
