pre-approval for openoffice.org 1:2.4.1-16 upload seeked (was: Re: Bug#507865: openoffice.org-writer: OOo 2.4.x openinig OOo 3) files doesn't show text (2.x implements standard wrong)
Hi -release,
Rene Engelhard wrote:
> tag 507865 + patch
> thanks
>
> Hi,
>
> marcos.marado@sonae.com wrote:
> > FYI, there's a purposed patch upstream, at
> > http://www.openoffice.org/issues/show_bug.cgi?id=96878
>
> thanks, but I follow that issue.
Besides the fix for #507865, which now has a proposed patch[1], I'd like to
include a few more (mainly uncontroversial, except one..) fixes (all backported
from the 3.0.x packages):
- report-builder needs Java but does not depend on it
- base-core missed a dep on openoffice.org-core
- README/LICENSE files (cosmetical, I agree, but...)
- add some pointer to upstreams README for "Problems During Program Startup"
and "File Locking" in presubj.
And last but not least (and that might be the controversial part):
- disable -gcj for ppc, as gij does not work on ppc anyway (#478760) and
thus is just cruft.
Untested diff attached (but of course that will be tested before upload)
Comments?
Grüße/Regards,
René
[1] http://www.openoffice.org/issues/show_bug.cgi?id=96878#desc17
--
.''`. René Engelhard -- Debian GNU/Linux Developer
: :' : http://www.debian.org | http://people.debian.org/~rene/
`. `' rene@debian.org | GnuPG-Key ID: 248AEB73
`- Fingerprint: 41FA F208 28D4 7CA5 19BB 7AD9 F859 90B0 248A EB73
=== modified file 'changelog'
--- changelog 2008-12-15 10:26:45 +0000
+++ changelog 2009-01-14 13:34:26 +0000
@@ -1,3 +1,19 @@
+openoffice.org (1:2.4.1-16) unstable; urgency=medium
+
+ * debian/control.in:
+ - openoffice.org-base-core needs to depend on openoffice.org-core....
+ * debian/rules:
+ - fix extra license/readme file removal
+ * debian/control.reportdesign.in:
+ - add missing Depends: on ${java-runtime-depends}
+ * debian/presubj: point to OpenOffice.orgs README sections
+ ("Problems During Program Startup" and "File Locking").
+ * debian/rules, control.gcj.in: disable ppc for -gcj as gij doesn't work
+ there anyway (#478760). Fix Architecture: of -gcj to not include
+ non-Java archs.
+
+ -- Rene Engelhard <rene@debian.org> Sun, 14 Dec 2008 23:49:35 +0100
+
openoffice.org (1:2.4.1-15) unstable; urgency=medium
* ooo-build:
=== modified file 'control.gcj.in'
--- control.gcj.in 2007-11-19 00:12:19 +0000
+++ control.gcj.in 2009-01-14 13:34:26 +0000
@@ -1,5 +1,5 @@
Package: openoffice.orgVER-gcj
-Architecture: %OOO_ARCHS%
+Architecture: %OOO_GCJ_ARCHS%
Depends: ${shlibs:Depends},
java-gcj-compat,
openoffice.orgVER-core (= ${Source-Version}),
=== modified file 'control.in'
--- control.in 2008-11-17 21:37:40 +0000
+++ control.in 2008-12-18 15:46:02 +0000
@@ -409,7 +409,7 @@
Package: openoffice.orgVER-base-core
Architecture: %OOO_ARCHS%
-Depends: ${shlibs:Depends}
+Depends: openoffice.orgVER-core (= ${Source-Version}), ${shlibs:Depends}
Replaces: openoffice.org-base (<< 1:2.3.1)
Suggests: openoffice.orgVER-base
Description: OpenOffice.org office suite -- libdba
=== modified file 'control.reportdesign.in'
--- control.reportdesign.in 2008-08-27 03:29:19 +0000
+++ control.reportdesign.in 2008-12-23 21:03:07 +0000
@@ -1,7 +1,7 @@
Package: openoffice.orgVER-report-builder
Section: misc
Architecture: all
-Depends: ${report-builder-jar-depends}, 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), ${java-runtime-depends}
Conflicts: openoffice.org-reportdesigner
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
=== modified file 'presubj'
--- presubj 2006-12-02 11:58:06 +0000
+++ presubj 2009-01-14 11:58:50 +0000
@@ -18,7 +18,13 @@
causing it). Otherwise, don't file a bug, we can't look at it anyway.
IV) Please attach a backtrace if possible (see README.Debian). Install
- openoffice.org-dbg before doing this (and the packages it Recommends)
+ openoffice.org-dbg before doing this (and the packages it Recommends).
+
+ Please also read /usr/share/doc/openoffice.org-common/README.gz for common
+ problems ("Problems During Program Startup")
+ If you have NFS/Samba/... file locking problems (i.e. files opened
+ read-only when they should be read-write), also see the "File Locking"
+ section in above file.
V) If the bug is also in the version you can get from www.openoffice.org, file
it there in the first place. If you really think this also should be a bug
=== modified file 'rules'
--- rules 2008-12-03 16:32:04 +0000
+++ rules 2009-01-14 13:34:26 +0000
@@ -95,7 +95,11 @@
PACKAGE_TTF_OPENSYMBOL=y
PACKAGE_NPSOPLUGIN=y
PACKAGE_PCVSLIB=n
-BUILD_JARS_NATIVE=y
+ifneq "$(ARCH)" "powerpc"
+ ifneq "$(ARCH)" "ppc64"
+ BUILD_JARS_NATIVE=y
+ endif
+endif
BUILD_BINFILTERS=y
BUILD_ONLY_EN_US=n
ENABLE_JAVA=y
@@ -286,6 +290,10 @@
ifeq "$(BUILD_IA64)" "y"
OOO_JAVA_ARCHS+= ia64
endif
+
+# gcj does not work on ppc, so no need to build -gcj for it
+OOO_GCJ_ARCHS := $(filter-out ppc64,$(filter-out powerpc,$(OOO_JAVA_ARCHS)))
+
ifeq (,$(findstring $(ARCH),$(OOO_JAVA_ARCHS)))
ENABLE_JAVA=n
ENABLE_REPORTDESIGN=n
@@ -1241,6 +1249,7 @@
perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_JAVA_ARCHS%,$(OOO_JAVA_ARCHS),g" debian/control
+ perl -pi -e "s,%OOO_GCJ_ARCHS%,$(OOO_GCJ_ARCHS),g" debian/control
perl -pi -e "s,%OOO_MONO_ARCHS%,$(OOO_MONO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_NPSOPLUGIN_ARCHS%,$(OOO_NPSOPLUGIN_ARCHS),g" debian/control
perl -pi -e "s,%OOO_OGLTRANS_ARCHS%,$(OOO_OGLTRANS_ARCHS),g" debian/control
@@ -2590,7 +2599,7 @@
endif
endif
# remove extra license files
- rm -rf $(PKGDIR)-commmon/$(OODIR)/licenses
+ rm -rf $(PKGDIR)-common/$(OODIR)/licenses
rm -rf $(PKGDIR)-common/$(OODIR)/share/readme/LICENSE*
rm -f $(PKGDIR)-common/$(OODIR)/THIRDPARTYLICENSEREADME.html
rm -f $(PKGDIR)-common/$(OODIR)/LICENSE.html
@@ -2598,6 +2607,8 @@
# remove extra readme files
rm -rf $(PKGDIR)-common/$(OODIR)/readmes
rm -rf $(PKGDIR)-common/$(OODIR)/share/readme/README*
+ rm -f $(PKGDIR)-common/$(OODIR)/README.html
+ rm -f $(PKGDIR)-common/$(OODIR)/README
# install Ximian desktop icons
for r in 16x16 22x22 24x24 32x32 48x48; do \
@@ -3065,6 +3076,7 @@
ifeq "$(ENABLE_REPORTDESIGN)" "y"
dh_gencontrol -popenoffice.org$(VER)-report-builder -- \
-V'report-builder-jar-depends=$(REPORT_BUILDER_JAR_DEPENDS)' \
+ -V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep "<version" $(SOURCE_TREE)/reportdesign/util/post.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
endif
ifeq "$(PACKAGE_PCVSLIB)" "y"
Reply to: