Hi, Here is another cron script patch (Goes after another patch reuested.) > From: Osamu Aoki <osamu@debian.org> > Date: Sat, 8 Feb 2014 03:02:20 +0900 > Subject: [PATCH] debian-policy: no more gz files > > Let's make all documents to have consistent publication format > No more gzipped PDF etc. > --- > parts/7doc | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/parts/7doc b/parts/7doc > index 62cc89e..7296b36 100755 > --- a/parts/7doc > +++ b/parts/7doc ... The attached patch fixes all the immediate issues raised by David's comments. Hardcoding the language list and unpack() as generic function should be worked on after this patch. Best regards, Osamu
From 3ded034ed184c1c1fd9f467b457948053f14d24e Mon Sep 17 00:00:00 2001
From: Osamu Aoki <osamu@debian.org>
Date: Sun, 2 Feb 2014 23:01:13 +0900
Subject: [PATCH 2/2] debian-reference + maint-guide
---
parts/1ftpfiles | 6 +++++-
parts/7doc | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/parts/1ftpfiles b/parts/1ftpfiles
index 40c4ac2..36f4aef 100755
--- a/parts/1ftpfiles
+++ b/parts/1ftpfiles
@@ -11,6 +11,7 @@ ftpsite=ftp.de.debian.org
# needed for WNPP, webwml/english/devel/wnpp/wnpp.pl
wget -q -N http://${ftpsite}/debian/indices/Maintainers
+[ -d $webtopdir/webwml/english/devel/wnpp ] || mkdir -p $webtopdir/webwml/english/devel/wnpp
ln -sf $crondir/ftpfiles/Maintainers $webtopdir/webwml/english/devel/wnpp/Maintainers
# needed for 7doc_updates
@@ -33,6 +34,9 @@ wget -q -r -N -nH --cut-dirs=1 http://snapshot.debian.org/archive/debian/2005031
wget -q -r -N -nH --cut-dirs=1 ftp://${ftpsite}/debian/pool/main/r/refcard/debian-refcard_*.deb
# debian-faq* (including other languages like debian-faq-fr)
wget -q -r -N -nH --cut-dirs=1 ftp://${ftpsite}/debian/pool/main/d/debian-faq/debian-faq*.deb
-
+# maint-guide
+wget -q -r -N -nH --cut-dirs=1 ftp://${ftpsite}/debian/pool/main/m/maint-guide/maint-guide*.deb
+# debian-reference
+wget -q -r -N -nH --cut-dirs=1 ftp://${ftpsite}/debian/pool/main/d/debian-reference/debian-reference*.deb
echo
diff --git a/parts/7doc b/parts/7doc
index 7296b36..f89c228 100755
--- a/parts/7doc
+++ b/parts/7doc
@@ -11,6 +11,7 @@
webdocdir=$webdir/doc
ftpdocdir=$ftpdir/doc
+test -d $crondir/tmp || install -d -m 2775 $crondir/tmp
cd $crondir/tmp
echo -n "Installing documents:"
@@ -78,9 +79,6 @@ install -p -m 664 dp/libc6-migration.txt $webdocdir/packaging-manuals/
# done with the debian-policy package stuff
rm -rf dp
-echo -n " maint-guide"
-#ln -sf manuals/maint-guide $webdocdir/maint-guide
-
echo -n " build-essential"
bedeb=`ls -t1 $ftpdir/pool/main/b/build-essential/build-essential_*.deb | head -1`
dpkg-deb -x $bedeb be
@@ -206,6 +204,52 @@ done
rm -rf $faqdir
+unpack()
+{
+namesrc=$1 # source package name: maint-guide
+namebin=$2 # binary package name: maint-guide-fr
+basedir=$3 # binary package data dir. (deb, non-html): /usr/share/doc/maint-guide-fr
+htmldir=$4 # binary package data dir. (deb, html): /usr/share/doc/maint-guide-fr/html
+lang=$5 # language name: en, fr, ...
+
+filedeb=`ls -t1 $ftpdir/pool/main/${namesrc::1}/$namesrc/${namebin}_*.deb | head -1`
+dpkg-deb -x $filedeb $namesrc
+destdir=$webdocdir/manuals/$namesrc
+test -d $destdir || install -d -m 2775 $destdir
+for ext in epub pdf txt ; do
+ sourcepath=$namesrc/$basedir/$namesrc.$lang.$ext
+ if [ -f $sourcepath.gz ]; then
+ gunzip $namesrc/$basedir/$namesrc.$lang.$ext.gz
+ fi
+ if [ -f $namesrc/$basedir/$namesrc.$lang.$ext ]; then
+ install -p -m 664 $namesrc/$basedir/$namesrc.$lang.$ext $destdir/$namesrc.$lang.$ext
+ fi
+done
+for page in $namesrc/$htmldir/*.html $namesrc/$htmldir/*.css; do
+ if [ -f $page ]; then
+ install -p -m 664 $page $destdir/$(basename $page)
+ fi
+done
+for page in $namesrc/$htmldir/images/* ; do
+ if [ -f $page ]; then
+ test -d $destdir/images || install -d -m 2775 $destdir/images
+ install -p -m 664 $page $destdir/images/$(basename $page)
+ fi
+done
+rm -rf $namesrc
+}
+
+echo -n " maint-guide"
+unpack maint-guide maint-guide usr/share/doc/maint-guide usr/share/doc/maint-guide/html en
+for lang in ca de es fr it ja ru ; do
+ unpack maint-guide maint-guide-$lang usr/share/doc/maint-guide-$lang usr/share/doc/maint-guide-$lang/html $lang
+done
+
+echo -n " debian-reference"
+for lang in common de en fr it ja pt ; do
+ unpack debian-reference debian-reference-$lang /usr/share/debian-reference /usr/share/debian-reference $lang
+done
+
echo
# still not accounted for: libc5-libc6-Mini-HOWTO
--
1.9.rc1
Attachment:
signature.asc
Description: Digital signature