------------------------------------------------------------
revno: 1688 [merge]
committer: Rene Engelhard <r...@debian.org>
branch nick: experimental
timestamp: Mon 2009-11-02 13:02:13 +0100
message:
* debian/control.in:
- make -core conflict against -style-* (<< 1:3.2.0~beta)
- make all styles depends on -core (>= 1:3.2.0~beta)
(Strictly not needed as it should find the old ones, too, but *shrugs*)
Thanks Mechtilde Stehmann for pointing this out.
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2009-10-31 17:05:15 +0000
+++ b/changelog 2009-11-02 12:02:13 +0000
@@ -1,4 +1,14 @@
-openoffice.org (1:3.2.0~beta-1) UNRELEASED; urgency=low
+openoffice.org (1:3.2.0~beta-2) UNRELEASED; urgency=low
+
+ * debian/control.in:
+ - make -core conflict against -style-* (<< 1:3.2.0~beta)
+ - make all styles depends on -core (>= 1:3.2.0~beta)
+ (Strictly not needed as it should find the old ones, too, but *shrugs*)
+ Thanks Mechtilde Stehmann for pointing this out.
+
+ -- Rene Engelhard <r...@debian.org> Mon, 02 Nov 2009 12:36:56 +0100
+
+openoffice.org (1:3.2.0~beta-1) experimental; urgency=low
* OpenOffice.org 3.2.0 beta (OOO320_m2)
- paste into memo field doesn't replace existing content anymore
@@ -15,7 +25,7 @@
- no duplicate shortcut in Insert Menu anymore (closes: #550510)
* ooo-build:
- - update (a6b7deb5f8ae4ecdb217c1e94a5baa38a5f6324f)
+ - update (07111fca568ecb76a941c231af94a4f29f5f2a75)
* debian/rules:
- revert back to internal redland libs because odfmetadata2 now is in.
@@ -47,13 +57,13 @@
- remove hardcoded libldap2-dev builddep and add ENABLE_LDAP conditional.
Only suggest it because it's now dlopen()'ed anyway.
- -- Rene Engelhard <r...@debian.org> Fri, 30 Oct 2009 19:33:22 +0100
+ -- Rene Engelhard <r...@debian.org> Sat, 31 Oct 2009 19:21:37 +0100
openoffice.org (1:3.1.1-6) UNRELEASED; urgency=low
[ Rene Engelhard ]
* ooo-build:
- - update (390b0ce544dfca09e36d6cf4f03f7d12b988af87)
+ - update (8a4d08ec440c3c5eaf664b5732eb79d2c6ed9896)
- fixes wrong filter texts in KDE4 fpicker (closes: #551774)
- Correct fix for the mirrored range selection bug in RTL mode.
(closes: #548767)
@@ -86,7 +96,7 @@
* debian/po:
- update ru.po, tr.po
- -- Rene Engelhard <r...@debian.org> Sat, 31 Oct 2009 09:56:17 +0100
+ -- Rene Engelhard <r...@debian.org> Sat, 31 Oct 2009 19:15:10 +0100
openoffice.org (1:3.1.1-5) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-10-24 22:02:42 +0000
+++ b/control 2009-11-02 12:02:13 +0000
@@ -19,6 +19,8 @@
Conflicts: openoffice.org2 (<< ${binary:Version}), openoffice.org-java-common
(<< 1:3.0.0)
Replaces: openoffice.org2 (<< ${binary:Version}), openoffice.org-debian-files
Provides: openoffice.org2
+Breaks: openoffice.org-style-crystal (<< 1:3.2.0~beta),
openoffice.org-style-oxygen (<< 1:3.2.0~beta), openoffice.org-style-industrial
(<< 1:3.2.0~beta), openoffice.org-style-tango (<< 1:3.2.0~beta),
openoffice.org-style-hicontrast (<< 1:3.2.0~beta), openoffice.org-style-galaxy
(<< 1:3.2.0~beta), openoffice.org-style-andromeda (<< 1:3.2.0~beta)
+(<< 1:3.2.0~beta)
Description: full-featured office productivity suite
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -251,7 +253,7 @@
Package: openoffice.org-style-crystal
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, openoffice.org-core (>= 1:3.2.0~beta)
Suggests: kde-icons-crystal, crystalcursors
Replaces: openoffice.org-common (<< 2.1~m190)
Provides: openoffice.org-style
@@ -263,7 +265,7 @@
Package: openoffice.org-style-oxygen
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, openoffice.org-core (>= 1:3.2.0~beta)
Suggests: kde-icons-oxygen, oxygencursors
Replaces: openoffice.org-common (<< 2.1~m190)
Provides: openoffice.org-style
@@ -275,7 +277,7 @@
Package: openoffice.org-style-industrial
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, openoffice.org-core (>= 1:3.2.0~beta)
Suggests: gtk2-engines, gnome-themes, industrial-cursor-theme
Replaces: openoffice.org-common (<< 2.1~m190)
Provides: openoffice.org-style
@@ -287,7 +289,7 @@
Package: openoffice.org-style-tango
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, openoffice.org-core (>= 1:3.2.0~beta)
Suggests: tango-icon-theme
Replaces: openoffice.org-common (<< 2.1~m190)
Provides: openoffice.org-style
@@ -300,7 +302,7 @@
Package: openoffice.org-style-hicontrast
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, openoffice.org-core (>= 1:3.2.0~beta)
Suggests: gtk2-engines
Replaces: openoffice.org-common (<< 2.1~m190)
Provides: openoffice.org-style
@@ -313,7 +315,7 @@
Package: openoffice.org-style-galaxy
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, openoffice.org-core (>= 1:3.2.0~beta)
Replaces: openoffice.org-common (<< 2.1~m190), openoffice.org-style-default,
openoffice.org-style-andromeda
Conflicts: openoffice.org-style-default
Provides: openoffice.org-style-default, openoffice.org-style
@@ -327,7 +329,7 @@
Package: openoffice.org-style-andromeda
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, openoffice.org-core (>= 1:3.2.0~beta)
Replaces: openoffice.org-common (<< 2.1~m190)
Provides: openoffice.org-style
Description: full-featured office productivity suite -- Andromeda (Classic)
symbol style
=== modified file 'control.in'
--- a/control.in 2009-10-24 22:02:42 +0000
+++ b/control.in 2009-11-02 12:02:13 +0000
@@ -98,6 +98,8 @@
Conflicts: openoffice.org2 (<< ${binary:Version}),
openoffice.orgVER-java-common (<< 1:3.0.0)
Replaces: openoffice.org2 (<< ${binary:Version}), openoffice.org-debian-files
Provides: openoffice.org2
+Breaks: openoffice.org-style-crystal (<< 1:3.2.0~beta),
openoffice.org-style-oxygen (<< 1:3.2.0~beta), openoffice.org-style-industrial
(<< 1:3.2.0~beta), openoffice.org-style-tango (<< 1:3.2.0~beta),
openoffice.org-style-hicontrast (<< 1:3.2.0~beta), openoffice.org-style-galaxy
(<< 1:3.2.0~beta), openoffice.org-style-andromeda (<< 1:3.2.0~beta)
+(<< 1:3.2.0~beta)
Description: full-featured office productivity suite
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -504,7 +506,7 @@
Package: openoffice.orgVER-style-crystal
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, openoffice.orgVER-core (>= 1:3.2.0~beta)
Suggests: kde-icons-crystal, crystalcursors
Replaces: openoffice.orgVER-common (<< 2.1~m190)
Provides: openoffice.orgVER-style
@@ -516,7 +518,7 @@
Package: openoffice.orgVER-style-oxygen
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, openoffice.orgVER-core (>= 1:3.2.0~beta)
Suggests: kde-icons-oxygen, oxygencursors
Replaces: openoffice.orgVER-common (<< 2.1~m190)
Provides: openoffice.orgVER-style
@@ -528,7 +530,7 @@
Package: openoffice.orgVER-style-industrial
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, openoffice.orgVER-core (>= 1:3.2.0~beta)
Suggests: gtk2-engines, gnome-themes, industrial-cursor-theme
Replaces: openoffice.orgVER-common (<< 2.1~m190)
Provides: openoffice.orgVER-style
@@ -540,7 +542,7 @@
Package: openoffice.orgVER-style-tango
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, openoffice.orgVER-core (>= 1:3.2.0~beta)
Suggests: tango-icon-theme
Replaces: openoffice.orgVER-common (<< 2.1~m190)
Provides: openoffice.orgVER-style
@@ -553,7 +555,7 @@
Package: openoffice.orgVER-style-hicontrast
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, openoffice.orgVER-core (>= 1:3.2.0~beta)
Suggests: gtk2-engines
Replaces: openoffice.orgVER-common (<< 2.1~m190)
Provides: openoffice.orgVER-style
@@ -566,7 +568,7 @@
Package: openoffice.orgVER-style-galaxy
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, openoffice.orgVER-core (>= 1:3.2.0~beta)
Replaces: openoffice.orgVER-common (<< 2.1~m190),
openoffice.orgVER-style-default, openoffice.org-style-andromeda
Conflicts: openoffice.orgVER-style-default
Provides: openoffice.orgVER-style-default, openoffice.orgVER-style
@@ -580,7 +582,7 @@
Package: openoffice.orgVER-style-andromeda
Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, openoffice.orgVER-core (>= 1:3.2.0~beta)
Replaces: openoffice.orgVER-common (<< 2.1~m190)
Provides: openoffice.orgVER-style
Description: full-featured office productivity suite -- Andromeda (Classic)
symbol style
