Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: pu
I would like to update the debian-handbook in Wheezy so that it actually
documents Wheezy and not Squeeze. We finished the update in late december.
Attached is a filtered debdiff that drops changes on content (*.xml, *.po,
*/images/*) and leaves only the rest. Most of it is still irrelevant
though. Everything under build/ is not used in the Debian package build.
Most of the remaining changes are in README files.
The supplementary build-dependencies are not really needed either, but
they make it possible to build the PDF version (even though we don't do
it for the Debian package). That said the README.Debian documents that
"feature".
Let me know if it's ok to upload as is.
$ LANG=C diffstat /tmp/debdiff4
README.git | 4
README.translators | 18 +++
ar-MA/README | 3
brand/en-US/css/overrides.css | 18 +--
build/README | 12 ++
build/build-all | 8 -
build/build-epub | 15 ++-
build/build-html | 2
build/build-pdf | 3
build/common.sh | 4
build/dblatex/config.xsl | 50 ++++++++--
build/dblatex/eyrolles.xsl | 50 ++++++++++
build/dblatex/librement.sty | 45 ++++++---
build/dblatex/librement.xsl | 14 +++
build/epub/tdah-mobi.xsl | 12 ++
build/epub/tdah-plain.css | 48 ----------
build/epub/tdah.css | 30 +++++-
debian/README.Debian | 5 -
debian/changelog | 62 +++++++++++++
debian/control | 8 +
debian/copyright | 6 -
debian/rules | 2
es-ES/README | 27 +++++
fa-IR/README | 29 ++++++
fr-FR/README | 8 +
hr-HR/README | 11 ++
id-ID/README | 124 +++++++++++++++++++++++++++
it-IT/README | 56 ++++++++++--
ja-JP/README | 3
misc-scripts/aggregate-mailing-list-stats.pl | 77 ++++++++++++++++
pl-PL/README | 19 ++++
publican-pdf.cfg | 10 ++
publican.cfg | 1
ru-RU/readme | 16 +++
ru-RU/translations | 20 ++++
35 files changed, 692 insertions(+), 128 deletions(-)
Cheers,
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.12-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--
Raphaël Hertzog ◈ Debian Developer
Discover the Debian Administrator's Handbook:
→ http://debian-handbook.info/get/
--- debian-handbook-6.0+20121031/ar-MA/README 2012-11-09 16:10:28.000000000
+0000
+++ debian-handbook-7.20140126~deb7u1/ar-MA/README 2014-01-26
20:41:04.000000000 +0000
@@ -3,6 +3,7 @@
المترجمون :
محمّد سعيد <msaie...@gmail.com>
محمّد أمين <m...@mailoo.org>
+ صلاح الدين الشامي <samiubu...@yahoo.com>
إن أردت المساهمة في الترجمة أرسل رسالة إلى قائمة
التوثيق البريدية <debian-l10n-ara...@lists.debian.org> أو <d...@arabeyes.org>.
@@ -16,9 +17,10 @@
Translators:
Muhammad Saied <msaie...@gmail.com>
Mohamed Amine <m...@mailoo.org>
+ Salah Eddin Al-shami <samiubu...@yahoo.com>
If you would like to participate
contact <debian-l10n-ara...@lists.debian.org> or <d...@arabeyes.org>
mailing list.
-Questions? Ask them on <debian-l10n-ara...@lists.debian.org>.
\ Pas de fin de ligne à la fin du fichier
+Questions? Ask them on <debian-l10n-ara...@lists.debian.org>.
--- debian-handbook-6.0+20121031/brand/en-US/css/overrides.css 2012-11-09
16:10:28.000000000 +0000
+++ debian-handbook-7.20140126~deb7u1/brand/en-US/css/overrides.css
2014-01-26 20:41:04.000000000 +0000
@@ -60,12 +60,6 @@
background-color: #ffff00;
}
-
-/* Disable the important formatting on sidebars. */
-div.important.sidebar:before {
- content: "";
-}
-
/* Styles of block URLs */
div.url {
margin-top: 0.5em;
@@ -95,12 +89,14 @@
}
/* Modify behaviour within sidebars */
-div.sidebar p, div.sidebar div.para {
- margin-top: 0px;
- margin-bottom: 1em;
+div.sidebar p.title {
+ margin-bottom: 0;
+ margin-top: 0;
}
-div.sidebar h6 {
- margin-top: 0px;
+
+div.sidebar > p, div.sidebar > div.para {
+ margin-top: 1em;
+ margin-bottom: 0;
}
/* Styles of screens */
--- debian-handbook-6.0+20121031/build/build-all 2012-11-09
16:10:28.000000000 +0000
+++ debian-handbook-7.20140126~deb7u1/build/build-all 2014-01-26
20:41:04.000000000 +0000
@@ -5,9 +5,8 @@
. $(dirname $0)/common.sh
check_cwd
-
-publican clean
-
+parse_options "$@"
+OPT_lang=${OPT_lang:-[a-z][a-z]-[A-Z][A-Z]}
failures=""
fail_build() {
@@ -17,8 +16,9 @@
fi
}
+publican clean
-for lang in [a-z][a-z]-[A-Z][A-Z]; do
+for lang in $OPT_lang; do
if ! build/build-html --lang=$lang; then
fail_build $lang html
fi
--- debian-handbook-6.0+20121031/build/build-epub 2012-11-09
16:10:28.000000000 +0000
+++ debian-handbook-7.20140126~deb7u1/build/build-epub 2014-01-26
20:41:04.000000000 +0000
@@ -14,6 +14,7 @@
if [ ! -e tmp/$OPT_lang/xml ] || [ -z "$OPT_skip" ]; then
publican build --formats=xml --langs=$OPT_lang
+ sed -i -e "s/<book/<book lang=\"${OPT_lang}\"/"
tmp/$OPT_lang/xml/debian-handbook.xml
fi
cp -a build/epub tmp/$OPT_lang/xml/
@@ -29,10 +30,15 @@
exit 1
fi
-if [ -x /usr/bin/ebook-convert ]; then
- dbtoepub -s epub/tdah-epub.xsl -c epub/tdah-plain.css \
- -o debian-handbook-plain.epub $OPT_opts debian-handbook.xml
- ebook-convert debian-handbook-plain.epub debian-handbook.mobi \
+if which kindlegen >/dev/null; then
+ dbtoepub -s epub/tdah-mobi.xsl -c epub/tdah.css \
+ -o debian-handbook-mobi.epub $OPT_opts debian-handbook.xml
+ kindlegen debian-handbook-mobi.epub -o debian-handbook.mobi
+ cp debian-handbook.mobi $targetdir/
+elif [ -x /usr/bin/ebook-convert ]; then
+ dbtoepub -s epub/tdah-mobi.xsl -c epub/tdah.css \
+ -o debian-handbook-mobi.epub $OPT_opts debian-handbook.xml
+ ebook-convert debian-handbook-mobi.epub debian-handbook.mobi \
--output-profile=kindle \
--chapter="/" \
--no-chapters-in-toc \
@@ -45,4 +51,3 @@
cp debian-handbook.mobi $targetdir/
echo "SUCCESS: $targetdir/debian-handbook.mobi"
fi
-
--- debian-handbook-6.0+20121031/build/build-html 2012-11-09
16:10:28.000000000 +0000
+++ debian-handbook-7.20140126~deb7u1/build/build-html 2014-01-26
20:41:04.000000000 +0000
@@ -10,7 +10,7 @@
OPT_lang="en-US"
parse_options "$@"
-if publican build --publish --formats=html --langs=$OPT_lang $OPT_opts; then
+if publican build --publish --brand_dir=brand --formats=html --langs=$OPT_lang
$OPT_opts; then
echo "SUCCESS:
publish/$OPT_lang/Debian/$version/html/debian-handbook/index.html"
else
echo "ERROR: failed to build HTML output for $OPT_lang"
--- debian-handbook-6.0+20121031/build/build-pdf 2012-11-09
16:10:28.000000000 +0000
+++ debian-handbook-7.20140126~deb7u1/build/build-pdf 2014-01-26
20:41:04.000000000 +0000
@@ -18,7 +18,8 @@
parse_options "$@"
if [ ! -e tmp/$OPT_lang/xml ] || [ -z "$OPT_skip" ]; then
- publican build --formats=xml --langs=$OPT_lang
+ publican build --config=publican-pdf.cfg --formats=xml --langs=$OPT_lang
+ sed -i -e "s/<book/<book lang=\"${OPT_lang}\"/"
tmp/$OPT_lang/xml/debian-handbook.xml
fi
cp -a build/dblatex tmp/$OPT_lang/xml/
--- debian-handbook-6.0+20121031/build/common.sh 2012-11-09
16:10:28.000000000 +0000
+++ debian-handbook-7.20140126~deb7u1/build/common.sh 2014-01-26
20:41:04.000000000 +0000
@@ -13,10 +13,10 @@
6.0*)
release="squeeze"
;;
- 7.0*)
+ 7*)
release="wheezy"
;;
- 8.0*)
+ 8*)
release="jessie"
;;
*)
--- debian-handbook-6.0+20121031/build/dblatex/config.xsl 2012-11-09
16:10:28.000000000 +0000
+++ debian-handbook-7.20140126~deb7u1/build/dblatex/config.xsl 2014-01-26
20:41:04.000000000 +0000
@@ -23,7 +23,12 @@
<xsl:param name="insert.link.page.number">yes</xsl:param>
<!-- Misc rendering options -->
-<!-- Avoid line overflows when hyphenations are missing -->
+<xsl:param name="make.year.ranges">1</xsl:param>
+<xsl:param name="make.single.year.ranges">1</xsl:param>
+
+<!-- Hyphenation related, try to avoid line overflows but still
+ have good hyphenation -->
+<xsl:param name="monoseq.hyphenation">0</xsl:param>
<xsl:param name="hyphenation.setup">sloppy</xsl:param>
<!-- Support scaling of listings -->
@@ -35,7 +40,7 @@
<xsl:param name="doc.toc.show">1</xsl:param>
<!-- The number of levels that are numbered -->
-<xsl:param name="doc.section.depth">3</xsl:param>
+<xsl:param name="doc.section.depth">2</xsl:param>
<!-- The number of levels that are included in the TOC -->
<xsl:param name="toc.section.depth">3</xsl:param>
@@ -94,7 +99,7 @@
<xsl:param name="figure.emptypage">images/debian.png</xsl:param>
<xsl:param name="ulink.block.symbol">\ding{232}</xsl:param>
-<xsl:template match="command|parameter|option">
+<xsl:template match="command|parameter|option|citerefentry">
<xsl:call-template name="inline.monoseq"/>
</xsl:template>
@@ -102,6 +107,10 @@
<xsl:call-template name="inline.sansseq"/>
</xsl:template>
+<xsl:template match="sidebar//literal">
+ <xsl:call-template name="inline.monoseq"/>
+</xsl:template>
+
<xsl:template match="replaceable">
<xsl:call-template name="inline.italicseq"/>
</xsl:template>
@@ -111,8 +120,9 @@
</xsl:template>
<!-- Extend/override generated texts:
- - override page citation text to "(page %p)"
+ - override page citation text to "page %p"
- auto-add quotes for xref to sidebar
+ - don't start with capital letters
-->
<xsl:param name="local.l10n.xml" select="document('')"/>
<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0";>
@@ -121,10 +131,27 @@
<l:gentext key="minitoc" text="Contents"/>
<l:gentext key="keywordset" text="Keywords"/>
<l:context name="xref">
- <l:template name="page.citation" text=" (page %p)"/>
+ <l:template name="page.citation" text=" page %p"/>
+ <l:template name="sidebar" text="“%t”"/>
+ </l:context>
+ <l:context name="xref-number-and-title">
+ <!-- Don't start with capital letters -->
+ <l:template name="chapter" text=" chapter %n, “%t”"/>
+ <l:template name="section" text=" section %n, “%t”"/>
+ <l:template name="appendix" text=" appendix %n, “%t”"/>
</l:context>
+ </l:l10n>
+
+ <l:l10n language="es">
+ <l:gentext key="minitoc" text="Contenidos"/>
+ <l:gentext key="keywordset" text="Palabras clave"/>
<l:context name="xref">
- <l:template name="sidebar" text="“%t”"/>
+ <l:template name="page.citation" text=" página %p"/>
+ <l:template name="sidebar" text="«%t»"/>
+ </l:context>
+ <l:context name="xref-number-and-title">
+ <l:template name="chapter" text=" Capítulo %n: «%t»"/>
+ <l:template name="section" text=" Sección %n, «%t»"/>
</l:context>
</l:l10n>
@@ -132,13 +159,16 @@
<l:gentext key="minitoc" text="Sommaire"/>
<l:gentext key="keywordset" text="Mots-clés"/>
<l:context name="xref">
- <l:template name="page.citation" text=" (page %p)"/>
- </l:context>
- <l:context name="xref">
+ <l:template name="page.citation" text=" page %p"/>
<l:template name="sidebar" text="« %t »"/>
</l:context>
+ <l:context name="xref-number-and-title">
+ <!-- Don't start with capital letters -->
+ <l:template name="chapter" text=" chapitre %n, « %t »"/>
+ <l:template name="section" text=" section %n, « %t »"/>
+ <l:template name="appendix" text=" annexe %n, « %t »"/>
+ </l:context>
</l:l10n>
-
</l:i18n>
</xsl:stylesheet>
--- debian-handbook-6.0+20121031/build/dblatex/eyrolles.xsl 1970-01-01
00:00:00.000000000 +0000
+++ debian-handbook-7.20140126~deb7u1/build/dblatex/eyrolles.xsl
2014-01-26 20:41:04.000000000 +0000
@@ -0,0 +1,50 @@
+<?xml version="1.0" ?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+ xmlns:m="http://www.w3.org/1998/Math/MathML";
+ version="1.0">
+
+<!-- Disable babel for a try
+<xsl:param name="latex.babel.use">0</xsl:param>
+-->
+
+<!-- Paper size wanted by Eyrolles -->
+<xsl:param name="full.bleed" select="1"/>
+<xsl:param name="page.width">19.00cm</xsl:param>
+<xsl:param name="page.height">23.00cm</xsl:param>
+<xsl:param name="page.margin.inner">2cm</xsl:param> <!-- left -->
+<xsl:param name="page.margin.outer">2cm</xsl:param> <!-- right -->
+<xsl:param name="page.margin.top">1.3cm</xsl:param>
+<xsl:param name="page.margin.bottom">1.3cm</xsl:param>
+
+<!-- In Full-bleed mode, add crop margins of 0.25" (0.63cm) around
+actual page. By default the page is centered as required in this mode.
+-->
+<xsl:param name="crop.marks">
+ <xsl:if test="$full.bleed != 0">
+ <xsl:text>1</xsl:text>
+ </xsl:if>
+ <xsl:if test="not($full.bleed != 0)">
+ <xsl:text>0</xsl:text>
+ </xsl:if>
+</xsl:param>
+<xsl:param name="crop.mode">cam</xsl:param>
+
+<xsl:param name="crop.page.width">
+ <xsl:if test="$full.bleed != 0">
+ <xsl:variable name="paper.width"
+ select="number(translate($page.width,'cm','
+'))+1"/>
+ <xsl:value-of select="concat(string($paper.width), 'cm')"/>
+ </xsl:if>
+</xsl:param>
+
+<xsl:param name="crop.page.height">
+ <xsl:if test="$full.bleed != 0">
+ <xsl:variable name="paper.height"
+ select="number(translate($page.height,'cm','
+'))+1"/>
+ <xsl:value-of select="concat(string($paper.height), 'cm')"/>
+ </xsl:if>
+</xsl:param>
+
+</xsl:stylesheet>
--- debian-handbook-6.0+20121031/build/dblatex/librement.sty 2012-11-09
16:10:28.000000000 +0000
+++ debian-handbook-7.20140126~deb7u1/build/dblatex/librement.sty
2014-01-26 20:41:04.000000000 +0000
@@ -40,11 +40,21 @@
%% Use only the basic dblatex LaTeX commands for more freedom
\usepackage{dbk_core}
+% Don't add extra spacing for lists
+\setlist[itemize]{itemsep=0pt,topsep=0pt}
+\setlist[enumerate]{itemsep=0pt,topsep=0pt}
+
% Default page setup if not already done by geometry
\@ifpackageloaded{geometry}{}{
\usepackage{geometry}[includeheadfoot,right=1.3cm,left=1.6cm,top=1.3cm,bottom=1.3cm,]
}
+% Configure babel french settings
+\@ifundefined{frenchbsetup}{
+}{
+ \frenchbsetup{StandardLayout,StandardLists,AutoSpacePunctuation=false}
+}
+
\newcommand\outermargin{\dimexpr 1in + \oddsidemargin \relax}
\newcommand\innermargin{\dimexpr 1in + \evensidemargin \relax}
@@ -89,7 +99,7 @@
\stdmaketitle
\noindent
\textbf{\DBKtitle \\}
- \ifx\DBKauthor\empty\else{by \DBKauthor \\}\fi
+ \ifx\DBKauthor\empty\else{\DBKauthor \\}\fi
\hspace{0pt}\\
%\ifthenelse{\equal{\DBKedition}{}}{}{Edition \DBKedition \\}
\ifthenelse{\equal{\DBKpubdate}{}}{}{Published \DBKpubdate \\}
@@ -145,13 +155,13 @@
\rput(-\outermargin,0){%
\psline[linewidth=0.4pt](-5mm,0)(\pgnboffset,0)
\psline[linewidth=0.4pt](-5mm,-0.3mm)(\pgnboffset,-0.3mm)
- \Rput[r](\pgnboffset,-3mm){\foliofont\thepage}
+ \Rput[r](\pgnboffset,-2.5mm){\foliofont\thepage}
\psline[linewidth=0.4pt](-5mm,-5mm)(\pgnboffset,-5mm)
\psline[linewidth=0.4pt](-5mm,-5.3mm)(\pgnboffset,-5.3mm)
\ifdefined\DBKtitle
- \Rput[l](\footertxtoffset,-3mm){\footfont \DBKtitle}
+ \Rput[l](\footertxtoffset,-2.5mm){\footfont \DBKtitle}
\else
- \Rput[l](\footertxtoffset,-3mm){\footfont Book title undefined!}
+ \Rput[l](\footertxtoffset,-2.5mm){\footfont Book title undefined!}
\fi
}
}
@@ -159,10 +169,10 @@
\rput(\outermargin,0){%
\psline[linewidth=0.4pt](5mm,0)(-\pgnboffset,0)
\psline[linewidth=0.4pt](5mm,-0.3mm)(-\pgnboffset,-0.3mm)
- \Rput[l](-\pgnboffset,-3mm){\foliofont\thepage}
+ \Rput[l](-\pgnboffset,-2.5mm){\foliofont\thepage}
\psline[linewidth=0.4pt](5mm,-5mm)(-\pgnboffset,-5mm)
\psline[linewidth=0.4pt](5mm,-5.3mm)(-\pgnboffset,-5.3mm)
- \Rput[r](-\footertxtoffset,-3mm){\footfont \chaptertitle{}}
+ \Rput[r](-\footertxtoffset,-2.5mm){\footfont \chaptertitle{}}
}
}
}
@@ -173,13 +183,13 @@
\rput(-\outermargin,0){%
\psline[linewidth=0.4pt](-5mm,0)(\pgnboffset,0)
\psline[linewidth=0.4pt](-5mm,-0.3mm)(\pgnboffset,-0.3mm)
- \Rput[r](\pgnboffset,-3mm){\foliofont\thepage}
+ \Rput[r](\pgnboffset,-2.5mm){\foliofont\thepage}
\psline[linewidth=0.4pt](-5mm,-5mm)(\pgnboffset,-5mm)
\psline[linewidth=0.4pt](-5mm,-5.3mm)(\pgnboffset,-5.3mm)
\ifdefined\DBKtitle
- \Rput[l](\footertxtoffset,-3mm){\footfont \DBKtitle}
+ \Rput[l](\footertxtoffset,-2.5mm){\footfont \DBKtitle}
\else
- \Rput[l](\footertxtoffset,-3mm){\footfont Book title undefined!}
+ \Rput[l](\footertxtoffset,-2.5mm){\footfont Book title undefined!}
\fi
}
}
@@ -187,13 +197,13 @@
\rput(\outermargin,0){%
\psline[linewidth=0.4pt](5mm,0)(-\pgnboffset,0)
\psline[linewidth=0.4pt](5mm,-0.3mm)(-\pgnboffset,-0.3mm)
- \Rput[l](-\pgnboffset,-3mm){\foliofont\thepage}
+ \Rput[l](-\pgnboffset,-2.5mm){\foliofont\thepage}
\psline[linewidth=0.4pt](5mm,-5mm)(-\pgnboffset,-5mm)
\psline[linewidth=0.4pt](5mm,-5.3mm)(-\pgnboffset,-5.3mm)
\ifnum\c@chapter=0
- \Rput[r](-\footertxtoffset,-3mm){\footfont \chaptertitle{}}
+ \Rput[r](-\footertxtoffset,-2.5mm){\footfont \chaptertitle{}}
\else
- \Rput[r](-\footertxtoffset,-3mm){\footfont \@chapapp{} \thechapter{} —
\chaptertitle{}}
+ \Rput[r](-\footertxtoffset,-2.5mm){\footfont \@chapapp{} \thechapter{}
— \chaptertitle{}}
\fi
}
}
@@ -352,6 +362,7 @@
}
% Workaround pour un bogue de dblatex ?
+\floatstyle{plaintop}
\newfloat{example}{ht}{loe}[chapter]
\floatname{example}{\examplename}
%%%\newenvironment{example}{}{}
@@ -376,7 +387,7 @@
% couleur
\usepackage{xcolor}
-\definecolor{textgray}{gray}{.6}
+\definecolor{textgray}{gray}{.4}
% chapos
\def\@highlights{}
@@ -502,10 +513,10 @@
\fontspec[Mapping=tex-text]{DejaVu Sans}}%
}
\newcommand\foliofont{%
-\sffamily \fontsize{6}{8}\selectfont%
+\sffamily \fontsize{7}{9}\selectfont%
}
\newcommand\footfont{%
-\sffamily \fontsize{6}{8}\selectfont%
+\sffamily \fontsize{7}{9}\selectfont%
}
%
\newcommand\literal[1]{%
@@ -728,7 +739,7 @@
}\par
\kern-59pt
\sbox\Freeb@xa{%
- \begin{minipage}[t]{\dimexpr \linewidth-\wd\Freeb@xa-1cm}
+ \begin{minipage}[t]{\dimexpr \linewidth-\wd\Freeb@xa-1.5cm}
\raggedleft\chapterfont\strut #1\strut
\end{minipage}
}
@@ -807,7 +818,7 @@
}\par
\kern-59pt
\sbox\Freeb@xa{%
- \begin{minipage}[t]{\dimexpr \linewidth-\wd\Freeb@xa-1cm}
+ \begin{minipage}[t]{\dimexpr \linewidth-\wd\Freeb@xa-1.5cm}
\raggedleft \chapterfont \strut #1 \strut
\end{minipage}
}
--- debian-handbook-6.0+20121031/build/dblatex/librement.xsl 2012-11-09
16:10:28.000000000 +0000
+++ debian-handbook-7.20140126~deb7u1/build/dblatex/librement.xsl
2014-01-26 20:41:04.000000000 +0000
@@ -21,6 +21,8 @@
<xsl:template name="user.params.set">
<xsl:apply-imports />
+ <xsl:text>\widowpenalty=10000 </xsl:text>
+ <xsl:text>\clubpenalty=10000 </xsl:text>
<xsl:if test="$figure.emptypage">
<xsl:text>\def\DBKEmptyPagePicture{</xsl:text>
<xsl:value-of select="$figure.emptypage" />
@@ -102,4 +104,16 @@
<xsl:text>}</xsl:text>
</xsl:template>
+<xsl:template match="*" mode="pagenumber.markup">
+ <xsl:text>\pageref*{</xsl:text>
+ <xsl:value-of select="(@id|@xml:id)[1]"/>
+ <xsl:text>}</xsl:text>
+</xsl:template>
+
+<xsl:template match="*" mode="page.citation">
+<xsl:text> {\color{textgray} </xsl:text>
+<xsl:apply-imports />
+<xsl:text>}</xsl:text>
+</xsl:template>
+
</xsl:stylesheet>
--- debian-handbook-6.0+20121031/build/epub/tdah.css 2012-11-09
16:10:28.000000000 +0000
+++ debian-handbook-7.20140126~deb7u1/build/epub/tdah.css 2014-01-26
20:41:04.000000000 +0000
@@ -27,9 +27,7 @@
/* Styles of sidebars */
hr.delimit-sidebar {
- /* Old readers with limited CSS knowledge will display them
- * while modern readers will hide them but will show the improved
- * CSS. */
+ /* Those horizantal rules are for the Kindle only */
display: none;
}
@@ -55,3 +53,29 @@
margin-top: 0;
}
+/* Styles for Kindle's Mobipocket (e-ink reader) */
+@media amzn-mobi {
+ hr.delimit-sidebar {
+ display: block;
+ }
+ div.sidebar {
+ border-left: 1px solid black;
+ margin-left: 5%;
+ padding: 5px;
+ }
+ div.sidebar-title {
+ border-bottom: 0px;
+ text-align: center;
+ text-indent: 0;
+ }
+ p {
+ text-indent: 0;
+ margin-top: 0.5em;
+ }
+ p.title {
+ margin-top: 0;
+ }
+ div.section {
+ margin-top: 0.5em;
+ }
+}
--- debian-handbook-6.0+20121031/build/epub/tdah-mobi.xsl 1970-01-01
00:00:00.000000000 +0000
+++ debian-handbook-7.20140126~deb7u1/build/epub/tdah-mobi.xsl 2014-01-26
20:41:04.000000000 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+ xmlns="http://www.w3.org/1999/xhtml";
+ version="1.0">
+
+<xsl:import href="tdah-epub.xsl" />
+
+<!-- Parameters -->
+<xsl:param name="make.clean.html">0</xsl:param>
+
+</xsl:stylesheet>
--- debian-handbook-6.0+20121031/build/epub/tdah-plain.css 2012-11-09
16:10:28.000000000 +0000
+++ debian-handbook-7.20140126~deb7u1/build/epub/tdah-plain.css 1970-01-01
00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-/**** docbook.css embedded ****/
-.formalpara-title, span.msgmain-title, span.msgsub-title, span.msgrel-title,
span.msglevel-title, span.msgorig-title, span.msgaud-title,
span.msgexplan-title {
- font-weight: bold;
-}
-
-div.blockquote-title {
- font-weight: bold;
- margin-top: 1em;
- margin-bottom: 1em;
-}
-
-div.msglevel, div.msgorig, div.msgaud, div.msgexplan {
- margin-top: 1em;
- margin-bottom: 1em;
-}
-
-div.screen, div.programlisting, div.synopsis {
- white-space: pre;
- font-family: monospace;
-}
-
-div.figure-title, div.example-title, div.equation-title, div.table-title,
div.sidebar-title {
- font-weight: bold;
-}
-
-/**** Specific to TDAH ****/
-/* Styles of sidebars */
-hr.delimit-sidebar {
- margin-bottom: 0;
- margin-top: 0;
-}
-
-div.sidebar {
- padding: 5px;
- font-size: 90%;
- border-left: 1px solid black;
-}
-
-div.sidebar-title {
- font-weight: bold;
- text-align: center;
- text-indent: 0;
-}
-
-/* Styles of block URLs */
-div.url {
- margin-top: 0.5em;
-}
--- debian-handbook-6.0+20121031/build/README 1970-01-01 00:00:00.000000000
+0000
+++ debian-handbook-7.20140126~deb7u1/build/README 2014-01-26
20:41:04.000000000 +0000
@@ -0,0 +1,12 @@
+The various scripts are relatively self-explanatory.
+
+Howto build the book published by Eyrolles:
+$ ./build/build-pdf --opts="-p dblatex/eyrolles.xsl" --lang=fr-FR
+
+Howto build the PDF for lulu.com:
+$ ./build/build-pdf --opts="-P full.bleed=1" --lang=en-US
+
+TODO
+----
+- Improve librement.sty / dblatex so that frenchb does not try to add
+ spaces before punctuation in "lstcode" environments
--- debian-handbook-6.0+20121031/debian/changelog 2012-11-09
16:10:28.000000000 +0000
+++ debian-handbook-7.20140126~deb7u1/debian/changelog 2014-01-26
20:41:04.000000000 +0000
@@ -1,3 +1,64 @@
+debian-handbook (7.20140126~deb7u1) stable; urgency=medium
+
+ * Upload to stable so that the version in wheezy actually documents Wheezy.
+
+ -- Raphaël Hertzog <hert...@debian.org> Sun, 26 Jan 2014 21:39:08 +0100
+
+debian-handbook (7.20140126) unstable; urgency=medium
+
+ * Fix typo publicicy -> publicity. Closes: #734883
+ * Other misc typo and markup fixes.
+
+ -- Raphaël Hertzog <hert...@debian.org> Sun, 26 Jan 2014 21:29:20 +0100
+
+debian-handbook (7.20131230) unstable; urgency=low
+
+ [ Philipp Kern ]
+ * Restructure the section about IPv6 and document IPv6 privacy extensions.
+ * Update OS -> Debian architectures mapping in chapter 3.
+
+ [ Raphaël Hertzog ]
+ * In chapter 15, replace reference to APT chapter with an xref.
+ Closes: #681720 Thanks to Daniele Forsi for the patch.
+ * Document multi-arch support. Closes: #675458
+ * Chapter 6 (APT):
+ - use codenames instead of suites and explain why we made that choice.
+ Closes: #672488
+ - document sources.list for users of testing/unstable. Closes: #675521
+ - document approx/apt-cacher as proxy cache for APT repositories
+ - document unattended-upgrades as a way to auto-install some updates
+ * Chapter 8 (basic configuration):
+ - update information about locate/updatedb. Closes: #675943
+ - document the Windows registry key to get it to consider the
+ clock as UTC. Closes: #686634
+ - update section about custom kernel to no longer mention
+ kernel-package but “make deb-pkg”
+ - indicate how to create “System connections” with Network Manager
+ * Chapter 9 (Unix services):
+ - de-emphasize telnet, rsh and other obsolete protocols. Closes: #681412
+ - drop section about APM
+ - drop section about PCMCIA
+ * Chapter 11 (Network services):
+ - update LDAP configuration method to rely on cn=config integrated
+ configuration method. Closes: #672511
+ - smbmount is replaced by mount -t cifs. Closes: #696893
+ - CIFS is not the successor of SMB but rather a synonym.
+ Closes: #700168 Thanks to Reinier Olislagers for the patch.
+
+ [ Roland Mas ]
+ * Chapter 3: rephrase paragraph about AppleTalk and Netatalk (closes:
+ #681399).
+ * Chapter 4: update location of Synaptic in Gnome menus (closes:
+ #718470).
+ * Chapter 13: mention LXDE in the "XFCE and others" section (closes:
+ #696892).
+ * Chapter 13: KOffice is now Calligra Suite (closes: #696894).
+ * Chapter 13: Document current workings of the gdm3 configuration
+ (closes: #699926).
+ * Chapter 13: Document proper way of running Wine (closes: #674980).
+
+ -- Raphaël Hertzog <hert...@debian.org> Mon, 30 Dec 2013 10:36:25 +0100
+
debian-handbook (6.0+20121031) unstable; urgency=low
* Minor corrections:
@@ -14,6 +75,7 @@
- kwm is now kwin. Closes: #673733
Thank you to Christopher Wellons for all this.
- typos spotted by Raúl Benencia. Closes: #675508
+ - duplicate words spotted by Richard Nienaber. Closes: #692223
* Replace "lead" by "led" where appropriate. Closes: #672976
Thanks to Jim Hill <gjth...@gmail.com> for the patch.
* Misc improvements suggested by "Francesco Poli (wintermute)"
--- debian-handbook-6.0+20121031/debian/control 2012-11-09 16:10:28.000000000
+0000
+++ debian-handbook-7.20140126~deb7u1/debian/control 2014-01-26
20:41:04.000000000 +0000
@@ -2,8 +2,10 @@
Section: doc
Priority: optional
Maintainer: Raphaël Hertzog <hert...@debian.org>
-Build-Depends: debhelper (>= 9), publican, publican-debian, dbtoepub, dblatex
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9), publican, publican-debian, dbtoepub,
+ dblatex, texlive-xetex, fonts-linuxlibertine, texlive-pstricks,
+ fonts-sil-gentium-basic
+Standards-Version: 3.9.5
Homepage: http://debian-handbook.info
Vcs-Git: git://anonscm.debian.org/debian-handbook/debian-handbook.git
Vcs-Browser:
http://anonscm.debian.org/gitweb/?p=debian-handbook/debian-handbook.git;a=summary
@@ -25,5 +27,5 @@
The Debian Administrator's Handbook has been written by two Debian
developers — Raphaël Hertzog and Roland Mas.
.
- This package contains the English book covering Debian 6.0 “Squeeze”. All
+ This package contains the English book covering Debian 7 “Wheezy”. All
the files are available in /usr/share/doc/debian-handbook/.
--- debian-handbook-6.0+20121031/debian/copyright 2012-11-09
16:10:28.000000000 +0000
+++ debian-handbook-7.20140126~deb7u1/debian/copyright 2014-01-26
20:41:04.000000000 +0000
@@ -3,9 +3,9 @@
Upstream-Contact: Raphaël Hertzog <hert...@debian.org>, Roland Mas
<lola...@debian.org>
Files: *
-Copyright: 2003-2012 Raphaël Hertzog <hert...@debian.org>
- 2006-2012 Roland Mas <lola...@debian.org>
- 2012 Freexian SARL
+Copyright: 2003-2013 Raphaël Hertzog <hert...@debian.org>
+ 2006-2013 Roland Mas <lola...@debian.org>
+ 2013 Freexian SARL
License: GPL-2.0+ or CC-BY-SA-3.0
License: GPL-2.0+
--- debian-handbook-6.0+20121031/debian/README.Debian 2012-11-09
16:10:28.000000000 +0000
+++ debian-handbook-7.20140126~deb7u1/debian/README.Debian 2014-01-26
20:41:04.000000000 +0000
@@ -9,6 +9,5 @@
http://debian-handbook.info/get/
Alternatively you can build those files from sources. Download the source
-package with "apt-get source debian-handbook" and run dblatex/build.sh
-to build the PDF version or epub/build.sh to build the EPUB version.
-
+package with "apt-get source debian-handbook" and run build/build-pdf
+to build the PDF version or build/build-epub to build the EPUB version.
--- debian-handbook-6.0+20121031/debian/rules 2012-11-09 16:10:28.000000000
+0000
+++ debian-handbook-7.20140126~deb7u1/debian/rules 2014-01-26
20:41:04.000000000 +0000
@@ -10,7 +10,7 @@
override_dh_auto_install:
mkdir -p $(DOCDIR)
- mv publish/en-US/Debian/6.0/html/debian-handbook $(DOCDIR)/html
+ mv publish/en-US/Debian/7/html/debian-handbook $(DOCDIR)/html
override_dh_auto_clean:
publican clean
--- debian-handbook-6.0+20121031/es-ES/README 1970-01-01 00:00:00.000000000
+0000
+++ debian-handbook-7.20140126~deb7u1/es-ES/README 2014-01-26
20:41:04.000000000 +0000
@@ -0,0 +1,27 @@
+README file of es-ES/Spanish translation.
+-------------------------------------------
+
+Current coordinator as of 2013-02-19: Iván Alemán (aleman.i...@gmail.com)
+
+Translators (Please send me your name and e-mail I will add you here!):
+
+ + Matías Bellone (matiasbellone+deb...@gmail.com)
+ + Marcos Mezo (mm...@selexco.net)
+
+
+If you would like to contribute to the Debian Handbook please subscribe to to
the mailing list found on:
+
+http://lists.alioth.debian.org/mailman/listinfo/debian-handbook-translators
+
+You may send your questions to this list about this translation or any other
concern that you may have about the book.
+
+
+Workflow:
+
+Currently most of the work is been done using the -weblate- tool
+(http://debian.weblate.org/projects/debian-handbook/) if you would like to work
+on the translation using the git repository please send a message to the list
+stating what chapter you would like to work on.
+
+
+[EOF]
--- debian-handbook-6.0+20121031/fa-IR/README 1970-01-01 00:00:00.000000000
+0000
+++ debian-handbook-7.20140126~deb7u1/fa-IR/README 2014-01-26
20:41:04.000000000 +0000
@@ -0,0 +1,29 @@
+In the name of Allah
+
+Current Coordinator: Sajjad Gerami (sajjad.ger...@gmail.com)
+
+Contributors (Translators, Editors etc,):
+ Sajjad Gerami (sajjad.ger...@gmail.com) [Coordination,
Translation, Editor]
+ Mahdi Gerami (mahdi.gerami...@gmail.com) [Translation, Editor]
+
+
+If you want to start translating new part please Email current coordinator
first. Feel free to provide typo fix and little changes.
+
+Please read the current translation and follow the current style of writing.
If you have sugesstion about the style please Email current coordinator.
+
+--------------------------------
+-------------
+-----------------------
+به نام خدا
+
+هماهنگ کننده فعلی: سجاد گرامی (sajjad.ger...@gmail.com)
+
+هم بخشگران:
+ سجاد گرامی (هماهنگ کننده، مترجم، ویراستار)
+ مهدی گرامی (مترجم، ویراستار)
+
+لطفا قبل از شروع ترجمه جهت هماهنگی با هماهنگ کننده فعلی ارتباط برقرار کنید.
برای ویراستاری های کوچک و اصلاحات جرئی لازم به هماهنگی نیازی نیست.
+
+لطفا از سبک ترجمه کتاب (قسمت های ترجمه شده) در ترجمه جدید خود پیروی کنید. اگر
پیشنهادی برای تغییر سبک ترجمه دارید لطفا با هماهنگ کننده فعلی در میان بگذارید.
+
+من الله توفیق
--- debian-handbook-6.0+20121031/fr-FR/README 1970-01-01 00:00:00.000000000
+0000
+++ debian-handbook-7.20140126~deb7u1/fr-FR/README 2014-01-26
20:41:04.000000000 +0000
@@ -0,0 +1,8 @@
+The French translation is coordinated by Raphaël Hertzog
+<hert...@debian.org> and Roland Mas <lola...@debian.org>.
+
+Historical notes
+----------------
+The initial French translation comes straight from the original book
+in French: « Debian Squeeze » in the collection « Cahiers de l'Admin »
+published by Eyrolles, authored by Raphaël and Roland.
--- debian-handbook-6.0+20121031/hr-HR/README 1970-01-01 00:00:00.000000000
+0000
+++ debian-handbook-7.20140126~deb7u1/hr-HR/README 2014-01-26
20:41:04.000000000 +0000
@@ -0,0 +1,11 @@
+This is hr-HR readme file
+-------------------------
+In order to coordinate the work on the hr-HR branch please subscribe first
+to the mailing list:
http://lists.alioth.debian.org/mailman/listinfo/debian-handbook-translators
+
+Then contact the current coordinator / translator (2013-04-03): Dag Velovic
<dag.velo...@gmail.com>
+Currently I am the only member of hr-HR translator team.
+Hope this will change soon.
+
+Brgds,
+Dag
\ Pas de fin de ligne à la fin du fichier
--- debian-handbook-6.0+20121031/id-ID/README 1970-01-01 00:00:00.000000000
+0000
+++ debian-handbook-7.20140126~deb7u1/id-ID/README 2014-01-26
20:41:04.000000000 +0000
@@ -0,0 +1,124 @@
+[English]
+Indonesian Translation
+
+The translation is managed git
+
+If you want to participate, join the debian-l10n-portuguese mailing list
+(indonesian):
+* http://lists.debian.org/debian-l10n-indonesian/
+and contact us to have your name added to the translators list.
+
+You should also join the debian-handbook-translators mailing list
+(english only):
+* http://lists.alioth.debian.org/mailman/listinfo/debian-handbook-translators
+
+If you have any questions, ask them first in the debian-l10n-indonesian
+mailing list. If your question is not answered, then you should ask in the
+debian-handbook-translators mailing list.
+
+Translation coordinator: Zaki Akhmad <z...@students.ee.itb.ac.id>
+
+Translators:
+ Zaki Akhmad <z...@students.ee.itb.ac.id>
+
+The first target of the translation is to finish translate Chapter 1.
+
+On March 1st, 2013, I released the Debian Handbook with translated Chapter 1.
+This is a testing release. You may get the book here:
+
+* PDF:
http://za.cindai.web.id/debian/debian-handbook/id/20130301/debian-handbook.pdf
+* epub:
http://za.cindai.web.id/debian/debian-handbook/id/20130301/debian-handbook.epub
+
+You can read my preface for this release here:
+*
http://blogs.itb.ac.id/zakiakhmad/2013/03/01/rilis-debian-handbook-bahasa-indonesia-bab-1/
+
+Following are terms which is intentionally not translated:
+
+* DFSG
+* Debian Maintainer
+* Debian Policy
+* autobuilders
+* bug
+* compile
+* copyleft
+* copyright
+* debian maintainer
+* driver
+* firmware
+* install
+* main (dalam konteks nama kategori atau bagian paket debian)
+* non-free
+* patch
+* proprietary
+* script
+* severity
+* stable
+* testing
+* unstable
+* upstream
+* wishlist (severity level)
+* working copy (dalam konteks CVS)
+
+---------------------------------
+
+[Bahasa Indonesia]
+Penerjemahan ke Bahasa Indonesia
+
+Penerjemahan ini menggunakan git
+
+Jika Anda ingin berpartisipasi, silakan gabung di milis debian-l10n-indonesian:
+* http://lists.debian.org/debian-l10n-indonesian/
+dan kontak kami jika Anda ingin nama Anda ditambahkan pada daftar penerjemah.
+
+Anda juga sebaiknya gabung di milis penerjemah buku pegangan Debian
+(hanya Bahasa Inggris):
+* http://lists.alioth.debian.org/mailman/listinfo/debian-handbook-translators
+
+Jika Anda memiliki pertanyaan, silakan tanya lebih dulu pada milis
+debian-l10n-indonesian. Jika pertanyaan Anda belum terjawab, silakan Anda
+bertanya pada milis penerjemah buku pegangan Debian
+
+Koordinator penerjemah: Zaki Akhmad <z...@students.ee.itb.ac.id>
+
+Penerjemah:
+ Zaki Akhmad <z...@students.ee.itb.ac.id>
+
+Target pertama penerjemahan ini adalah menerjemahkan Bab 1 dengan baik dengan
+memperhatikan konteks penerjemahan.
+
+Pada tanggal 1 Maret 2013, saya putuskan untuk merilis Debian Handbook dengan
+Bab 1 yang sudah rapi diterjemahkan. Rilis ini saya sebut rilis testing. Rilis
+ini dapat diunduh di:
+
+* PDF:
http://za.cindai.web.id/debian/debian-handbook/id/20130301/debian-handbook.pdf
+* epub:
http://za.cindai.web.id/debian/debian-handbook/id/20130301/debian-handbook.epub
+
+Untuk kata pengantar saya pada rilis ini dapat dibaca di:
+*
http://blogs.itb.ac.id/zakiakhmad/2013/03/01/rilis-debian-handbook-bahasa-indonesia-bab-1/
+
+Berikut beberapa istilah yang sengaja tidak diterjemahkan:
+
+* DFSG
+* Debian Maintainer
+* Debian Policy
+* autobuilders
+* bug
+* compile
+* copyleft
+* copyright
+* debian maintainer
+* driver
+* firmware
+* install
+* main (dalam konteks nama kategori atau bagian paket debian)
+* non-free
+* patch
+* proprietary
+* script
+* severity
+* stable
+* testing
+* unstable
+* upstream
+* wishlist (severity level)
+* working copy (dalam konteks CVS)
--- debian-handbook-6.0+20121031/it-IT/README 2012-11-09 16:10:28.000000000
+0000
+++ debian-handbook-7.20140126~deb7u1/it-IT/README 2014-01-26
20:41:04.000000000 +0000
@@ -1,16 +1,51 @@
README about Italian translation
+
+The Debian Italian localization team originally started a translation of
+the Debian Handbook. The original members of the project are stated
+below.
+
+Any other translation work done through the Weblate interface is not to
+be considered a work of the Debian Italian Localization Team.
+
+As of 20131102 these files have been translated/reviewed and uploaded by
+the Debian Italian l10n Team:
+
+00a_preface.po
+00b_foreword.po
+01_the-debian-project.po
+02_case-study.po
+03_existing-setup.po
+04_installation.po
+05_packaging-system.po
+06_apt.po
+07_solving-problems.po
+09_unix-services.po
+11_network-services.po
+12_advanced-administration.po
+13_workstation.po
+14_security.po
+15_debian-packaging.po
+70_conclusion.po
+90_derivative-distributions.po
+Book_Info.po
+
+-----
+The original members of the Debian Handbook translation project of the
+Debian Italian l10n Team and the original instructions for the project were:
+
Current coordinator (2012-05-24): Giuseppe Sacco
Translators:
- Calogero Lo Leggio <ka...@nerdrug.org>
- Daniele Forsi <dfo...@gmail.com>
- Dario <dario.j...@gmail.com>
- Dario Santamaria <dario.santama...@gmail.com>
- Eugenio Racine <eugen...@racine.ra.it>
- Gabriele 'LightKnight' Stilli <superenz...@libero.it>
- Giulio Turetta <giu...@sviluppoweb.eu>
- Giuseppe Sacco <eppes...@debian.org>
- Michele Abbondanza <mich...@usthere.com>
- Paride Desimone <h...@autistici.org>
+ Calogero Lo Leggio <ka...@nerdrug.org> (.pos 4, 15)
+ Daniele Forsi <dfo...@gmail.com> (.pos 2, 3, 5)
+ Dario <dario.j...@gmail.com> (.po 70)
+ Dario Santamaria <dario.santama...@gmail.com> (.pos 14, 92)
+ Eugenio Racine <eugen...@racine.ra.it> (.pos 00a, 00b, 01)
+ Gabriele 'LightKnight' Stilli <superenz...@libero.it> (.pos 07, 12, 13)
+ Giulio Turetta <giu...@sviluppoweb.eu> (.po 11)
+ Innocenzo Ventre <<innocenzo.ven...@gmail.com> (.pos 9, 10)
+ Giuseppe Sacco <eppes...@debian.org> (.po 8)
+ Michele Abbondanza <mich...@usthere.com> (.po 6)
+ Paride Desimone <h...@autistici.org> (.po 90, Book_Info)
Stefano Canepa <s...@linux.it>
If you would like to participate contact debian-l10n-ital...@lists.debian.org
@@ -20,3 +55,4 @@
to the list t...@linux.it and asking for review.
Questions? Ask them on debian-l10n-italian mailing list.
+------
--- debian-handbook-6.0+20121031/ja-JP/README 1970-01-01 00:00:00.000000000
+0000
+++ debian-handbook-7.20140126~deb7u1/ja-JP/README 2014-01-26
20:41:04.000000000 +0000
@@ -0,0 +1,3 @@
+# README about Japanese translation
+
+* Current coordinator: "Yuya.Nishida." <yuy...@atj96.org> @nishidayuya
--- debian-handbook-6.0+20121031/misc-scripts/aggregate-mailing-list-stats.pl
1970-01-01 00:00:00.000000000 +0000
+++
debian-handbook-7.20140126~deb7u1/misc-scripts/aggregate-mailing-list-stats.pl
2014-01-26 20:41:04.000000000 +0000
@@ -0,0 +1,77 @@
+#! /usr/bin/perl
+
+# To operate over a set of *.members and *.traffic files
+# Ask #debian-lists (formorer) for them if update is needed
+# They're the source used for generating https://lists.debian.org/stats/
+
+foreach (<*.members>) {
+ next if /REMOVED/;
+ next if /DISABLED/;
+ next if /private/;
+ next unless /^debian/;
+ s/.members$//;
+ push @lists, $_
+}
+
+# @lists = "debian-devel";
+
+foreach $list (@lists) {
+ next unless -e "$list.traffic";
+
+ open M, "$list.members";
+ while ($l = <M>) {
+ chomp $l;
+
+ ($a, $b) = split (/\s+/, $l);
+ $members{$list}{$a} = $b;
+ }
+
+ open T, "$list.traffic";
+ while ($l = <T>) {
+ chomp $l;
+
+ ($a, $b) = split (/\s+/, $l);
+ $traffic{$list}{$a} = $b;
+ }
+
+ ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+
+ $fmt = "%04d%02d";
+ $year += 1900;
+ if ($mon == 0) { # January
+ $firstmonth = sprintf($fmt, $year -1, 1);
+ $lastmonth = sprintf($fmt, $year -1, 12);
+ } else {
+ $firstmonth = sprintf($fmt, $year -1, $mon +1);
+ $lastmonth = sprintf($fmt, $year, $mon);
+ }
+
+ foreach $month ($firstmonth..$lastmonth) {
+ next unless $month =~ /0[1-9]$/ or $month =~ /1[012]$/ ;
+ $total_members += $members{$list}{$month};
+ $total_traffic_in += $traffic{$list}{$month};
+ $total_traffic_out += $traffic{$list}{$month} * $members{$list}{$month};
+ }
+}
+
+print "lists: ".($#lists+1)."\n";
+# print "total members: $total_members\n";
+$avg_members = $total_members / 12;
+printf "average members: %.1f\n", $avg_members;
+
+print "\n";
+
+printf "total traffic_in: %d\n", $total_traffic_in;
+$avg_traffic_in_monthly = $total_traffic_in / 12;
+printf "average traffic_in_monthly: %.1f\n", $avg_traffic_in_monthly;
+$avg_traffic_in_daily = $total_traffic_in / 365;
+printf "average traffic_in_daily: %.1f\n", $avg_traffic_in_daily;
+
+print "\n";
+
+printf "total traffic_out: %d\n", $total_traffic_out;
+$avg_traffic_out_monthly = $total_traffic_out / 12;
+printf "average traffic_out_monthly: %.1f\n", $avg_traffic_out_monthly;
+$avg_traffic_out_daily = $total_traffic_out / 365;
+printf "average traffic_out_daily: %.1f\n", $avg_traffic_out_daily;
+
--- debian-handbook-6.0+20121031/pl-PL/README 1970-01-01 00:00:00.000000000
+0000
+++ debian-handbook-7.20140126~deb7u1/pl-PL/README 2014-01-26
20:41:04.000000000 +0000
@@ -0,0 +1,19 @@
+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+ The Debian Administrator's Handbook - Polish translation
+
+
+ coordinator: Mateusz Kacprzak <mateusz.kacpr...@yandex.ru>
+ translators: Mateusz Szymański
+
+
+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+ Podręcznik Administratora Debiana - Polskie tłumaczenie
+
+
+ koordynator: Mateusz Kacprzak <mateusz.kacpr...@yandex.ru>
+ tłumacze: Mateusz Szymański
+
+
+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
\ Pas de fin de ligne à la fin du fichier
--- debian-handbook-6.0+20121031/publican.cfg 2012-11-09 16:10:28.000000000
+0000
+++ debian-handbook-7.20140126~deb7u1/publican.cfg 2014-01-26
20:41:04.000000000 +0000
@@ -7,3 +7,4 @@
docname: debian-handbook
prod_url: http://www.debian.org
doc_url: http://debian-handbook.info
+condition: none
--- debian-handbook-6.0+20121031/publican-pdf.cfg 1970-01-01
00:00:00.000000000 +0000
+++ debian-handbook-7.20140126~deb7u1/publican-pdf.cfg 2014-01-26
20:41:04.000000000 +0000
@@ -0,0 +1,10 @@
+# Config::Simple 4.59
+# Fri Apr 2 10:31:14 2010
+
+xml_lang: en-US
+type: Book
+brand: debian
+docname: debian-handbook
+prod_url: http://www.debian.org
+doc_url: http://debian-handbook.info
+condition: pdf
--- debian-handbook-6.0+20121031/README.git 2012-11-09 16:10:28.000000000
+0000
+++ debian-handbook-7.20140126~deb7u1/README.git 2014-01-26
20:41:04.000000000 +0000
@@ -75,7 +75,9 @@
Official branches
-----------------
-- master: development branch (currently targeting Wheezy)
+- master: development branch (currently targeting Jessie)
+- wheezy/master: main branch for the version targeting Wheezy
+- wheezy/print-en: print version of the English book targeting Wheezy
- squeeze/master: main branch for the version targeting Squeeze
- squeeze/print: print version of the book targeting Squeeze
(based on squeeze/master but with supplementary markup to
--- debian-handbook-6.0+20121031/README.translators 2012-11-09
16:10:28.000000000 +0000
+++ debian-handbook-7.20140126~deb7u1/README.translators 2014-01-26
20:41:04.000000000 +0000
@@ -58,16 +58,16 @@
* zh-CN: Review of chapter 3
Take care to work on the most appropriate branch too. Currently
-it's "squeeze/master" since that's the stable maintenance branch
+it's "wheezy/master" since that's the stable maintenance branch
for the current release of the book. If you already have downloaded the
-repository, use "git checkout squeeze/master" to change the current
+repository, use "git checkout wheezy/master" to change the current
branch. Otherwise you can use one of those commands to clone the
repository and start on the correct branch:
Read-only anonymous access:
-$ git clone git://anonscm.debian.org/debian-handbook/debian-handbook.git -b
squeeze/master
+$ git clone git://anonscm.debian.org/debian-handbook/debian-handbook.git -b
wheezy/master
SSH access for contributors with Write access:
-$ git clone git+ssh://git.debian.org/git/debian-handbook/debian-handbook.git
-b squeeze/master
+$ git clone git+ssh://git.debian.org/git/debian-handbook/debian-handbook.git
-b wheezy/master
How to start a new translation
------------------------------
@@ -118,6 +118,16 @@
push your work directly or make it available to your translation
coordinator that will integrate it for you.
+If you use a plain text editor, please double check that you haven't
+broken the PO files. Here's an example checking
+pt-BR/01_the-debian-project.po where some issues are detected:
+
+$ msgfmt -c -o /dev/null --statistics pt-BR/01_the-debian-project.po
+pt-BR/01_the-debian-project.po:1432: 'msgid' and 'msgstr' entries do not both
end with '\n'
+msgfmt: found 1 fatal error
+348 translated messages, 100 fuzzy translations, 9 untranslated messages.
+$ msgcat pt-BR/01_the-debian-project.po >/dev/null
+
Translating pictures and schemas
--------------------------------
--- debian-handbook-6.0+20121031/ru-RU/readme 1970-01-01 00:00:00.000000000
+0000
+++ debian-handbook-7.20140126~deb7u1/ru-RU/readme 2014-01-26
20:41:04.000000000 +0000
@@ -0,0 +1,16 @@
+about russian translation
+
+current coordianor (2014-01-03): Dmitry Mikhirev <mikhi...@gmail.com>
+translators:
+sledopit <i...@irush.su>
+Alexander Naumov <posix...@gmail.com>
+Yaroslav Shevchenko <lazy.starw...@gmail.com>
+alexander barakin (aka sash-kan) <a...@barak.in>
+Dmitry Mikhirev <mikhi...@gmail.com>
+Mikhail Karpenko <veeg...@gmail.com>
+
+if you would like to participate contact any of:
+official ml: debian-handbook-translat...@lists.alioth.debian.org
+russian ml: debian-handbook...@googlegroups.com
+forum: http://unixforum.org/index.php?showtopic=131883
+
--- debian-handbook-6.0+20121031/ru-RU/translations 1970-01-01
00:00:00.000000000 +0000
+++ debian-handbook-7.20140126~deb7u1/ru-RU/translations 2014-01-26
20:41:04.000000000 +0000
@@ -0,0 +1,20 @@
+BACK TO BASICS К ОСНОВАМ
+TIP СОВЕТ
+HOWTO Практическое руководство
+BEHIND THE SCENE ЗА КУЛИСАМИ
+TOOL ИНСТРУМЕНТ
+NOTE ЗАМЕТКА
+GOING FURTHER УГЛУБЛЯЕМСЯ
+COMMUNITY СООБЩЕСТВО
+ALTERNATIVE АЛЬТЕРНАТИВА
+HARDWARE АППАРАТНОЕ ОБЕСПЕЧЕНИЕ
+QUICK LOOK КРАТКИЙ ЭКСКУРС
+BEWARE ОСТОРОЖНО
+
+directory каталог
+log журнал
+legacy традиционный
+patch заплата
+distribution сборка, дистрибутив
+script сценарий (оболочки)
+proprietary собственнический
