[SCM] LibreOffice packaging repository branch, ubuntu-quantal-3.6, updated. libreoffice_3.6.1_rc2-1-83-g16fa776
The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit 16fa776d009221bf043a0b1924fc572b1cfaa824
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Fri Oct 5 15:55:17 2012 +0200
lo-menubar is obsolete with this (C/P/R needs to stay there until 14.04 LTS)
diff --git a/changelog b/changelog
index 04ab113..7cd1c3d 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
-libreoffice (1:3.6.2~rc2-0ubuntu1) UNRELEASED; urgency=low
+libreoffice (1:3.6.2~rc2-0ubuntu1) quantal-proposed; urgency=low
* update to unitymenus patch to 7ffc24eb76325afef89c25e8a7fe13124ed5a041
+ * lo-menubar is obsolete with this
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 05 Oct 2012 14:24:00 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri, 05 Oct 2012 15:54:49 +0200
libreoffice (1:3.6.2~rc2-0ubuntu1~ppa2) quantal; urgency=low
diff --git a/control.in b/control.in
index 24d6f7e..45fbf0e 100644
--- a/control.in
+++ b/control.in
@@ -456,7 +456,9 @@ Depends: libreofficeVER-core (= ${binary:Version}),
Recommends: libreofficeVER-style-tango
Section: gnome
Enhances: libreofficeVER
-Conflicts: libgtk2.0-0 (= 2.12.10-1) [amd64]
+Conflicts: libgtk2.0-0 (= 2.12.10-1) [amd64], lo-menubar
+Provides: lo-menubar
+Replaces: lo-menubar
Description: office productivity suite -- GTK+ integration
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
--
LibreOffice packaging repository
Reply to: