[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3_rc1-3-96-g3b2da8f
The following commit has been merged in the debian-experimental-4.1 branch:
commit fa6ca205918574867c88c8eeda9eafd89e87b2ba
Author: Rene Engelhard <rene@debian.org>
Date: Wed Apr 24 00:38:02 2013 +0200
Breaks: zotero-libreoffice-integration (<= 3.0.11.1-26-g08fb709-1)
diff --git a/changelog b/changelog
index 37e3368..730f061 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,14 @@ libreoffice (1:4.1.0~alpha1~git20130424-1) UNRELEASED; urgency=low
-- Rene Engelhard <rene@debian.org> Sat, 22 Dec 2012 18:03:18 +0100
+libreoffice (1:4.0.3~rc1-4) UNRELEASED; urgency=low
+
+ * debian/control.in:
+ - break zotero-libreoffice-integration (<= 3.0.11.1-26-g08fb709-1), see
+ #705998)
+
+ -- Rene Engelhard <rene@debian.org> Wed, 24 Apr 2013 00:20:09 +0200
+
libreoffice (1:4.0.3~rc1-3) experimental; urgency=low
* The "the third time is a charm" release
diff --git a/control b/control
index f1406d5..edeb45f 100644
--- a/control
+++ b/control
@@ -436,7 +436,8 @@ Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-writer2latex (<< 1.0.2-9),
libreoffice-writer2xhtml (<< 1.0.2-9),
libtextcat-data (<< 2.2-8),
- openoffice.org-common (<< 1:3.3.0~)
+ openoffice.org-common (<< 1:3.3.0~),
+ zotero-libreoffice-integration (<= 3.0.11.1-26-g08fb709-1)
Replaces: libreoffice-emailmerge (<< 1:4.0.2~rc1),
openoffice.org-common (<< 1:3.3.0~)
Description: office productivity suite -- arch-independent files
diff --git a/control.in b/control.in
index e82ecb0..609b712 100644
--- a/control.in
+++ b/control.in
@@ -301,7 +301,8 @@ Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-script-provider-js (<< 1:3.6~),
libreoffice-script-provider-python (<< 1:3.6~),
libreoffice-writer2latex (<< 1.0.2-9),
- libreoffice-writer2xhtml (<< 1.0.2-9)
+ libreoffice-writer2xhtml (<< 1.0.2-9),
+ zotero-libreoffice-integration (<= 3.0.11.1-26-g08fb709-1)
Replaces: openoffice.org-common (<< 1:3.3.0~), libreoffice-emailmerge (<< 1:4.0.2~rc1)
Description: office productivity suite -- arch-independent files
LibreOffice is a full-featured office productivity suite that provides
--
LibreOffice packaging repository
Reply to: