------------------------------------------------------------
revno: 1930
committer: Rene Engelhard <[email protected]>
branch nick: unstable
timestamp: Mon 2010-04-12 01:15:07 +0200
message:
+ * debian/control.in: add also Pre-Depends on -common for -evolution to
+ work around APT bug (thanks Ubuntu..).
+ Do the same for -filter-binfilter to make it have orrect Pre-Depends:
+ again
modified:
changelog
control
control.in
control.kde.in
=== modified file 'changelog'
--- a/changelog 2010-04-11 22:00:36 +0000
+++ b/changelog 2010-04-11 23:15:07 +0000
@@ -22,8 +22,12 @@
after all
* debian/rules, debian/control*in: GAH, I missed that armel has broken
arch-dep extensions, Reintroduce %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
+ * debian/control.in: add also Pre-Depends on -common for -evolution to
+ work around APT bug (thanks Ubuntu..).
+ Do the same for -filter-binfilter to make it have orrect Pre-Depends:
+ again
- -- Rene Engelhard <[email protected]> Sun, 11 Apr 2010 23:54:49 +0200
+ -- Rene Engelhard <[email protected]> Mon, 12 Apr 2010 01:05:47 +0200
openoffice.org (1:3.2.0-6) unstable; urgency=low
=== modified file 'control'
--- a/control 2010-04-11 22:00:36 +0000
+++ b/control 2010-04-11 23:15:07 +0000
@@ -380,7 +380,7 @@
Package: openoffice.org-evolution
Architecture: i386 m68k mips mipsel powerpc s390 alpha amd64 armel hppa ia64
ppc64 s390x sparc
Section: gnome
-Pre-Depends: openoffice.org-core (>= 1:3.1.0-2), debconf (>= 0.5) |
debconf-2.0, procps
+Pre-Depends: openoffice.org-common (>= 1:3.1.0-2), openoffice.org-core (>=
1:3.1.0-2), debconf (>= 0.5) | debconf-2.0, procps
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-base,
${shlibs:Depends}, ${libebook-dep}, ${misc:Depends}
Recommends: evolution
Conflicts: openoffice.org2-evolution (<< ${binary:Version}), ure (<<
1.5.1+OOo3.1.1-15)
@@ -440,7 +440,7 @@
Package: openoffice.org-filter-binfilter
Section: misc
Architecture: i386 m68k powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x
sparc
-Pre-Depends: debconf (>= 0.5) | debconf-2.0, procps
+Pre-Depends: openoffice.org-common (>= 1:3.1.0-2), openoffice.org-core (>=
1:3.1.0-2), debconf (>= 0.5) | debconf-2.0, procps
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Replaces: openoffice.org2-core (<= 1.9.108-1), openoffice.org-math (<<
1.9.113-0pre1), openoffice.org-calc (<< 1.9.113-0pre1), openoffice.org-core (<<
1:3.1.1~rc1-2), openoffice.org2-filter-so52, openoffice.org-filter-so52
Provides: openoffice.org2-filter-so52, openoffice.org-filter-so52
@@ -3669,7 +3669,7 @@
Package: openoffice.org-kab
Architecture: i386 m68k mips mipsel powerpc s390 alpha amd64 armel hppa ia64
ppc64 s390x sparc
-Pre-Depends: openoffice.org-core (>= 1:3.1.0-2), debconf (>= 0.5) |
debconf-2.0, procps
+Pre-Depends: openoffice.org-common (>= 1:3.1.0-2), openoffice.org-core (>=
1:3.1.0-2), debconf (>= 0.5) | debconf-2.0, procps
Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Recommends: kaddressbook
Replaces: openoffice.org-kde (<= 1:3.0.0~beta2-1)
=== modified file 'control.in'
--- a/control.in 2010-03-24 18:40:54 +0000
+++ b/control.in 2010-04-11 23:15:07 +0000
@@ -652,7 +652,7 @@
Package: openoffice.orgVER-evolution
Architecture: %OOO_ARCHS%
Section: gnome
-Pre-Depends: openoffice.orgVER-core (>= 1:3.1.0-2), debconf (>= 0.5) |
debconf-2.0, procps
+Pre-Depends: openoffice.orgVER-common (>= 1:3.1.0-2), openoffice.orgVER-core
(>= 1:3.1.0-2), debconf (>= 0.5) | debconf-2.0, procps
Depends: openoffice.orgVER-core (= ${binary:Version}),
openoffice.orgVER-base,
${shlibs:Depends},
@@ -723,7 +723,7 @@
Package: openoffice.orgVER-filter-binfilter
Section: misc
Architecture: %OOO_BINFILTER_ARCHS%
-Pre-Depends: debconf (>= 0.5) | debconf-2.0, procps
+Pre-Depends: openoffice.orgVER-common (>= 1:3.1.0-2), openoffice.orgVER-core
(>= 1:3.1.0-2), debconf (>= 0.5) | debconf-2.0, procps
Depends: openoffice.orgVER-core (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
=== modified file 'control.kde.in'
--- a/control.kde.in 2010-03-18 17:18:34 +0000
+++ b/control.kde.in 2010-04-11 23:15:07 +0000
@@ -25,7 +25,7 @@
Package: openoffice.orgVER-kab
Architecture: %OOO_ARCHS%
-Pre-Depends: openoffice.orgVER-core (>= 1:3.1.0-2), debconf (>= 0.5) |
debconf-2.0, procps
+Pre-Depends: openoffice.orgVER-common (>= 1:3.1.0-2), openoffice.orgVER-core
(>= 1:3.1.0-2), debconf (>= 0.5) | debconf-2.0, procps
Depends: openoffice.orgVER-core (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
