Hello Philipp,
On Sat, Jul 07, 2012 at 08:15:17AM -0600, Philipp Kern wrote:
> On Sat, Jul 07, 2012 at 02:45:43PM +0200, Helge Kreutzmann wrote:
> > However, the road was a little bumpy, thus 3.0.1-4 closes an RC bug
> > (namely #679554). It has (finally) build on all architectures.
>
> | + # Due to bug #679554 / 679552
> | +ifeq ($(DEB_HOST_ARCH),i386)
> | + docbook-to-man $(MANDIR)/goobox.en.sgml > debian/goobox/usr/share/man/man1/goobox.1
> | po4a -v -f debian/po4a.cfg
> | # po4a-translate is broken, c.f. #280882
> | perl -i -p -e 's# <refentrytitle>\&dhucpackage;#\&dhucpackage;#ms' $(MANDIR)/goobox.de.sgml
> | perl -i -p -e 's#^\s*</refentrytitle>##' $(MANDIR)/goobox.de.sgml
> | docbook-to-man $(MANDIR)/goobox.de.sgml > debian/goobox/usr/share/man/de/man1/goobox.1
> | recode latin1..utf8 debian/goobox/usr/share/man/de/man1/goobox.1
> | +else
> | + cp -iv debian/pregenerated/goobox.1 debian/goobox/usr/share/man/man1/goobox.1
> | + cp -iv debian/pregenerated/goobox.1.de debian/goobox/usr/share/man/de/man1/goobox.1
> | +endif
>
> What kind of fix is that? If it builds on your machine use docbook-to-man, on
> the buildds use pregenerated stuff? Sorry, but no.
>
> As you said it's probably not goobox's fault so it needs to be fixed somewhere
> else.
It turned out to be a dpkg issue (cf. #675613). Some buildds had a
older dpkg (older than current wheezy, where this is fixed) and thus
the build failed.
I removed the above hack (i.e. the relevant rules file now reads again:
docbook-to-man $(MANDIR)/goobox.en.sgml > debian/goobox/usr/share/man/man1/goobox.1
po4a -v -f debian/po4a.cfg
# po4a-translate is broken, c.f. #280882
perl -i -p -e 's# <refentrytitle>\&dhucpackage;#\&dhucpackage;#ms' $(MANDIR)/goobox.de.sgml
perl -i -p -e 's#^\s*</refentrytitle>##' $(MANDIR)/goobox.de.sgml
docbook-to-man $(MANDIR)/goobox.de.sgml > debian/goobox/usr/share/man/de/man1/goobox.1
recode latin1..utf8 debian/goobox/usr/share/man/de/man1/goobox.1
on all architectures.
I uploaded this as goobox 3.0.1-5. After all buildds updated to a recent
enough dpkg (i.e. the one from wheezy or sid) goobox built again without
problems on all architectures.
I attached the debdiff to the current version in Testing (i.e. debdiff
goobox_3.0.1-1.dsc goobox_3.0.1-5.dsc) where I removed the language
updates themselves.
unblock goobox/3.0.1-5
Thanks
Helge
--
Dr. Helge Kreutzmann debian@helgefjell.de
Dipl.-Phys. http://www.helgefjell.de/debian.php
64bit GNU powered gpg signed mail preferred
Help keep free software "libre": http://www.ffii.de/
diff -Nru goobox-3.0.1/debian/changelog goobox-3.0.1/debian/changelog --- goobox-3.0.1/debian/changelog 2012-04-20 20:37:30.000000000 +0200 +++ goobox-3.0.1/debian/changelog 2012-07-08 11:28:48.000000000 +0200 @@ -1,3 +1,51 @@ +goobox (3.0.1-5) unstable; urgency=high + + * Urgency high due to RC fix (3rd try) + * Build man pages again on all architectures. It looks like the build + failure (avoided in 3.0.1-4) was caused not by sp itself but rather by + dpkg (cf. dpkg bug #675613, closed in dpkg 1.16.4). + + -- Helge Kreutzmann <debian@helgefjell.de> Sun, 08 Jul 2012 11:22:30 +0200 + +goobox (3.0.1-4) unstable; urgency=high + + * Urgency high due to RC fix (2nd try) + * Until sp is fixed generate man pages only on build machine (currently i386 + chroot) and ship pregenerated ones otherwise. closes: #679554. + + -- Helge Kreutzmann <debian@helgefjell.de> Fri, 06 Jul 2012 19:05:12 +0200 + +goobox (3.0.1-3) unstable; urgency=high + + * Urgency high due to RC fix + * Until sp is fixed on mipsel (see 679552), ship pregenerated translated + man pages for mipsel, closes: #679554. + + -- Helge Kreutzmann <debian@helgefjell.de> Thu, 05 Jul 2012 19:46:19 +0200 + +goobox (3.0.1-2) unstable; urgency=medium + + * Revert broken NMU, closes: #679313. + * This reopens: #677246. Since no bug report until just before the release + happend, people requiring this fix will need to backport goobox after the + release of Wheezy. Sorry. + * po/fr.po updated from upstream git with msgcat. + * help/es/es.po updated from upstream git with msgcat. + * po/es.po updated from upstream git with msgcat. + * po/pl.po updated from upstream git with msgcat. + * po/sl.po updated from upstream git with msgcat. + + -- Helge Kreutzmann <debian@helgefjell.de> Fri, 29 Jun 2012 10:35:53 +0200 + +goobox (3.0.1-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Update to use libmusicbrainz5. Rework packaging to preserve + upstream configure and aclocal.m4 files during build process. + Closes: #677246. + + -- Jon Dowland <jmtd@debian.org> Tue, 26 Jun 2012 20:42:47 +0100 + goobox (3.0.1-1) unstable; urgency=low * New upstream release diff -Nru goobox-3.0.1/debian/copyright goobox-3.0.1/debian/copyright --- goobox-3.0.1/debian/copyright 2012-04-20 20:34:09.000000000 +0200 +++ goobox-3.0.1/debian/copyright 2012-06-29 11:14:05.000000000 +0200 @@ -41,12 +41,13 @@ Adam Weinberger <adamw@gnome.org> (C) 2004, 2005. Adrian Guniš <andygun696@gmail.com> (C) 2008, 2010. Alessio Frusciante <algol@src.gnome.org> (C) 2005-2007. +Alexandre Franke <alexandre.franke@gmail.com> (C) 2011. Alexander Larsson <alexl@redhat.com> (C) 2002. Alexander Shopov <ash@contact.bg> (C) 2005. Alexandre Prokoudine <alexandre.prokoudine@gmail.com> (C) 2005. Amanpreet Singh Alam <aalam@redhat.com> (C) 2004. Anders Carlsson <andersca@gnu.org> (C) 2002. -Andika Triwidada <andika@gmail.com> (C) 2010. +Andika Triwidada <andika@gmail.com> (C) 2010, 2012. Andrea Zagli <azagli@inwind.it> (C) 2005-2007, 2010. Andrej Žnidarši◈ <andrej.znidarsic@gmail.com> (C) 2009-2012. Andrew Munkres <amunkres@nyx.net> (C) 2011. @@ -55,7 +56,7 @@ Artur Flinta <aflinta@svn.gnome.org> (C) 2005, 2007. Baptiste Mille-Mathias <bmm80@free.fr> (C) 2004. Bastien Nocera <hadess@hadess.net> (C) 2002. -Bruno Brouard <annoa.b@gmail.com> (C) 2007, 2008, 2010. +Bruno Brouard <annoa.b@gmail.com> (C) 2007, 2008, 2010, 2012. Changwoo Ryu <cwryu@debian.org> (C) 2005. Christian Kirbach <Christian.Kirbach@googlemail.com> (C) 2009, 2011. Christian Rose <menthos@menthos.com> (C) 2004, 2005. @@ -63,7 +64,7 @@ Claude Paroz <claude@2xlibre.net> (C) 2008, 2010. Clytie Siddall <clytie@riverland.net.au> (C) 2005-2007. Colin Walters <walters@debian.org> (C) 2002, 2003. -Daniel Mustieles <daniel.mustieles@gmail.com> (C) 2011. +Daniel Mustieles <daniel.mustieles@gmail.com> (C) 2011, 2012. Daniel Nylander <dnylande@src.gnome.org> (C) 2006, 2007, 2009, 2010, 2012. David Lodge <dave@cirt.net> (C) 2005-2007. Dimitris Glezos <dimitris@glezos.com> (C) 2006. @@ -96,7 +97,7 @@ Jorge González <jorgegonz@svn.gnome.org> (C) 2007, 2009, 2010. Jorn Baayen <jorn@nl.linux.org> (C) 2002, 2003. José Sánchez Moreno <jose@oxigenow.com> (C) 2007. -Julien Hardelin <jhardlin@wanadoo.fr> (C) 2010. +Julien Hardelin <jhardlin@wanadoo.fr> (C) 2010, 2011. Julien Hardelin <jhardlin@orange.fr> (C) 2010, 2011. Kjartan Maraas <kmaraas@gnome.org> (C) 2003-2006. Kostas Papadimas <pkst@src.gnome.org> (C) 2004, 2005. @@ -106,6 +107,7 @@ Marek ◈ernocký <marek@manet.cz> (C) 2011. Mario Blättermann <mariobl@gnome.org> (C) 2009-2011. Matej Urban♦i♦ <mateju@svn.gnome.org> (C) 2009, 2010. +Matej Urban■i■ <mateju@svn.gnome.org> (C) 2012. Mateus Zenaide <matzenh@gmail.com> (C) 2011. Martin Willemoes Hansen <mwh@sysrq.dk> (C) 2005. Mikel Olasagasti <hey_neken@mundurat.net> (C) 2004, 2005. @@ -117,6 +119,7 @@ Pema Geyleg <pgeyleg@src.gnome.org> (C) 2007. Peter de Wachter <pdewacht@gmail.com> (C) 2008. Petr Kovar <pknbe@volny.cz> (C) 2010. +Piotr Dr■g <piotrdrag@gmail.com> (C) 2012. Raivis Dejus <orvils@gmail.com> (C) 2007. Ramiro Estrugo <ramiro@eazel.com> (C) 2000, 2001. Raphael Higino <raphaelh@uai.com.br> (C) 2005. diff -Nru goobox-3.0.1/debian/patches/series goobox-3.0.1/debian/patches/series --- goobox-3.0.1/debian/patches/series 2012-04-20 20:34:37.000000000 +0200 +++ goobox-3.0.1/debian/patches/series 2012-06-29 11:14:50.000000000 +0200 @@ -1,3 +1,9 @@ add_galician.diff updated_sv.diff ease_notification_off.diff +update_fr.diff +update_help_es.diff +update_es.diff +update_id.diff +update_pl.diff +update_sl.diff diff -Nru goobox-3.0.1/debian/rules goobox-3.0.1/debian/rules --- goobox-3.0.1/debian/rules 2012-01-08 13:56:07.000000000 +0100 +++ goobox-3.0.1/debian/rules 2012-07-08 11:22:10.000000000 +0200 @@ -9,6 +9,7 @@ # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) CFLAGS = -Wall -g @@ -126,14 +127,16 @@ # Installing manpages install -d -m 0755 debian/goobox/usr/share/man/man1 - docbook-to-man $(MANDIR)/goobox.en.sgml > debian/goobox/usr/share/man/man1/goobox.1 install -d -m 0755 debian/goobox/usr/share/man/de/man1 + + docbook-to-man $(MANDIR)/goobox.en.sgml > debian/goobox/usr/share/man/man1/goobox.1 po4a -v -f debian/po4a.cfg # po4a-translate is broken, c.f. #280882 perl -i -p -e 's# <refentrytitle>\&dhucpackage;#\&dhucpackage;#ms' $(MANDIR)/goobox.de.sgml perl -i -p -e 's#^\s*</refentrytitle>##' $(MANDIR)/goobox.de.sgml docbook-to-man $(MANDIR)/goobox.de.sgml > debian/goobox/usr/share/man/de/man1/goobox.1 recode latin1..utf8 debian/goobox/usr/share/man/de/man1/goobox.1 + # cf. #562722 perl -i -p -e 's#SYNOPSIS#ÜBERSICHT#' debian/goobox/usr/share/man/de/man1/goobox.1
Attachment:
signature.asc
Description: Digital signature