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

[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_3.6.4-1-339-gbcbcb4c



The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 4f2a1d4d7b80edad158908cbb17e05afbd5f695a
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Mon Jan 14 17:31:13 2013 +0100

    add epoch -- doh

diff --git a/changelog b/changelog
index e49ed08..f149f06 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:4.0.0~beta2-0ubuntu1~ppa3) raring; urgency=low
+
+  * add epoch for -gnome C/R
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com>  Mon, 14 Jan 2013 17:31:17 +0100
+
 libreoffice (1:4.0.0~beta2-0ubuntu1~ppa2) raring; urgency=low
 
   * merge from debian
diff --git a/control.in b/control.in
index 1e36bd4..7041942 100644
--- a/control.in
+++ b/control.in
@@ -499,8 +499,8 @@ Depends: libreofficeVER-core (= ${binary:Version}),
 Suggests: libreofficeVER-evolution
 Section: gnome
 Enhances: libreofficeVER
-Conflicts: libreofficeVER-core (<< 3.9999)
-Replaces: libreofficeVER-core (<<3.9999)
+Conflicts: libreofficeVER-core (<< 1:3.9999)
+Replaces: libreofficeVER-core (<< 1:3.9999)
 Provides: libreoffice-gtk-gnome
 Description: office productivity suite -- GNOME integration
  LibreOffice is a full-featured office productivity suite that provides

-- 
LibreOffice packaging repository


Reply to: