[SCM] LibreOffice packaging repository branch, ubuntu-natty-3.3.1, updated. 5631d5668540739b506410ff78950e34d412c85c
The following commit has been merged in the ubuntu-natty-3.3.1 branch:
commit 5631d5668540739b506410ff78950e34d412c85c
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Mar 1 12:40:18 2011 +0100
lp#726921: make libreoffice-gtk recommend either tango or human
diff --git a/changelog b/changelog
index 1109628..06aa49b 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,10 @@
libreoffice (1:3.3.1-1ubuntu5) UNRELEASED; urgency=low
* completely disable the arm patch for natty (LP: #726529)
+ * make libreoffice-gtk recommend either tango or human (LP: #726921)
+ * regenerate control file
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 28 Feb 2011 18:56:50 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 01 Mar 2011 12:39:12 +0100
libreoffice (1:3.3.1-1ubuntu4) natty; urgency=low
diff --git a/control b/control
index b9fd752..11e2bf2 100644
--- a/control
+++ b/control
@@ -322,7 +322,7 @@ Description: office productivity suite -- Andromeda (Classic) symbol style
Package: libreoffice-gtk
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Recommends: libreoffice-style-tango
+Recommends: libreoffice-style-tango | libreoffice-style-human
Section: gnome
Enhances: libreoffice
Conflicts: libgtk2.0-0 (= 2.12.10-1) [amd64]
diff --git a/control.in b/control.in
index d3b30fd..b16bc66 100644
--- a/control.in
+++ b/control.in
@@ -461,7 +461,7 @@ Architecture: %OOO_ARCHS%
Depends: libreofficeVER-core (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
-Recommends: libreofficeVER-style-tango
+Recommends: libreofficeVER-style-tango | libreofficeVER-style-human
Section: gnome
Enhances: libreofficeVER
Conflicts: libgtk2.0-0 (= 2.12.10-1) [amd64]
--
LibreOffice packaging repository
Reply to: