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

[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.3-1-3-g5b80de0



The following commit has been merged in the master branch:
commit 31bd563e28b3a28a971ddfcbd176c191a0bcd95e
Author: Rene Engelhard <rene@debian.org>
Date:   Thu May 9 13:38:19 2013 +0200

    add Breaks: libjaxe-java (<= 3.5-2)

diff --git a/changelog b/changelog
index c236dfb..cb07c23 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:4.0.3-2) UNRELEASED; urgency=low
+
+  * debian/control.in:
+    - add Breaks: libjaxe-java (<= 3.5-2) for saxon9.jar disappearing from
+      -java-common
+
+ -- Rene Engelhard <rene@debian.org>  Fri, 10 May 2013 16:58:08 +0200
+
 libreoffice (1:4.0.3-1) unstable; urgency=low
 
   * LibreOffice 4.0.3 final (identical to rc3)
diff --git a/control b/control
index 67deea5..b854cf1 100644
--- a/control
+++ b/control
@@ -449,6 +449,7 @@ Description: office productivity suite -- arch-independent files
 Package: libreoffice-java-common
 Architecture: all
 Depends: libreoffice-common, ${java:Depends}, ${misc:Depends}
+Breaks: libjaxe-java (<= 3.5-2)
 Description: office productivity suite -- arch-independent Java support files
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.in b/control.in
index 7159d4b..5926a56 100644
--- a/control.in
+++ b/control.in
@@ -315,6 +315,7 @@ Description: office productivity suite -- arch-independent files
 Package: libreoffice-java-common
 Architecture: all
 Depends: libreoffice-common, ${java:Depends}, ${misc:Depends}
+Breaks: libjaxe-java (<= 3.5-2)
 Description: office productivity suite -- arch-independent Java support files
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.

-- 
LibreOffice packaging repository


Reply to: