------------------------------------------------------------
revno: 1410
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Wed 2009-02-18 22:22:01 +0100
message:
remove -unbundled conflicts
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2009-02-15 10:06:02 +0000
+++ b/changelog 2009-02-18 21:22:01 +0000
@@ -9,7 +9,7 @@
- doesn't decrement date on input to 1 day past on some $TZ anymore
(closes: #512644)
* ooo-build:
- - back on trunk (r15332)
+ - back on trunk (r15373)
- updates openoffice.1 to remove --version (closes: #505768)
* debian/shlibs.override.icu: update for new icu
* debian/shlibs.override.xmlsec: remove, xmlsec went static
@@ -32,6 +32,8 @@
about STLport and some upcoming system stuff
- remove build-conflict on libxul-dev for MOZILLA != libxul again;
configure fixed
+ - remove -unbundled conflict when VER = "" because upstreams packages
+ now are called openoffice.orgX-*.
* debian/rules, debian/startcenter.desktop: remove own startcenter.desktop;
OOo now has one upstream
* debian/control.ure.in: suggest java5-runtime instead of java2-runtime as
@@ -39,7 +41,7 @@
* debian/control.mediawiki.in: depend on liblucene2-java until i#98680 is
fixed
- -- Rene Engelhard <r...@debian.org> Sun, 15 Feb 2009 04:00:46 +0100
+ -- Rene Engelhard <r...@debian.org> Wed, 18 Feb 2009 22:21:07 +0100
openoffice.org (1:3.0.1-1.2pre) unstable; urgency=low
=== modified file 'control'
--- a/control 2009-02-15 03:04:45 +0000
+++ b/control 2009-02-18 21:22:01 +0000
@@ -102,7 +102,7 @@
Package: openoffice.org-core
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol,
${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}
-Conflicts: openoffice.org-thesaurus, openoffice.org-unbundled,
openoffice.org-l10n-1.9.108, openoffice.org-l10n-1.9.114,
openoffice.org-l10n-1.9.121, openoffice.org-1.9.125, oooqs-kde, ooqstart-gnome,
openoffice.org-help-de (<< 2.0), openoffice.org-help-en (<< 2.0),
openoffice.org-help-el (<< 2.0), openoffice.org-help-es (<< 2.0),
openoffice.org-help-fr (<< 2.0), openoffice.org-help-it (<< 2.0),
openoffice.org-help-ja (<< 2.0), openoffice.org-help-ko (<< 2.0),
openoffice.org-help-pt-br (<< 2.0), openoffice.org-help-sv (<< 2.0),
openoffice.org-help-tr (<< 2.0), openoffice.org-help-zh-cn (<< 2.0),
openoffice.org-help-zh-tw (<< 2.0), openoffice.org-help-2.0.0,
openoffice.org-help-2.0.1, openoffice.org-help-2.0.2,
openoffice.org-help-2.0.3, openoffice.org-bin, openoffice.org2-core,
openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell,
openoffice.org-calc (<< ${Source-Version}), openoffice.org-writer (<<
${Source-Version}), openoffice.org-impress (<< ${Source-Version}),
openoffice.org-draw (<< ${Source-Version}), openoffice.org-base (<<
${Source-Version}), openoffice.org-gtk (<< ${Source-Version}),
openoffice.org-gnome (<< ${Source-Version}), openoffice.org-kde (<<
${Source-Version}), openoffice.org-evolution (<< ${Source-Version}),
openoffice.org-filter-so52 (<< ${Source-Version}), openoffice.org-officebean
(<< ${Source-Version}), openoffice.org-dev (<< ${Source-Version}), libcairo2 (=
1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<< 1:3.0.0~dev300m22),
openoffice.org-qa-ui-tests (<< ${base-version}), openoffice.org-qa-ui-tests (>=
${base-version}.1), cacao-oj6-jre
+Conflicts: openoffice.org-thesaurus, openoffice.org-l10n-1.9.108,
openoffice.org-l10n-1.9.114, openoffice.org-l10n-1.9.121,
openoffice.org-1.9.125, oooqs-kde, ooqstart-gnome, openoffice.org-help-de (<<
2.0), openoffice.org-help-en (<< 2.0), openoffice.org-help-el (<< 2.0),
openoffice.org-help-es (<< 2.0), openoffice.org-help-fr (<< 2.0),
openoffice.org-help-it (<< 2.0), openoffice.org-help-ja (<< 2.0),
openoffice.org-help-ko (<< 2.0), openoffice.org-help-pt-br (<< 2.0),
openoffice.org-help-sv (<< 2.0), openoffice.org-help-tr (<< 2.0),
openoffice.org-help-zh-cn (<< 2.0), openoffice.org-help-zh-tw (<< 2.0),
openoffice.org-help-2.0.0, openoffice.org-help-2.0.1,
openoffice.org-help-2.0.2, openoffice.org-help-2.0.3, openoffice.org-bin,
openoffice.org2-core, openoffice.org-crashrep, openoffice.org2-hunspell,
openoffice.org-hunspell, openoffice.org-calc (<< ${Source-Version}),
openoffice.org-writer (<< ${Source-Version}), openoffice.org-impress (<<
${Source-Version}), openoffice.org-draw (<< ${Source-Version}),
openoffice.org-base (<< ${Source-Version}), openoffice.org-gtk (<<
${Source-Version}), openoffice.org-gnome (<< ${Source-Version}),
openoffice.org-kde (<< ${Source-Version}), openoffice.org-evolution (<<
${Source-Version}), openoffice.org-filter-so52 (<< ${Source-Version}),
openoffice.org-officebean (<< ${Source-Version}), openoffice.org-dev (<<
${Source-Version}), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1),
cli-uno-bridge (<< 1:3.0.0~dev300m22), openoffice.org-qa-ui-tests (<<
${base-version}), openoffice.org-qa-ui-tests (>= ${base-version}.1),
cacao-oj6-jre
Provides: openoffice.org-bundled, openoffice.org2-core, openoffice.org-java,
openoffice.org2-hunspell, openoffice.org-hunspell
Replaces: openoffice.org-bin, openoffice.org (<< 1.9), openoffice.org-gtk (<<
2.0.3+2.0.4m179), openoffice.org2-core, openoffice.org-java,
openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-common (<<
1:3.0.1~rc1-2), openoffice.org-calc (<< 2.2.1~oof680m15-2),
openoffice.org-headless (<< 1:3.0.0~dev300m26)
Description: OpenOffice.org office suite architecture dependent files
=== modified file 'control.in'
--- a/control.in 2009-02-14 10:08:03 +0000
+++ b/control.in 2009-02-18 21:22:01 +0000
@@ -184,8 +184,8 @@
${shlibs:Depends},
fontconfig,
${mozilla-nss-depends}
-Conflicts: openoffice.org-thesaurus,
- openoffice.orgVER-unbundled,
+Conflicts: openoffice.orgVER-unbundled,
+ openoffice.org-thesaurus,
openoffice.orgVER-l10n-1.9.108,
openoffice.orgVER-l10n-1.9.114,
openoffice.orgVER-l10n-1.9.121,
=== modified file 'rules'
--- a/rules 2009-02-15 03:04:45 +0000
+++ b/rules 2009-02-18 21:22:01 +0000
@@ -1373,6 +1373,12 @@
python debian/scripts/joinctrl.py < debian/control > debian/control.tmp
mv debian/control.tmp debian/control
+ifeq "$(VER)" ""
+ # no conflict with Suns packages as they have the version in their
+ # names thankfully now
+ perl -pi -e 's/openoffice.org-unbundled, //' debian/control
+endif
+
# make -l10n-fi suggest openoffice.org-spellcheck-fi to
# match myspell-fi and openoffice.org-soikko/-voikko
perl -pi -e 's/myspell-dictionary-fi/myspell-dictionary-fi |
openoffice.org-spellcheck-fi/' debian/control
