[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3_rc1-3-100-g1576990



The following commit has been merged in the debian-experimental-4.1 branch:
commit 1576990bf1a2e3dbb3c55a8539bb9acf628ea7a1
Author: Rene Engelhard <rene@debian.org>
Date:   Sat May 4 14:10:11 2013 +0200

    Make ure break older LOs, libjvmfwk.so.3 is gone/renamed

diff --git a/control b/control
index 10cbe60..c7c72b2 100644
--- a/control
+++ b/control
@@ -908,7 +908,7 @@ Depends: uno-libs3 (= ${ure:Version}), ${misc:Depends}, ${shlibs:Depends}
 Suggests: java5-runtime
 Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22)
 Replaces: libreoffice-java-common (<< 1:3.0.0~dev300m12)
-Breaks: openoffice.org-core (<< 1:3.3~)
+Breaks: libreoffice-core (<< 1:4.1.0~alpha), openoffice.org-core (<< 1:3.3~)
 Description: LibreOffice UNO runtime environment
  The Uno Runtime Environment (URE) is the well-known UNO component model
  of LibreOffice, packaged up as an individual product.
diff --git a/control.ure.in b/control.ure.in
index 58b5c14..d59f531 100644
--- a/control.ure.in
+++ b/control.ure.in
@@ -27,7 +27,7 @@ Depends: uno-libs3 (= ${ure:Version}), ${misc:Depends}, ${shlibs:Depends}
 Suggests: java5-runtime
 Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22)
 Replaces: libreoffice-java-common (<< 1:3.0.0~dev300m12)
-Breaks: openoffice.org-core (<< 1:3.3~)
+Breaks: openoffice.org-core (<< 1:3.3~), libreoffice-core (<< 1:4.1.0~alpha)
 Description: LibreOffice UNO runtime environment
  The Uno Runtime Environment (URE) is the well-known UNO component model
  of LibreOffice, packaged up as an individual product.

-- 
LibreOffice packaging repository


Reply to: