tags 649811 patch thanks... Le 26/11/2011 03:27, Charles Plessy a écrit : > Le Thu, Nov 24, 2011 at 11:31:58PM -0400, David Prévot a écrit :
> In your patch, only one version is expected. Thanks for spotting that, the purpose was indeed to get all available versions. >> Attached a crappy-untested-improvable patch that should address the >> concerns. Second version (partly tested this time), that could be added to the website once we agree on the text file URL (it should just drop an error message in often.log until copyright-format is available in the last debian-policy package, so no error mail should be triggered). > For the text version, I am not sure how necessary it is. In my mind, it would > have been cool if > http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ > returned an HTML version or a text version according to the HTTP headers. I doubt that could be possible, but maybe I'm missing something here. > But distributing the text version under > http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/copyright-format-1.0.txt > or not distributing it at all are also valid options. I am neutral on this. CCing debian-policy, in case someone has an opinion about it. Second thought: if we ship it, maybe http://www.debian.org/doc/packaging-manuals/copyright-format/copyright-format-1.0.txt (directly in its subdirectory, i.e. without the /1.0/) would be better, so the text file can be “seen” from its subdirectory. BTW, assuming the copyright-format won't evolve too frequently, I guess it's fine to link directly to the 1.0 version from the DDP page [2], and if it evolves too frequently, we'll change that link to it's subdirectory [1]. 1: http://www.debian.org/doc/packaging-manuals/copyright-format/ 2: http://www.debian.org/doc/devel-manuals#policy Regards David
From 47bc3438de6a8843de64bb41341384794c442e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Pr=C3=A9vot?= <taf...@debian.org> Date: Thu, 24 Nov 2011 23:00:42 -0400 Subject: [PATCH] Handle copyright-format, closes: #649811 --- parts/7doc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/parts/7doc b/parts/7doc index 583b993..40f84a7 100755 --- a/parts/7doc +++ b/parts/7doc @@ -47,6 +47,16 @@ install_policy_doc fhs-2.3 packaging-manuals/fhs fhs yes install_policy_doc menu-policy packaging-manuals/menu-policy install_policy_doc perl-policy packaging-manuals/perl-policy +# Add the copyright-format in its canonical place +ver=`ls dp/usr/share/doc/debian-policy/copyright-format-*.html | sed 's/.*copyright-format-\(.*\)\.html/\1/'` +for i in $ver; do + echo -n " copyright-format-$i" + test -d "$webdocdir/packaging-manuals/copyright-format/$i" || install -d -m 2775 "$webdocdir/packaging-manuals/copyright-format/$i" + install -p -m 664 -T dp/usr/share/doc/debian-policy/copyright-format-$i.html $webdocdir/packaging-manuals/copyright-format/$i/index.html + zcat dp/usr/share/doc/debian-policy/copyright-format-$i.txt.gz > dp/copyright-format-$i.txt + install -p -m 664 dp/copyright-format-$i.txt $webdocdir/packaging-manuals/copyright-format/$i/ +done + echo -n " upgrading-checklist" zcat dp/usr/share/doc/debian-policy/upgrading-checklist.txt.gz > dp/upgrading-checklist.txt install -p -m 664 dp/upgrading-checklist.txt $webdocdir/packaging-manuals/ -- 1.7.7.3
signature.asc
Description: OpenPGP digital signature
