./packages/openofficeorg/3.3.0/experimental r2067: * debian/control.in:
------------------------------------------------------------
revno: 2067
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2010-07-14 22:43:41 +0200
message:
* debian/control.in:
- generalize -style-* Breaks: in common to always break -style-*
(<< ${basis-version}) and add a Breaks on (>= 1:{next-basis-version})
so that we don't "loose" icons because of not-matching basis. Thanks
Michael Tokarev for pointing this out
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2010-07-14 15:43:16 +0000
+++ b/changelog 2010-07-14 20:43:41 +0000
@@ -24,7 +24,9 @@
* debian/Recovery.xcu: remove, we now need to to this in main.xcd
* debian/control.in:
- generalize -style-* Breaks: in common to always break -style-*
- (<< ${basis-version}
+ (<< ${basis-version}) and add a Breaks on (>= 1:{next-basis-version})
+ so that we don't "loose" icons because of not-matching basis. Thanks
+ Michael Tokarev for pointing this out.
-- Rene Engelhard <rene@debian.org> Tue, 13 Jul 2010 21:38:32 +0200
=== modified file 'control'
--- a/control 2010-07-13 19:41:15 +0000
+++ b/control 2010-07-14 20:43:41 +0000
@@ -118,16 +118,23 @@
Depends: openoffice.org-style-default | openoffice.org-style, ${misc:Depends}, ure
Suggests: openoffice.org-style-industrial, openoffice.org-style-hicontrast, openoffice.org-style-tango, openoffice.org-style-crystal, openoffice.org-style-oxygen
Recommends: xfonts-mathml, ${textcat-data-recommends}
-Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4), openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-base (<< ${base-version}), openoffice.org-writer (<< ${base-version}), openoffice.org-calc (<< ${base-version}), openoffice.org-impress (<< ${base-version}), openoffice.org-draw (<< ${base-version}), openoffice.org-math (<< ${base-version}), broffice.org (<< ${base-version}), openclipart-openoffice.org (<= 0.18+dfsg-7), dictionaries-common (<< 0.98.14), openoffice.org-core (<< 1:${basis-version}), openoffice.org-core (>= 1:${basis-version}.99), openoffice.org-writer2latex (<< 1.0-5), openoffice.org-coooder (<< 1.1.1+ooo-build3.0.0.9+r14588-8), libtextcat-data
+Conflicts: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org2-common, openclipart-openoffice.org (<= 0.17+dfsg-4), openoffice.org-l10n-en-us, openoffice.org-debian-menus, openoffice.org-base (<< ${base-version}), openoffice.org-writer (<< ${base-version}), openoffice.org-calc (<< ${base-version}), openoffice.org-impress (<< ${base-version}), openoffice.org-draw (<< ${base-version}), openoffice.org-math (<< ${base-version}), broffice.org (<< ${base-version}), openclipart-openoffice.org (<= 0.18+dfsg-7), dictionaries-common (<< 0.98.14), openoffice.org-core (<< 1:${basis-version}), openoffice.org-core (>= 1:${next-basis-version}~), openoffice.org-writer2latex (<< 1.0-5), openoffice.org-coooder (<< 1.1.1+ooo-build3.0.0.9+r14588-8), libtextcat-data
Provides: openoffice.org2-common, openoffice.org-l10n-en-us
Replaces: openoffice.org-debian-files, openoffice.org-mimelnk, openoffice.org (<< 1.9), openoffice.org2-common, openoffice.org-l10n-en-us, openoffice.org-l10n-en, openoffice.org-calc (<< 2.0.4~rc1), openoffice.org-base (<< 2.0.4~rc1), openoffice.org-math (<< 2.0.4~rc1), broffice.org (<< 2.2.1~rc1-1), openoffice.org-core (<< 1:3.0.1~rc1-3)
-Breaks: openoffice.org-style-crystal (<< ${basis-version}~),
- openoffice.org-style-oxygen (<< ${basis-version}~),
- openoffice.org-style-industrial (<< ${basis-version}~),
- openoffice.org-style-tango (<< ${basis-version}~),
- openoffice.org-style-hicontrast (<< ${basis-version}~),
- openoffice.org-style-galaxy (<< ${basis-version}~),
- openoffice.org-style-andromeda (<< ${basis-verision}~)
+Breaks: openoffice.org-style-crystal (<< 1:${basis-version}~),
+ openoffice.org-style-oxygen (<< 1:${basis-version}~),
+ openoffice.org-style-industrial (<< 1:${basis-version}~),
+ openoffice.org-style-tango (<< 1:${basis-version}~),
+ openoffice.org-style-hicontrast (<< 1:${basis-version}~),
+ openoffice.org-style-galaxy (<< 1:${basis-version}~),
+ openoffice.org-style-andromeda (<< 1:${basis-version}~),
+ openoffice.org-style-crystal (>= 1:${next-basis-version}~),
+ openoffice.org-style-oxygen (>= 1:${next-basis-version}~),
+ openoffice.org-style-industrial (>= 1:${next-basis-version}~),
+ openoffice.org-style-tango (>= 1:${next-basis-version}~),
+ openoffice.org-style-hicontrast (>= 1:${next-basis-version}~),
+ openoffice.org-style-galaxy (>= 1:${next-basis-version}~),
+ openoffice.org-style-andromeda (>= 1:${next-basis-version}~)
Description: office productivity suite -- arch-independent files
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'control.in'
--- a/control.in 2010-07-13 19:41:15 +0000
+++ b/control.in 2010-07-14 20:43:41 +0000
@@ -290,7 +290,7 @@
openclipart-openoffice.org (<= 0.18+dfsg-7),
dictionaries-common (<< 0.98.14),
openoffice.orgVER-core (<< 1:${basis-version}),
- openoffice.orgVER-core (>= 1:${basis-version}.99),
+ openoffice.orgVER-core (>= 1:${next-basis-version}~),
openoffice.org-writer2latex (<< 1.0-5),
openoffice.org-coooder (<< 1.1.1+ooo-build3.0.0.9+r14588-8),
libtextcat-data
@@ -307,13 +307,20 @@
openoffice.org-math (<< 2.0.4~rc1),
broffice.org (<< 2.2.1~rc1-1),
openoffice.org-core (<< 1:3.0.1~rc1-3)
-Breaks: openoffice.orgVER-style-crystal (<< ${basis-version}~),
- openoffice.orgVER-style-oxygen (<< ${basis-version}~),
- openoffice.orgVER-style-industrial (<< ${basis-version}~),
- openoffice.orgVER-style-tango (<< ${basis-version}~),
- openoffice.orgVER-style-hicontrast (<< ${basis-version}~),
- openoffice.orgVER-style-galaxy (<< ${basis-version}~),
- openoffice.orgVER-style-andromeda (<< ${basis-verision}~)
+Breaks: openoffice.orgVER-style-crystal (<< 1:${basis-version}~),
+ openoffice.orgVER-style-oxygen (<< 1:${basis-version}~),
+ openoffice.orgVER-style-industrial (<< 1:${basis-version}~),
+ openoffice.orgVER-style-tango (<< 1:${basis-version}~),
+ openoffice.orgVER-style-hicontrast (<< 1:${basis-version}~),
+ openoffice.orgVER-style-galaxy (<< 1:${basis-version}~),
+ openoffice.orgVER-style-andromeda (<< 1:${basis-version}~),
+ openoffice.orgVER-style-crystal (>= 1:${next-basis-version}~),
+ openoffice.orgVER-style-oxygen (>= 1:${next-basis-version}~),
+ openoffice.orgVER-style-industrial (>= 1:${next-basis-version}~),
+ openoffice.orgVER-style-tango (>= 1:${next-basis-version}~),
+ openoffice.orgVER-style-hicontrast (>= 1:${next-basis-version}~),
+ openoffice.orgVER-style-galaxy (>= 1:${next-basis-version}~),
+ openoffice.orgVER-style-andromeda (>= 1:${next-basis-version}~)
Description: office productivity suite -- arch-independent files
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'rules'
--- a/rules 2010-07-14 20:15:07 +0000
+++ b/rules 2010-07-14 20:43:41 +0000
@@ -25,6 +25,8 @@
#VER:=3
OOVER:=3.3
BASIS_VERSION:=$(OOVER)
+NEXT_OOVER:=$(shell echo "$(OOVER) + 0.1" | bc)
+NEXT_BASIS_VERSION:=$(NEXT_OOVER)
PACKAGES := $(shell dh_listpackages)
ARCH_INDEP_PACKAGES := $(shell dh_listpackages -i)
@@ -3821,6 +3823,7 @@
-Nlibuno-cli-ure1.0-cil -- \
-V'base-version=$(BASE_VERSION)' \
-V'basis-version=$(BASIS_VERSION)' \
+ -V'next-basis-version=$(NEXT_BASIS_VERSION)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
-V'common-bsh-depends=$(COMMON_BSH_DEPENDS)' \
-V'java-common-depends=$(JAVA_COMMON_DEPENDS)' \
Reply to: