Hi, On Mon, May 27, 2013 at 12:44:39PM +0100, Adam D. Barratt wrote: > Control: tags -1 + pending > > On Thu, 2013-03-21 at 19:40 +0100, Rene Engelhard wrote: > > 19:28 < jcristau> i could live with having that fixed in r1 > > 19:28 < jcristau> if it can't go through unstable anyway > > 19:29 < _rene_> ok, so I'll do both in r1.. *sigh* > > Flagged for acceptance.
Unfortunately it failed to build because questionable assumptions about the build environment (yes, I know, but it was back then to save *hours* of build time on the buildds, now it's binary-arch/binary-indep and that issue is gone) fail: See e.g. https://buildd.debian.org/status/fetch.php?pkg=libreoffice&arch=kfreebsd-i386&ver=1%3A3.5.4%2Bdfsg2-0%2Bdeb7u1&stamp=1369823022 and http://bugs.debian.org/685723 I'd upload with the following (everything was already in 3.6 packages upwards and just backported to the 3.5 packages now) if you agree: diff --git a/changelog b/changelog index 9937d7b..e5a79f3 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,13 @@ +libreoffice (1:3.5.4+dfsg2-0+deb7u2) stable; urgency=low + + * debian/rules: + - work around possible failure install-common target with missing + ca-XV .dirs/.install... (closes: #685723) + - hack around broken "*" directory in debian/tmp/pkg on kfreebsd-* + extremely slowing down the install target... + + -- Rene Engelhard <r...@debian.org> Wed, 29 May 2013 18:31:38 +0200 + libreoffice (1:3.5.4+dfsg2-0+deb7u1) stable; urgency=low * src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip: remove diff --git a/rules b/rules index da5bb06..08c2d43 100755 --- a/rules +++ b/rules @@ -1671,6 +1671,11 @@ $(STAMP_DIR)/install: $(STAMP_DIR)/build export OOINSTBASE=$(OODIR); \ export OOO_LANGS_LIST="$(ISOS)"; \ $(CURDIR)/debian/scripts/gid2pkgdirs.sh + + # FIXME + if echo $(DEB_HOST_ARCH) | grep -q kfreebsd; then \ + cd $(CURDIR)/debian/tmp/pkg && rm -rf \*; \ + fi # prepare install/dir files for dh for i in `cd $(CURDIR)/debian/tmp/pkg; ls -1 | xargs`; do \ @@ -1689,14 +1694,18 @@ $(STAMP_DIR)/install: $(STAMP_DIR)/build # and ca-XV in -ca... ifeq (ca-XV,$(findstring ca-XV,$(LANGPACKISOS))) - cat debian/libreoffice-l10n-ca-XV.dirs >> debian/libreoffice-l10n-ca.dirs - cat debian/libreoffice-l10n-ca-XV.install >> debian/libreoffice-l10n-ca.install - rm -f debian/libreoffice-l10n-ca-XV.dirs debian/libreoffice-l10n-ca-XV.install + if [ -f debian/libreoffice-l10n-ca-XV.dirs -a -f debian/libreoffice-l10n-ca-XV.install ]; then \ + cat debian/libreoffice-l10n-ca-XV.dirs >> debian/libreoffice-l10n-ca.dirs; \ + cat debian/libreoffice-l10n-ca-XV.install >> debian/libreoffice-l10n-ca.install; \ + rm -f debian/libreoffice-l10n-ca-XV.dirs debian/libreoffice-l10n-ca-XV.install; \ + fi endif ifeq (ca-XV,$(findstring ca-XV,$(HELPISOS))) - cat debian/libreoffice-help-ca-XV.dirs >> debian/libreoffice-help-ca.dirs - cat debian/libreoffice-help-ca-XV.install >> debian/libreoffice-help-ca.install - rm -f debian/libreoffice-help-ca-XV.dirs debian/libreoffice-help-ca-XV.install + if [ -f debian/libreoffice-help-ca-XV.dirs -a -f debian/libreoffice-help-ca-XV.install ]; then \ + cat debian/libreoffice-help-ca-XV.dirs >> debian/libreoffice-help-ca.dirs; \ + cat debian/libreoffice-help-ca-XV.install >> debian/libreoffice-help-ca.install; \ + rm -f debian/libreoffice-help-ca-XV.dirs debian/libreoffice-help-ca-XV.install; \ + fi endif # fixup case (-l10n-pt-BR -> l10n-pt-br etc.) After this the test failure on mips[1] remains, but I *hope* this is one-time-off. Should I disable tests on mips* (or better: make them non-fatal there which is already the case in sid/jessie) or should I upload with the above and let's hope? Regards, Rene [1] https://buildd.debian.org/status/fetch.php?pkg=libreoffice&arch=mips&ver=1%3A3.5.4%2Bdfsg2-0%2Bdeb7u1&stamp=1369797883 I see it's been requeued, though. -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
