[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.2_rc1-1-36-ge3b4171
The following commit has been merged in the debian-experimental-4.0 branch:
commit 0b6bb2370c4629dd60712c7e1cf03a9f14894929
Author: Rene Engelhard <rene@debian.org>
Date: Mon Mar 25 17:16:59 2013 +0100
fix merge
diff --git a/changelog b/changelog
index 137e1db..03788e9 100644
--- a/changelog
+++ b/changelog
@@ -18,6 +18,11 @@ libreoffice (1:4.0.2~rc2-1) UNRELEASED; urgency=low
* debian/control.in:
- mention that python-uno is for old python2 compatibility and move to
oldlibs
+ - make -base recommend -writer (because forms in base need it), thanks#
+ Lionel Elie Mamane
+ - make -common break all pre-3.6 extensions (closes: #686666)
+ - revert make -help-en-us break "the others" to work around 682838
+ as it breaks the installer (reopens: #682838)
* debian/control.libreloho.in:
- librelogo needs -writer (see
http://lists.freedesktop.org/archives/libreoffice/2013-March/048222.html)
@@ -106,26 +111,11 @@ libreoffice (1:4.0.0-1) experimental; urgency=low
* debian/*.mime:
- don't use obsolete -no-oosplash anymore, thanks Matthijs Kooijman
for the patch (closes: #698845)
- - revert make -help-en-us break "the others" to work around 682838
- as it breaks the installer (reopens: #682838)
* debian/copyright: update
* debian/control.mozilla.in: OOo -> "old OOo and OpenDocument"
(closes: #699708)
-<<<<<<< HEAD
-- Rene Engelhard <rene@debian.org> Thu, 07 Feb 2013 00:53:51 +0100
-=======
- * debian/control.in:
- - remove bogus | python3-uno dependency alternatives. Will properly be back
- with LO 4.0 which supports python3
- - make -base recommend -writer (because forms in base need it), thanks#
- Lionel Elie Mamane
- - make -common break all pre-3.6 extensions (closes: #686666)
- * debian/control.help.in:
- - remove obsolete ${java-common-depends} Recommends
-
- -- Rene Engelhard <rene@debian.org> Mon, 18 Mar 2013 23:50:23 +0100
->>>>>>> origin/debian-experimental-3.6
libreoffice (1:3.6.5-1) experimental; urgency=low
diff --git a/control b/control
index 90c0ff5..1944b55 100644
--- a/control
+++ b/control
@@ -414,6 +414,7 @@ Provides: libreoffice-l10n-en-us
Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-core (>= 1:${next-oover}~),
libreoffice-mysql-connector (<< 1.0.1+LibO3.6.5-1),
+ libreoffice-pdfimport (<< 1.0.6),
libreoffice-presentation-minimizer (<< 1.0.4),
libreoffice-presenter-console (<< 1.1.1) libreoffice-wiki-publisher (<< 1.1.2),
libreoffice-report-builder (<< 1.2.3),
@@ -432,7 +433,7 @@ Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-style-tango (<< 1:${oover}~),
libreoffice-style-tango (>= 1:${next-oover}~),
libtextcat-data (<< 2.2-8),
- openoffice.org-common (<< 1:3.3.0~) libreoffice-pdfimport (<< 1.0.6)
+ 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
diff --git a/control.in b/control.in
index 7e7516e..0ebceb6 100644
--- a/control.in
+++ b/control.in
@@ -291,7 +291,7 @@ Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-style-tango (<< 1:${oover}~),
libreoffice-style-tango (>= 1:${next-oover}~),
libtextcat-data (<< 2.2-8),
- openoffice.org-common (<< 1:3.3.0~)
+ openoffice.org-common (<< 1:3.3.0~),
libreoffice-pdfimport (<< 1.0.6),
libreoffice-presenter-console (<< 1.1.1)
libreoffice-wiki-publisher (<< 1.1.2),
--
LibreOffice packaging repository
Reply to: