[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.1_rc1-2-42-g3dd82a1
The following commit has been merged in the debian-experimental-4.0 branch:
commit 3dd82a1f32746007d3b305a4c2fa49d19de3b9e5
Author: Rene Engelhard <rene@debian.org>
Date: Tue Mar 12 13:41:52 2013 +0100
regen control
diff --git a/control b/control
index f7f887d..52efafe 100644
--- a/control
+++ b/control
@@ -425,7 +425,8 @@ Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-style-tango (>= 1:${next-oover}~),
libtextcat-data (<< 2.2-8),
openoffice.org-common (<< 1:3.3.0~)
-Replaces: openoffice.org-common (<< 1:3.3.0~)
+Replaces: libreoffice-emailmerge (<< 1:4.0.1~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
a near drop-in replacement for Microsoft(R) Office.
@@ -449,10 +450,7 @@ Depends: libreoffice-base-core (= ${binary:Version}),
libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Recommends: libreoffice-emailmerge,
- libreoffice-math,
- ${java-common-depends},
- ${java-runtime-depends}
+Recommends: libreoffice-math, ${java-common-depends}, ${java-runtime-depends}
Replaces: libreoffice-core (<< 1:3.3.2-5)
Suggests: libreoffice-base, libreoffice-gcj
Description: office productivity suite -- word processor
@@ -682,19 +680,6 @@ Description: office productivity suite -- GNOME integration
* libreoffice-evolution: Evolution addressbook support
* evolution
-Package: libreoffice-emailmerge
-Architecture: all
-Depends: libreoffice-core, ${misc:Depends}, ${python:Depends}, ${pyuno-depends}
-Enhances: libreoffice-writer
-Breaks: ure (<< 1.5.1+OOo3.1.1-15)
-Replaces: python-uno (<< 1:2.4.1-5)
-Description: office productivity suite -- email mail merge
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains a component which allows LibreOffice to "mail merge"
- to E-Mail.
-
Package: python-uno
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
@@ -3509,11 +3494,21 @@ Package: libreoffice-presenter-console
Section: oldlibs
Priority: extra
Architecture: all
-Depends: libreoffice-impress (>= 4.0.0)
-Description: transitional package for LibreOffice presenter's console
+Depends: libreoffice-impress (>= 1:4.0.0)
+Description: transitional package for the LibreOffice presenter console
This package used to contain the LibreOffice presenter console. It has been
integrated with LibreOffice Impress 4.0. You can safely remove this package.
+Package: libreoffice-emailmerge
+Architecture: all
+Section: oldlibs
+Priority: extra
+Depends: libreoffice-common (>= 1:4.0.2~rc1)
+Description: transitional package for LibreOffices email meil merge
+ This package used to contain the email merge module for LibreOffice. It has
+ been integrated in libreoffice-common now.You can safely remove this
+ package.
+
Package: libreoffice-help-en-us
Conflicts: libreoffice-help-ca,
libreoffice-help-ca-xv,
--
LibreOffice packaging repository
Reply to: