[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.2_rc2-1-250-g3aa7282
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 3aa7282fda14b11c21c739f103803438370af5c2
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Apr 9 14:43:16 2013 +0200
reduce diff to Debian: << -emailmerge 1:4.0.2~rc1 should do
- we never released a 1:4.0.2~rc1 final even in the ppa, only prereleases
diff --git a/changelog b/changelog
index 68eeb82..bb10800 100644
--- a/changelog
+++ b/changelog
@@ -14,7 +14,7 @@ libreoffice (1:4.0.2-0ubuntu1) raring; urgency=low
* remove self-conflicts
* build against system liblangtag (requested by Benjamin Drung)
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 08 Apr 2013 12:57:00 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 09 Apr 2013 14:48:23 +0200
libreoffice (1:4.0.2~rc2-1) experimental; urgency=low
diff --git a/control.in b/control.in
index 903fe98..8f51aee 100644
--- a/control.in
+++ b/control.in
@@ -276,7 +276,7 @@ Conflicts: broffice, libreoffice-l10n-3.5, libreoffice-l10n-3.6
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-core (>= 1:${next-oover}~),
- libreoffice-emailmerge (<< 1:4.0.2~rc2),
+ libreoffice-emailmerge (<< 1:4.0.2~rc1),
libreoffice-style-andromeda (<< 1:${oover}~),
libreoffice-style-crystal (<< 1:${oover}~),
libreoffice-style-crystal (>= 1:${next-oover}~),
@@ -299,7 +299,7 @@ Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-script-provider-bsh (<< 1:3.6~),
libreoffice-script-provider-js (<< 1:3.6~),
libreoffice-script-provider-python (<< 1:3.6~)
-Replaces: libreoffice-emailmerge (<< 1:4.0.2~rc2),
+Replaces: libreoffice-emailmerge (<< 1:4.0.2~rc1),
openoffice.org-common (<< 1:3.3.0~)
Description: office productivity suite -- arch-independent files
LibreOffice is a full-featured office productivity suite that provides
--
LibreOffice packaging repository
Reply to: