On Wed, 13 Oct 2010 09:49:35 +0200 Ricardo Mones <ricardo@mones.org> wrote: > On Tue, Oct 12, 2010 at 11:25:55PM +0200, Ricardo Mones wrote: > > Hi Adam, > > > > On Tue, Oct 12, 2010 at 08:22:12PM +0100, Adam D. Barratt wrote: > > > On Tue, 2010-10-12 at 21:11 +0200, Ricardo Mones wrote: > > > > Though not RC, this upload will fix two bugs, one of them important > > > > because it basically defeats the purpose of the claws-mail-doc > > > > package [0] and makes Claws Mail open the online version of the > > > > manuals instead. Also, the existing German language translation is > > > > added to the package. > > > > > > Please go ahead, and let us know once the package has been accepted. > > > > Here it is: > > http://lists.debian.org/debian-devel-changes/2010/10/msg00669.html > > Unexpectedly this change has introduced a serious bug: #600047 > I'll fix it ASAP and prepare a -4 version today. Which is accepted now: http://lists.debian.org/debian-devel-changes/2010/10/msg00726.html Diff with previous attached. I've just simplified the process and removed the previous scriptlet. thanks for your patience, -- Ricardo Mones http://people.debian.org/~mones «Suspicion always haunts the guilty mind. -- Wm. Shakespeare»
Index: changelog =================================================================== --- changelog (revision 408) +++ changelog (working copy) @@ -1,3 +1,12 @@ +claws-mail (3.7.6-4) unstable; urgency=low + + * debian/rules, debian/claws-mail-doc.dirs + - Move manuals instead copying (Closes: #600047) + * debian/inst-manual.sh + - Removed scriptlet, not needed anymore + + -- Ricardo Mones <mones@debian.org> Wed, 13 Oct 2010 16:01:40 +0200 + claws-mail (3.7.6-3) unstable; urgency=low * debian/rules Index: rules =================================================================== --- rules (revision 408) +++ rules (working copy) @@ -83,17 +83,10 @@ $(CURDIR)/debian/claws-mail-i18n/usr/share/locale rmdir $(CURDIR)/debian/claws-mail/usr/share/locale # claws-mail-doc - chmod +x $(CURDIR)/debian/inst-manual.sh - $(CURDIR)/debian/inst-manual.sh $(CURDIR)/manual/dist \ - $(CURDIR)/debian/claws-mail-doc/usr/share/doc/claws-mail/en - $(CURDIR)/debian/inst-manual.sh $(CURDIR)/manual/fr/dist \ - $(CURDIR)/debian/claws-mail-doc/usr/share/doc/claws-mail/fr - $(CURDIR)/debian/inst-manual.sh $(CURDIR)/manual/pl/dist \ - $(CURDIR)/debian/claws-mail-doc/usr/share/doc/claws-mail/pl - $(CURDIR)/debian/inst-manual.sh $(CURDIR)/manual/es/dist \ - $(CURDIR)/debian/claws-mail-doc/usr/share/doc/claws-mail/es - $(CURDIR)/debian/inst-manual.sh $(CURDIR)/manual/de/dist \ - $(CURDIR)/debian/claws-mail-doc/usr/share/doc/claws-mail/de + for TR in "en" "fr" "pl" "es" "de"; \ + do mv $(CURDIR)/debian/claws-mail/usr/share/doc/claws-mail/$$TR \ + $(CURDIR)/debian/claws-mail-doc/usr/share/doc/claws-mail/; \ + done # claws-mail-spamassassin mkdir -m 755 -p \ $(CURDIR)/debian/claws-mail-spamassassin/usr/lib/claws-mail/plugins Index: claws-mail-doc.dirs =================================================================== --- claws-mail-doc.dirs (revision 0) +++ claws-mail-doc.dirs (revision 0) @@ -0,0 +1 @@ +usr/share/doc/claws-mail Index: inst-manual.sh =================================================================== --- inst-manual.sh (revision 408) +++ inst-manual.sh (working copy) @@ -1,8 +0,0 @@ -#!/bin/bash -# copies the four distribution formats of the manual provided by -# upstream into one dir -NAME=claws-mail-manual -test -d "$2" || mkdir -m 755 -p "$2" -for format in html txt pdf ps; -do cp "$1/$format/$NAME.$format" "$2" -done
Attachment:
signature.asc
Description: PGP signature