please unblock openoffice.org 1:2.4.1-9
Hi,
unfortunately the decision to fix the senddoc issue in openoffice.org with post-processing a file instead
of updating ooo-build (which in this state of the freeze and given my connectivity right now would have been a hassle)
caused a regression in that a script which has to be +x wasn't anymore.
See #497618.
I fixed that in 1:2.4.1-9. I also fixed the -base dependency which would be at -report-builder-bin instead of
-report-builder.
Please unblock.
Diff:
diff -u openoffice.org-2.4.1/debian/changelog openoffice.org-2.4.1/debian/changelog
--- openoffice.org-2.4.1/debian/changelog
+++ openoffice.org-2.4.1/debian/changelog
@@ -1,3 +1,14 @@
+openoffice.org (1:2.4.1-9) unstable; urgency=medium
+
+ * debian/control.reportdesign.in:
+ - -report-builder-bin contains librpt* which is linked against libraries
+ from -base so that one should depend on -base, not -report-builder
+ * debian/rules:
+ - fix senddoc fixing (add chmod 755) to keep senddoc executable
+ closes: #497618)
+
+ -- Rene Engelhard <rene@debian.org> Thu, 04 Sep 2008 19:03:26 +0200
+
openoffice.org (1:2.4.1-8) unstable; urgency=high
* debian/control.in:
diff -u openoffice.org-2.4.1/debian/control openoffice.org-2.4.1/debian/control
--- openoffice.org-2.4.1/debian/control
+++ openoffice.org-2.4.1/debian/control
@@ -3158,7 +3158,7 @@
Package: openoffice.org-report-builder
Section: misc
Architecture: all
-Depends: ${report-builder-jar-depends}, openoffice.org-base (>= 2.3.0~src680m225), openoffice.org-report-builder-bin, openoffice.org-java-common (>= 1:2.3.0~oog680m1)
+Depends: ${report-builder-jar-depends}, openoffice.org-report-builder-bin, openoffice.org-java-common (>= 1:2.3.0~oog680m1)
Conflicts: openoffice.org-reportdesigner
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
@@ -3177,7 +3177,7 @@
Package: openoffice.org-report-builder-bin
Section: misc
Architecture: i386 powerpc sparc mips mipsel s390 armel amd64 ppc64 ia64
-Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1)
+Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1), openoffice.org-base (>= 2.3.0~src680m225)
Replaces: openoffice.org-report-builder
Description: OpenOffice.org Report Builder extension - support libraries
OpenOffice.org is a full-featured office productivity suite that provides
diff -u openoffice.org-2.4.1/debian/rules openoffice.org-2.4.1/debian/rules
--- openoffice.org-2.4.1/debian/rules
+++ openoffice.org-2.4.1/debian/rules
@@ -2250,17 +2250,22 @@
rm -rf $(PKGDIR)-$$i/$(OODIR)/program/resource; \
done
-ifeq "$(ENABLE_REPORTDESIGN)" "y"
- # move rpt stuff into -report-builder
+ifneq "$(ENABLE_REPORTDESIGN)" "y"
+ # unneeded. a no-Java arch, so the report-builder can't work anyway.
+ # (and we need to remove it here anyway as it otherwise would end up
+ # in -base)
+ rm -f $(PKGDIR)-base/$(OODIR)/program/librpt*
+else
+ # move rpt stuff into -report-builder-bin
rm -rf $(PKGDIR)-report-builder
rm -rf $(PKGDIR)-report-builder-bin
mkdir -p $(PKGDIR)-report-builder-bin/$(OODIR)/program
mv $(PKGDIR)-base/$(OODIR)/program/librpt* \
$(PKGDIR)-report-builder-bin/$(OODIR)/program
ifeq "$(ENABLE_JAVA)" "y"
- # install this; we need to register this ourselved later in
- # the maintainer scripts. This is intended upstream (**rpt* stuff
- # in 2.3 and the actual report builde as an extension, without which
+ # install this; we need to register this ourselves later in
+ # the maintainer scripts. This is intended upstream (*rpt* stuff
+ # in OOo and the actual report builder as an extension, without which
# the *rpt* stuff is a no-op.
install -D -m644 $(SOURCE_TREE)/reportdesign/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/sun-report-builder.oxt \
$(PKGDIR)-report-builder/$(OODIR)/share/extension/install/sun-report-builder.oxt
@@ -2770,7 +2775,8 @@
# remove leftover debugging echos
TMP=`mktemp -q`; \
grep -v obr $(PKGDIR)-common/$(OODIR)/program/senddoc > $$TMP && \
- mv $$TMP $(PKGDIR)-common/$(OODIR)/program/senddoc
+ mv $$TMP $(PKGDIR)-common/$(OODIR)/program/senddoc && \
+ chmod 755 $(PKGDIR)-common/$(OODIR)/program/senddoc
touch $@
diff -u openoffice.org-2.4.1/debian/control.reportdesign.in openoffice.org-2.4.1/debian/control.reportdesign.in
--- openoffice.org-2.4.1/debian/control.reportdesign.in
+++ openoffice.org-2.4.1/debian/control.reportdesign.in
@@ -1,7 +1,7 @@
Package: openoffice.orgVER-report-builder
Section: misc
Architecture: all
-Depends: ${report-builder-jar-depends}, openoffice.orgVER-base (>= 2.3.0~src680m225), openoffice.orgVER-report-builder-bin, openoffice.org-java-common (>= 1:2.3.0~oog680m1)
+Depends: ${report-builder-jar-depends}, openoffice.orgVER-report-builder-bin, openoffice.org-java-common (>= 1:2.3.0~oog680m1)
Conflicts: openoffice.org-reportdesigner
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
@@ -20,7 +20,7 @@
Package: openoffice.orgVER-report-builder-bin
Section: misc
Architecture: %OOO_JAVA_ARCHS%
-Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1)
+Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1), openoffice.orgVER-base (>= 2.3.0~src680m225)
Replaces: openoffice.orgVER-report-builder
Description: OpenOffice.org Report Builder extension - support libraries
OpenOffice.org is a full-featured office productivity suite that provides
Regards,
Rene
Reply to: