r979 ./packages/openofficeorg/2.3.1/unstable: update ooo-build; add Replaces: openoffice.org-common (<< 1:2.3.1) to -writer
------------------------------------------------------------
revno: 979
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2007-12-12 21:49:40 +0100
message:
update ooo-build; add Replaces: openoffice.org-common (<< 1:2.3.1) to -writer
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2007-12-11 08:02:13 +0000
+++ b/changelog 2007-12-12 20:49:40 +0000
@@ -1,9 +1,10 @@
openoffice.org (1:2.3.1-1.2pre) unstable; urgency=low
* ooo-build:
- - update (r11063)
+ - update (r11083)
+ buildfix-sal-system.h-no-asm-sigcontext.h.diff: don't include
<asm/sigcontext.h>, thanks Aurelien Jarno
+ + disables SVGImport
* debian/rules:
- fix PYTHONPATH setting and remove aotcompile.pyc in clean, too...
- we also need -l$(PKGDIR)-base/$(OODIR)/program for dh_shlibdeps
@@ -16,10 +17,14 @@
- use STLport on all archs
* debian/rules, debian/control*.in:
- add ENABLE_REPORTDESIGN conditional; disable it for etch backports
+ - verbosize -report-builders description
* debian/control.in:
- add missing epoch to -base-core's Replaces: (closes: #454625)
+ - add Replaces: openoffice.org-common (<< 1:2.3.1) to
+ openoffice.org-writer as the MediaWiki things moved into -writer
+ upstream (closes: #455961)
- -- Rene Engelhard <rene@debian.org> Mon, 10 Dec 2007 17:17:30 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 12 Dec 2007 21:40:12 +0100
openoffice.org (1:2.3.1-1) unstable; urgency=low
=== modified file 'control'
--- a/control 2007-12-11 08:02:13 +0000
+++ b/control 2007-12-12 20:49:40 +0000
@@ -143,7 +143,7 @@
Architecture: i386 powerpc sparc amd64 ppc64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core (= ${Source-Version}), ${shlibs:Depends}, ${writer-pyuno-dep}
Recommends: ${ooo-binfilter-dep}, java-gcj-compat | sun-java5-jre | java2-runtime ${java-common-depends}
-Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-writer (<< ${Source-Version}), openoffice.org-common (<< 2.0.3+2.0.4m179)
+Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-writer (<< ${Source-Version}), openoffice.org-common (<< 1:2.3.1)
Conflicts: openoffice.org-debian-files, openoffice.org2-writer (<< ${Source-Version}), openoffice.org-java-common (<= 2.2.0-4)
Provides: openoffice.org2-writer, writer2latex
Suggests: openoffice.org-gcj, openoffice.org-base
=== modified file 'control.in'
--- a/control.in 2007-12-10 14:07:42 +0000
+++ b/control.in 2007-12-12 20:49:40 +0000
@@ -319,7 +319,7 @@
Replaces: openoffice.org (<< 1.9),
openoffice.org-debian-files,
openoffice.org2-writer (<< ${Source-Version}),
- openoffice.org-common (<< 2.0.3+2.0.4m179)
+ openoffice.org-common (<< 1:2.3.1)
Conflicts: openoffice.org-debian-files,
openoffice.org2-writer (<< ${Source-Version}),
openoffice.org-java-common (<= 2.2.0-4)
Reply to: