[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.1_rc1-2-177-g132031d
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit d8e4793a1e7e6cf7eca25fb0598c0d0d2c6db985
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Mar 5 23:42:44 2013 +0100
silent some lintian noise for unversioned breaks:
- promote Breaks to Conflicts against -binfilter as it will never return
- remove Breaks against -style-industrial which is long gone
diff --git a/changelog b/changelog
index 701c479..01cafb2 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,9 @@ libreoffice (1:4.0.1~rc2-0ubuntu1~raring1~ppa1) UNRELEASED; urgency=low
* use --with-all-tarballs in addition to our flags for getting the source
- this is so that ./configure doesnt stumble over other checks
- e.g. still needing gnomevfs
+ * silent some lintian noise for unversioned breaks:
+ - promote Breaks to Conflicts against -binfilter as it will never return
+ - remove Breaks against -style-industrial which is long gone
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 05 Mar 2013 18:49:03 +0100
diff --git a/control.in b/control.in
index fd17716..7c9e580 100644
--- a/control.in
+++ b/control.in
@@ -199,6 +199,7 @@ Conflicts: cacao-oj6-jre,
cli-uno-bridge (<< 1:3.0.0~dev300m22),
libcairo2 (= 1.4.8-1),
libicu38 (= 3.8~d01-1),
+ libreoffice-filter-binfilter,
libreoffice-style-andromeda (<< 1:3.3.0-1),
libreoffice-style-crystal (<< 1:3.3.0-1),
libreoffice-style-galaxy (<< 1:3.3.0-1),
@@ -239,7 +240,6 @@ Breaks: hunspell-ar (<< 0.0.0+20080110-1.1),
hunspell-vi (<< 1:3.1.0-3),
libreoffice-common (<< 1:3.6.1~rc1),
libreoffice-evolution (<< 1:3.4.1~),
- libreoffice-filter-binfilter,
libreoffice-kab (<< 1:3.4.1~),
libreoffice-sdbc-postgresql (<< 0.8.1~),
mozilla-libreoffice (<< 1:3.5.0~beta~),
@@ -326,7 +326,6 @@ Breaks: libreofficeVER-core (<< 1:${oover}~),
libreofficeVER-style-galaxy (>= 1:${next-oover}~),
libreofficeVER-style-hicontrast (<< 1:${oover}~),
libreofficeVER-style-hicontrast (>= 1:${next-oover}~),
- libreofficeVER-style-industrial,
libreofficeVER-style-oxygen (<< 1:${oover}~),
libreofficeVER-style-oxygen (>= 1:${next-oover}~),
libreofficeVER-style-tango (<< 1:${oover}~),
--
LibreOffice packaging repository
Reply to: