./packages/openofficeorg/2.4/experimental r989: readd some lost lines; make -ogltrans depend on a fixed -common; -2
------------------------------------------------------------
revno: 989
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-02-06 15:44:21 +0100
message:
readd some lost lines; make -ogltrans depend on a fixed -common; -2
modified:
changelog
control
control.ogltrans.in
rules
=== modified file 'changelog'
--- a/changelog 2008-02-05 10:38:17 +0000
+++ b/changelog 2008-02-06 14:44:21 +0000
@@ -1,13 +1,18 @@
-openoffice.org (1:2.4.0~ooh680m6-1.2pre) experimental; urgency=low
+openoffice.org (1:2.4.0~ooh680m6-2) experimental; urgency=low
* ooo-build:
- - update (r11501)
+ - update (r11513)
* debian/rules:
- add some missing/fix arch qualifiers to libsuitesparse-dev/libgcj-bc
builddeps
- fix typos in specifying the libxml.jar and libfonts.jar
+ - reinstate Common-math.xcu moving (somewhen got lost(?)) to prevent
+ file conflicts on upgrade
+ * debian/control.ogltrans.in:
+ - bump depends to force fixed openoffice.org-common containing the correct
+ Impress.xcs
- -- Rene Engelhard <rene@debian.org> Tue, 05 Feb 2008 11:25:25 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 06 Feb 2008 02:09:14 +0100
openoffice.org (1:2.4.0~ooh680m6-1) experimental; urgency=low
@@ -205,6 +210,8 @@
* OpenOffice.org 2.3.1 rc1 (OOG680_m9)
- fixes CVE-2007-4575
* ooo-build:
+ - src: remove vi and ar again (integrated)
+ * debian/rules:
- bump (build-)dep for external hsqldb to >= 1.8.0.9-1
- fix milestone detection...
* debian/control.in:
=== modified file 'control'
--- a/control 2008-02-04 12:05:10 +0000
+++ b/control 2008-02-06 14:44:21 +0000
@@ -3083,7 +3083,7 @@
Section: graphics
Priority: extra
Architecture: i386 powerpc sparc amd64 ppc64
-Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.4.0~m237), openoffice.org-impress (>> 1:2.4.0~m237)
+Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.4.0~m237), openoffice.org-impress (>> 1:2.4.0~m237), openoffice.org-common (>= 1:2.4.0~ooh680m6-2)
Enhances: openoffice.org-impress
Description: OpenOffice.org "OpenGL rendered transitions" extension
OpenOffice.org is a full-featured office productivity suite that provide
=== modified file 'control.ogltrans.in'
--- a/control.ogltrans.in 2007-12-02 00:30:58 +0000
+++ b/control.ogltrans.in 2008-02-06 14:44:21 +0000
@@ -2,7 +2,7 @@
Section: graphics
Priority: extra
Architecture: %OOO_OGLTRANS_ARCHS%
-Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:2.4.0~m237), openoffice.orgVER-impress (>> 1:2.4.0~m237)
+Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:2.4.0~m237), openoffice.orgVER-impress (>> 1:2.4.0~m237), openoffice.orgVER-common (>= 1:2.4.0~ooh680m6-2)
Enhances: openoffice.orgVER-impress
Description: OpenOffice.org "OpenGL rendered transitions" extension
OpenOffice.org is a full-featured office productivity suite that provide
=== modified file 'rules'
--- a/rules 2008-02-05 10:38:17 +0000
+++ b/rules 2008-02-06 14:44:21 +0000
@@ -1617,6 +1617,13 @@
debian/tmp/pkg/openoffice.org-dev-doc/$(OODIR)/sdk
endif
+ # FIXME: Is there a reason this moved from -math to -common?
+ mkdir -p debian/tmp/pkg/openoffice.org-math/$(OODIR)/share/registry/modules/org/openoffice/Office/Common/
+ mv debian/tmp/pkg/openoffice.org-common/$(OODIR)/share/registry/modules/org/openoffice/Office/Common/Common-math.xcu \
+ debian/tmp/pkg/openoffice.org-math/$(OODIR)/share/registry/modules/org/openoffice/Office/Common/Common-math.xcu
+
+ find debian/tmp ! -perm -200 | xargs -r chmod u+w
+
touch $@
#
Reply to: