[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

./packages/openofficeorg/3.3.0/experimental r2062: - generalize -style-* Breaks: in common to always break -style-*



------------------------------------------------------------
revno: 2062
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2010-07-13 21:41:15 +0200
message:
      - generalize -style-* Breaks: in common to always break -style-*
        (<< ${basis-version
modified:
  changelog
  control
  control.in
=== modified file 'changelog'
--- a/changelog	2010-07-06 18:34:07 +0000
+++ b/changelog	2010-07-13 19:41:15 +0000
@@ -21,8 +21,11 @@
   * debian/uno-libs3.symbols: update 
   * debian/broffice.org*: update diversions
   * 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}
 
- -- Rene Engelhard <rene@debian.org>  Tue, 29 Jun 2010 07:48:18 +0200
+ -- Rene Engelhard <rene@debian.org>  Tue, 13 Jul 2010 21:38:32 +0200
 
 openoffice.org (1:3.2.1-4) unstable; urgency=medium
 

=== modified file 'control'
--- a/control	2010-06-29 19:25:13 +0000
+++ b/control	2010-07-13 19:41:15 +0000
@@ -121,13 +121,13 @@
 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
 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 (<< 1:3.2.1~),
- openoffice.org-style-oxygen (<< 1:3.2.1~),
- openoffice.org-style-industrial (<< 1:3.2.1~),
- openoffice.org-style-tango (<< 1:3.2.1~),
- openoffice.org-style-hicontrast (<< 1:3.2.1~),
- openoffice.org-style-galaxy (<< 1:3.2.1~),
- openoffice.org-style-andromeda (<< 1:3.2.1~)
+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}~)
 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-06-29 19:25:13 +0000
+++ b/control.in	2010-07-13 19:41:15 +0000
@@ -307,13 +307,13 @@
  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 (<< 1:3.2.1~),
- openoffice.orgVER-style-oxygen (<< 1:3.2.1~),
- openoffice.orgVER-style-industrial (<< 1:3.2.1~),
- openoffice.orgVER-style-tango (<< 1:3.2.1~),
- openoffice.orgVER-style-hicontrast (<< 1:3.2.1~),
- openoffice.orgVER-style-galaxy (<< 1:3.2.1~),
- openoffice.orgVER-style-andromeda (<< 1:3.2.1~)
+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}~)
 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.


Reply to: