path: root/tickets/606d6165842d4005a0333617b62bb973/Maildir/new/1499101742.M152232P30452Q1.koom

Return-Path: <obnam-dev-bounces@obnam.org>
X-Original-To: distix@pieni.net
Delivered-To: distix@pieni.net
Received: from yaffle.pepperfish.net (yaffle.pepperfish.net [88.99.213.221])
	by pieni.net (Postfix) with ESMTPS id 6AF6C44E63
	for <distix@pieni.net>; Mon,  3 Jul 2017 17:06:43 +0000 (UTC)
Received: from platypus.pepperfish.net (unknown [10.112.101.20])
	by yaffle.pepperfish.net (Postfix) with ESMTP id 18ADB41C5D;
	Mon,  3 Jul 2017 18:06:43 +0100 (BST)
Received: from ip6-localhost.nat ([::1] helo=platypus.pepperfish.net)
	by platypus.pepperfish.net with esmtp (Exim 4.80 #2 (Debian))
	id 1dS4o7-0002mM-2C; Mon, 03 Jul 2017 18:06:43 +0100
Received: from [10.112.101.21] (helo=inmail2.pepperfish.net)
 by platypus.pepperfish.net with esmtps (Exim 4.80 #2 (Debian))
 id 1dS4o6-0002lz-9u
 for <obnam-dev@obnam.org>; Mon, 03 Jul 2017 18:06:42 +0100
Received: from mail-wm0-f44.google.com ([74.125.82.44])
 by inmail2.pepperfish.net with esmtps
 (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89)
 (envelope-from <remirampin@gmail.com>) id 1dS4o4-0001B4-7U
 for obnam-dev@obnam.org; Mon, 03 Jul 2017 18:06:42 +0100
Received: by mail-wm0-f44.google.com with SMTP id z75so39444394wmc.0
 for <obnam-dev@obnam.org>; Mon, 03 Jul 2017 10:06:34 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:cc:subject:date:message-id:in-reply-to:references
 :mime-version:content-transfer-encoding;
 bh=y72HGfoxZGYRVPhRZfXMpcnUj/xdFr+CPBfMMKR67oo=;
 b=ZGkh4WhffsM8TDNmbs/hKxaBFAiKu0Q9PH3shxbFzo1W1t3sAK4+0rpfupeZRTjZ7S
 pIk6g3TykyllQ8g9TUzS+1lLF9vVxqBxeqhmRuHRAHqX04vvm/5DaRmQQ8MH3OSn4YYu
 V2BF8UqzPEIT+gL8bP2WFvXBvp97B89FRbodzNSsMc98LfQVsvwXN7KXaOvQVOevEe6q
 lmhBiDx1s4oe7j57I7afXFvWqq2MOAslHJgNkJ9eX1enZEZ4HCCZVk+v6vG8elfw4zY9
 Bwa9762V3WBZXbg4noAjJugG4WYGTGDl4AnaWKNwz32GRPTkqF6+qqRiCUga3Ab/i/+J
 9WcA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
 :references:mime-version:content-transfer-encoding;
 bh=y72HGfoxZGYRVPhRZfXMpcnUj/xdFr+CPBfMMKR67oo=;
 b=dheTe7Oe8SjFgFigeGF4z6yUebkoMwGblfGq1fDtdo1LPEXyUIhBUv0tYI2IrWAKGm
 5cQor8cv3oKSgZWngER+37ROpD7qTLujWu/zPLiet8XnjIhgFcdu+aEekXNQo6e2fkqZ
 6v8U5OzSFI4tdfKLzM/A0/072DnCQrpdDlFnTo7CjOD3fknqccvkBCa8rv4Ho0MILNSM
 ziP0w752e2k4ZMvff3yAXyaFI2bN4+s//HpXsMuUvoiXCeDC9yABNCbAte7S8zJuAwdH
 /J0gaLyJxlQlPwe8JR5FiizQpu2KkjQnYU6gKFD1iImadsTL6RM5+fPuSE2hFnjoieYg
 FGHA==
X-Gm-Message-State: AIVw110CGAEPPp9GJtBAA0uqmawP+TxVNcMpyyzBGUH9qP343AHjF0zY
 qCjoBFaeoLBjcoHa0Hs=
X-Received: by 10.28.173.65 with SMTP id w62mr8338105wme.113.1499101593661;
 Mon, 03 Jul 2017 10:06:33 -0700 (PDT)
Received: from localhost.localdomain (dibo.remram.fr. [163.172.87.43])
 by smtp.gmail.com with ESMTPSA id v102sm3745809wrc.53.2017.07.03.10.06.31
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Mon, 03 Jul 2017 10:06:32 -0700 (PDT)
From: Remi Rampin <remirampin@gmail.com>
To: obnam-dev@obnam.org
Date: Mon,  3 Jul 2017 13:06:30 -0400
Message-Id: <20170703170630.75410-1-remirampin@gmail.com>
X-Mailer: git-send-email 2.13.2
In-Reply-To: <6c89be1a-a926-4f55-cf08-26aee733555a@univpm.it>
References: <6c89be1a-a926-4f55-cf08-26aee733555a@univpm.it>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Pepperfish-Transaction: 9ec1-0da3-117e-a44f
X-Spam-Score: 1.5
X-Spam-Score-int: 15
X-Spam-Bar: +
X-Scanned-By: pepperfish.net, Mon, 03 Jul 2017 18:06:42 +0100
X-Spam-Report: Content analysis details: (1.5 points)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 1.0 PPF_FROM_CONTAINS_MAIL The From header contains 'mail'
 1.2 FREEMAIL_FROM Sender email is commonly abused enduser mail provider
 (remirampin[at]gmail.com)
 -1.9 BAYES_00               BODY: Bayes spam probability is 0 to 1%
 [score: 0.0000]
 0.1 PPF_SPLIT_TAG          RAW: Body contains a split HTML tag
 -0.3 PPF_FROM_UK RBL: A Received line involves an address from the UK
 [163.172.87.43 listed in gb.country.dnsbl.rjek.com]
 1.5 RCVD_IN_SORBS_SPAM     RBL: SORBS: sender is a spam source
 [74.125.82.44 listed in dnsbl.sorbs.net]
 -0.0 RCVD_IN_MSPIKE_H3      RBL: Good reputation (+3)
 [74.125.82.44 listed in wl.mailspike.net]
 -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature
 0.1 DKIM_SIGNED            Message has a DKIM or DK signature,
 not necessarily valid
 -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's
 domain
 -0.0 RCVD_IN_DNSWL_NONE     RBL: Sender listed at http://www.dnswl.org/, no
 trust [74.125.82.44 listed in list.dnswl.org]
 -0.0 RCVD_IN_MSPIKE_WL      Mailspike good senders
X-ACL-Warn: message may be spam
X-Scan-Signature: 3de4c979a0c51090f86c9464e0711d83
Cc: m.alessandrini@univpm.it
Subject: [PATCH] Use additional code from format-de* for all langs
X-BeenThere: obnam-dev@obnam.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Obnam development discussions <obnam-dev-obnam.org>
List-Unsubscribe: <http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-dev-obnam.org>,
 <mailto:obnam-dev-request@obnam.org?subject=unsubscribe>
List-Archive: <http://listmaster.pepperfish.net/pipermail/obnam-dev-obnam.org>
List-Post: <mailto:obnam-dev@obnam.org>
List-Help: <mailto:obnam-dev-request@obnam.org?subject=help>
List-Subscribe: <http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-dev-obnam.org>,
 <mailto:obnam-dev-request@obnam.org?subject=subscribe>
Sender: obnam-dev-bounces@obnam.org
Errors-To: obnam-dev-bounces@obnam.org

---
 manual/Makefile       | 35 ++++++++++++++++++++++-------------
 manual/format-de-html | 39 ---------------------------------------
 manual/format-de-pdf  | 38 --------------------------------------
 manual/format-html    |  7 +++++--
 manual/format-pdf     |  8 ++++++--
 5 files changed, 33 insertions(+), 94 deletions(-)
 delete mode 100755 manual/format-de-html
 delete mode 100755 manual/format-de-pdf

diff --git a/manual/Makefile b/manual/Makefile
index ac291953..b8c22cf5 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -18,8 +18,9 @@
 
 TITLE_EN = Backups with Obnam
 TITLE_DE = Backups mit Obnam
-TITLE_FR = Sauvegardes avec Obnam
 TRANS_DE = Übersetzung: Jan Niggemann (jn@hz6.de)
+TITLE_FR = Sauvegardes avec Obnam
+TRANS_FR = Traduction : Pierrick Martinez, Remi Rampin
 AUTHOR = Lars Wirzenius (liw@liw.fi)
 VERSION = Version $(shell git describe || python ../setup.py --version)
 
@@ -27,13 +28,13 @@ en_sources = $(shell ls en/*.mdwn)
 fr_sources = $(shell ls fr/*.mdwn)
 de_sources = $(shell ls de/*.mdwn)
 pdfs = \
-        obnam-manual.en.pdf \
+	obnam-manual.en.pdf \
 	obnam-manual.fr.pdf \
-        obnam-manual.de.pdf
+	obnam-manual.de.pdf
 htmls = \
-        obnam-manual.en.html \
+	obnam-manual.en.html \
 	obnam-manual.fr.html \
-        obnam-manual.de.html
+	obnam-manual.de.html
 
 all: html pdf
 
@@ -42,25 +43,33 @@ html: $(htmls)
 pdf: $(pdfs)
 
 obnam-manual.en.pdf: Makefile $(en_sources)
-	./format-pdf $@ "$(TITLE_EN)" "$(AUTHOR)" "$(VERSION)" $(en_sources)
+	./format-pdf $@ \
+		"$(TITLE_DE)" "$(AUTHOR)" "$(VERSION)" "english" "" \
+		$(en_sources)
 
 obnam-manual.en.html: Makefile $(en_sources) ../obnam.css
-	./format-html $@ "$(TITLE_EN)" "$(AUTHOR)" "$(VERSION)" $(en_sources)
+	./format-html $@ \
+		"$(TITLE_DE)" "$(AUTHOR)" "$(VERSION)" "english" "" \
+		$(en_sources)
 
 obnam-manual.fr.pdf: Makefile $(fr_sources)
-	./format-pdf $@ "$(TITLE_FR)" "$(AUTHOR)" "$(VERSION)" $(fr_sources)
+	./format-pdf $@ \
+		"$(TITLE_DE)" "$(AUTHOR)" "$(VERSION)" "french" "$(TRANS_FR)" \
+		$(fr_sources)
 
 obnam-manual.fr.html: Makefile $(fr_sources) ../obnam.css
-	./format-html $@ "$(TITLE_FR)" "$(AUTHOR)" "$(VERSION)" $(fr_sources)
+	./format-html $@ \
+		"$(TITLE_FR)" "$(AUTHOR)" "$(VERSION)" "french" "$(TRANS_FR)" \
+		$(fr_sources)
 
 obnam-manual.de.pdf: Makefile $(de_sources)
-	./format-de-pdf $@ \
-		"$(TITLE_DE)" "$(AUTHOR)" "$(VERSION)" "$(TRANS_DE)" \
+	./format-pdf $@ \
+		"$(TITLE_DE)" "$(AUTHOR)" "$(VERSION)" "german" "$(TRANS_DE)" \
 		$(de_sources)
 
 obnam-manual.de.html: Makefile $(de_sources) ../obnam.css
-	./format-de-html $@ \
-		"$(TITLE_DE)" "$(AUTHOR)" "$(VERSION)" "$(TRANS_DE)" \
+	./format-html $@ \
+		"$(TITLE_DE)" "$(AUTHOR)" "$(VERSION)" "german" "$(TRANS_DE)" \
 		$(de_sources)
 
 clean:
diff --git a/manual/format-de-html b/manual/format-de-html
deleted file mode 100755
index 5411942c..00000000
--- a/manual/format-de-html
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# Copyright 2014  Lars Wirzenius
-# Copyright 2014  Jan Niggemann
-#
-# 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 3 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, see <http://www.gnu.org/licenses/>.
-#
-# =*= License: GPL-3+ =*=
-
-set -eu
-
-OUTPUT="$1"
-TITLE="$2"
-AUTHOR="$3"
-VERSION="$4"
-TRANS_DE="$5"
-shift 5
-
-cat > 000.mdwn <<EOF
-% $TITLE
-% $AUTHOR
-  $TRANS_DE
-% $VERSION
-EOF
-
-pandoc  -H ../obnam.css --smart --toc --chapters --number-sections \
-    --standalone --self-contained -V lang=german -V geometry:a4paper \
-    -o "$OUTPUT" 000.mdwn "$@"
-rm -f 000.mdwn
diff --git a/manual/format-de-pdf b/manual/format-de-pdf
deleted file mode 100755
index 15ef78eb..00000000
--- a/manual/format-de-pdf
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-# Copyright 2014,2016  Lars Wirzenius
-# Copyright 2014,2017  Jan Niggemann
-#
-# 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 3 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, see <http://www.gnu.org/licenses/>.
-#
-# =*= License: GPL-3+ =*=
-
-set -eu
-
-OUTPUT="$1"
-TITLE="$2"
-AUTHOR="$3"
-VERSION="$4"
-TRANS_DE="$5"
-shift 5
-
-cat > 000.mdwn <<EOF
-% $TITLE
-% $AUTHOR
-  $TRANS_DE
-% $VERSION
-EOF
-
-pandoc --smart --toc --chapters --number-sections \
-    -V lang=german -V geometry:a4paper -o "$OUTPUT" 000.mdwn "$@"
-rm -f 000.mdwn
diff --git a/manual/format-html b/manual/format-html
index 14bc3750..238174a8 100755
--- a/manual/format-html
+++ b/manual/format-html
@@ -22,15 +22,18 @@ OUTPUT="$1"
 TITLE="$2"
 AUTHOR="$3"
 VERSION="$4"
-shift 4
+LANG="$5"
+TRANSLATOR="$6"
+shift 6
 
 cat > 000.mdwn <<EOF
 % $TITLE
 % $AUTHOR
+  $TRANSLATOR
 % $VERSION
 EOF
 
 pandoc  -H ../obnam.css --smart --toc --chapters --number-sections \
-    --standalone --self-contained -V geometry:lettersize \
+    --standalone --self-contained -V lang="$LANG" -V geometry:a4paper \
     -o "$OUTPUT" 000.mdwn "$@"
 rm -f 000.mdwn
diff --git a/manual/format-pdf b/manual/format-pdf
index bba45c6e..e1cf9daf 100755
--- a/manual/format-pdf
+++ b/manual/format-pdf
@@ -22,13 +22,17 @@ OUTPUT="$1"
 TITLE="$2"
 AUTHOR="$3"
 VERSION="$4"
-shift 4
+LANG="$5"
+TRANSLATOR="$6"
+shift 6
 
 cat > 000.mdwn <<EOF
 % $TITLE
 % $AUTHOR
+  $TRANSLATOR
 % $VERSION
 EOF
 
-pandoc --smart --toc --chapters --number-sections -o "$OUTPUT" 000.mdwn "$@"
+pandoc --smart --toc --chapters --number-sections \
+    -V lang="$LANG" -V geometry:a4paper -o "$OUTPUT" 000.mdwn "$@"
 rm -f 000.mdwn
-- 
2.13.2


_______________________________________________
obnam-dev mailing list
obnam-dev@obnam.org
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-dev-obnam.org