summaryrefslogtreecommitdiff
path: root/tickets/606d6165842d4005a0333617b62bb973/Maildir/new/1499289303.M477823P7558Q1.koom
blob: 75b09bdfdea607ac4b2a982142587f05d0c3ce4c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
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 7B63342DD2
	for <distix@pieni.net>; Wed,  5 Jul 2017 21:12:11 +0000 (UTC)
Received: from platypus.pepperfish.net (unknown [10.112.101.20])
	by yaffle.pepperfish.net (Postfix) with ESMTP id 312BC41CDA;
	Wed,  5 Jul 2017 22:12:11 +0100 (BST)
Received: from ip6-localhost.nat ([::1] helo=platypus.pepperfish.net)
	by platypus.pepperfish.net with esmtp (Exim 4.80 #2 (Debian))
	id 1dSral-0004Q0-5X; Wed, 05 Jul 2017 22:12:11 +0100
Received: from [10.112.101.21] (helo=inmail2.pepperfish.net)
 by platypus.pepperfish.net with esmtps (Exim 4.80 #2 (Debian))
 id 1dSrak-0004Pp-8G
 for <obnam-dev@obnam.org>; Wed, 05 Jul 2017 22:12:10 +0100
Received: from suhail.uberspace.de ([185.26.156.24])
 by inmail2.pepperfish.net with esmtps (TLS1.2:DHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.89) (envelope-from <jn@hz6.de>) id 1dSrag-0005JG-Um
 for obnam-dev@obnam.org; Wed, 05 Jul 2017 22:12:10 +0100
Received: (qmail 16019 invoked by uid 651); 5 Jul 2017 21:11:58 -0000
Received: from HSI-KBW-109-193-175-085.hsi7.kabel-badenwuerttemberg.de
 (HSI-KBW-109-193-175-085.hsi7.kabel-badenwuerttemberg.de [109.193.175.85])
 by htjn.suhail.uberspace.de (Horde Framework) with HTTPS; Wed, 05 Jul 2017
 23:11:57 +0200
Date: Wed, 05 Jul 2017 23:11:55 +0200
Message-ID: <20170705231155.Horde.plmBbmUqeokXY7v5NL0z0jf@htjn.suhail.uberspace.de>
From: Jan Niggemann <jn@hz6.de>
To: obnam-dev@obnam.org
References: <6c89be1a-a926-4f55-cf08-26aee733555a@univpm.it>
 <20170703170630.75410-1-remirampin@gmail.com>
 <20170704140019.Horde.A5GoYJLxvMMaVBfSX0CmbnX@htjn.suhail.uberspace.de>
In-Reply-To: <20170704140019.Horde.A5GoYJLxvMMaVBfSX0CmbnX@htjn.suhail.uberspace.de>
User-Agent: Horde Application Framework 5
Content-Type: text/plain; charset=utf-8; format=flowed; DelSp=Yes
MIME-Version: 1.0
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
X-Pepperfish-Transaction: c025-158f-0a76-498a
X-Spam-Score: -1.8
X-Spam-Score-int: -17
X-Spam-Bar: -
X-Scanned-By: pepperfish.net, Wed, 05 Jul 2017 22:12:10 +0100
X-Spam-Report: Content analysis details: (-1.8 points)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 0.5 PPF_RECEIVED_HTTP      Received header mentions http
 -0.5 PPF_USER_AGENT         User-Agent: exists
 -0.0 RCVD_IN_DNSWL_NONE     RBL: Sender listed at http://www.dnswl.org/, no
 trust [185.26.156.24 listed in list.dnswl.org]
 -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
X-ACL-Warn: message may be spam
X-Scan-Signature: 4180529fba59bbb252167dec53050572
Subject: Re: [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

Hi Remi,

thank you for your patch! I have applied it successfully and was able=20=20
to=20build both the PDFs and HTMLs in all 3 languages.
@Lars, IMHO you can apply this patch :-)

jan


Zitat von Jan Niggemann <jn@hz6.de>:

> Have not yet applied and tested, but looking at the code it "looks OK".
> I'll try to squeeze in some time to test this, either this weekend=20=20
>=20or next one.
>
> -- jan
>
> Zitat von Remi Rampin <remirampin@gmail.com>:
>
>> ---
>> 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 =3D Backups with Obnam
>> TITLE_DE =3D Backups mit Obnam
>> -TITLE_FR =3D Sauvegardes avec Obnam
>> TRANS_DE =3D =C3=9Cbersetzung: Jan Niggemann (jn@hz6.de)
>> +TITLE_FR =3D Sauvegardes avec Obnam
>> +TRANS_FR =3D Traduction : Pierrick Martinez, Remi Rampin
>> AUTHOR =3D Lars Wirzenius (liw@liw.fi)
>> VERSION =3D Version $(shell git describe || python ../setup.py --version=
)
>>
>> @@ -27,13 +28,13 @@ en_sources =3D $(shell ls en/*.mdwn)
>> fr_sources =3D $(shell ls fr/*.mdwn)
>> de_sources =3D $(shell ls de/*.mdwn)
>> pdfs =3D \
>> -        obnam-manual.en.pdf \
>> +	obnam-manual.en.pdf \
>> 	obnam-manual.fr.pdf \
>> -        obnam-manual.de.pdf
>> +	obnam-manual.de.pdf
>> htmls =3D \
>> -        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/>.
>> -#
>> -# =3D*=3D License: GPL-3+ =3D*=3D
>> -
>> -set -eu
>> -
>> -OUTPUT=3D"$1"
>> -TITLE=3D"$2"
>> -AUTHOR=3D"$3"
>> -VERSION=3D"$4"
>> -TRANS_DE=3D"$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=3Dgerman -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/>.
>> -#
>> -# =3D*=3D License: GPL-3+ =3D*=3D
>> -
>> -set -eu
>> -
>> -OUTPUT=3D"$1"
>> -TITLE=3D"$2"
>> -AUTHOR=3D"$3"
>> -VERSION=3D"$4"
>> -TRANS_DE=3D"$5"
>> -shift 5
>> -
>> -cat > 000.mdwn <<EOF
>> -% $TITLE
>> -% $AUTHOR
>> -  $TRANS_DE
>> -% $VERSION
>> -EOF
>> -
>> -pandoc --smart --toc --chapters --number-sections \
>> -    -V lang=3Dgerman -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=3D"$1"
>> TITLE=3D"$2"
>> AUTHOR=3D"$3"
>> VERSION=3D"$4"
>> -shift 4
>> +LANG=3D"$5"
>> +TRANSLATOR=3D"$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=3D"$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=3D"$1"
>> TITLE=3D"$2"
>> AUTHOR=3D"$3"
>> VERSION=3D"$4"
>> -shift 4
>> +LANG=3D"$5"
>> +TRANSLATOR=3D"$6"
>> +shift 6
>>
>> cat > 000.mdwn <<EOF
>> % $TITLE
>> % $AUTHOR
>> +  $TRANSLATOR
>> % $VERSION
>> EOF
>>
>> -pandoc --smart --toc --chapters --number-sections -o "$OUTPUT"=20=20
>>=20000.mdwn "$@"
>> +pandoc --smart --toc --chapters --number-sections \
>> +    -V lang=3D"$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-obna=
m.org
>
>
>
> --=20
>=20gpg --keyserver pgp.mit.edu --recv-keys 0x514FCA9C
> F013 93C0 306C 1E31 4E00  09FA 21EC A2F6 514F CA9C
>
> _______________________________________________
> obnam-dev mailing list
> obnam-dev@obnam.org
> http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/obnam-dev-obnam=
.org



--=20
gpg=20--keyserver pgp.mit.edu --recv-keys 0x514FCA9C
F013 93C0 306C 1E31 4E00  09FA 21EC A2F6 514F CA9C

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