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

[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.0_beta2-2ubuntu3



The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 95ed9d91eaa8dd4e1823e0d64ac6b4bda8b90ef8
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Thu Jan 12 17:44:04 2012 +0100

    cherry-pick Replaces commit from 3.4 (LP: #705343)

diff --git a/changelog b/changelog
index ffe86e1..002b213 100644
--- a/changelog
+++ b/changelog
@@ -4,8 +4,9 @@ libreoffice (1:3.5.0~beta2-2ubuntu3) precise; urgency=low
   * get rid of obsolete BrOffice specialcasing (LP: #884786)
   * add control tags as per 'firefox distro add-on support'-spec (picked
     from oneiric-3.4)
+  * cherry-pick Replaces commit from 3.4 (LP: #705343)
 
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Thu, 12 Jan 2012 16:29:13 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Thu, 12 Jan 2012 17:42:41 +0100
 
 libreoffice (1:3.5.0~beta2-2ubuntu2) precise; urgency=low
 
diff --git a/control.in b/control.in
index 1f12425..da0cc10 100644
--- a/control.in
+++ b/control.in
@@ -340,6 +340,7 @@ Suggests: unixodbc,
  libmysql-java | libpg-java | libjtds-java,
  libreofficeVER-gcj,
  libreofficeVER-report-builder
+Replaces: openoffice.org-base (<< 1:3.3.0~rc3-2ubuntu3)
 Description: office productivity suite -- database
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.

-- 
LibreOffice packaging repository


Reply to: