[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.2_rc2-1-234-g084972c
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 67fce3bdd1d661300bd1ae82a2c99375e14d87ff
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Mar 28 09:39:27 2013 +0100
make -emailmerge B/R consistent
diff --git a/changelog b/changelog
index a9f700e..1efc847 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:4.0.2~rc2-0ubuntu1~raring1~ppa2) raring; urgency=low
+
+ * make -emailmerge B/R consistent
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 28 Mar 2013 09:38:30 +0100
+
libreoffice (1:4.0.2~rc2-0ubuntu1~raring1~ppa1) raring; urgency=low
* merge from Debian
diff --git a/control.in b/control.in
index 1f3c6fe..298aa82 100644
--- a/control.in
+++ b/control.in
@@ -301,7 +301,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.1~rc2),
+Replaces: libreoffice-emailmerge (<< 1:4.0.2~rc2),
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: