[libreoffice] 01/01: git update; adapt for libi18nlangtag move to ure

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.

commit 65d3cd1c36fcd857bb9f446c3999c45bc68679a3
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Oct 27 19:04:37 2016 +0200

    git update; adapt for libi18nlangtag move to ure
---
 changelog                                  | 4 +++-
 control                                    | 3 ++-
 control.ure.in                             | 4 ++--
 patches/make-package-modules-not-suck.diff | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/changelog b/changelog
index 09c1d91..4909d46 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,6 @@
-libreoffice (1:5.3.0~alpha1-2) UNRELEASED; urgency=medium
+libreoffice (1:5.3.0~beta1~git20161026-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot
 
   * debian/scripts/get_libvlc_dep.sh: fix to work again (also) with
     new multiarchified libvlc5
diff --git a/control b/control
index 8ff51f1..cc657bf 100644
--- a/control
+++ b/control
@@ -4231,9 +4231,10 @@ Depends: uno-libs3 (= ${ure:Version}), ${misc:Depends}, ${shlibs:Depends}
 Suggests: java5-runtime
 Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22)
 Replaces: libreoffice-common (<< 1:4.5.0),
+          libreoffice-core (<< 1:5.3.0~beta1~),
           libreoffice-java-common (<< 1:3.0.0~dev300m12)
 Breaks: libreoffice-common (<< 1:4.5.0),
-        libreoffice-core (<< 1:4.1.2~),
+        libreoffice-core (<< 1:5.3.0~beta1~),
         openoffice.org-core (<< 1:3.3~)
 Description: LibreOffice UNO runtime environment
  The Uno Runtime Environment (URE) is the well-known UNO component model
diff --git a/control.ure.in b/control.ure.in
index 0b332cb..0e41fda 100644
--- a/control.ure.in
+++ b/control.ure.in
@@ -27,8 +27,8 @@ Architecture: %OOO_ARCHS%
 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), libreoffice-common (<< 1:4.5.0)
-Breaks: openoffice.org-core (<< 1:3.3~), libreoffice-core (<< 1:4.1.2~), libreoffice-common (<< 1:4.5.0)
+Replaces: libreoffice-java-common (<< 1:3.0.0~dev300m12), libreoffice-common (<< 1:4.5.0), libreoffice-core (<< 1:5.3.0~beta1~)
+Breaks: openoffice.org-core (<< 1:3.3~), libreoffice-core (<< 1:5.3.0~beta1~), libreoffice-common (<< 1:4.5.0)
 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/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index db3fa98..701a5f6 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -177,7 +177,7 @@ index 14a1c07..eab8078 100644
  	swd \
  	swui \
  	t602filter \
-@@ -546,14 +556,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
+@@ -553,14 +553,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
  	cached1 \
  	collator_data \
  	comphelper \
@@ -189,9 +189,9 @@ index 14a1c07..eab8078 100644
  	dict_zh \
  	embobj \
 -	$(if $(ENABLE_JAVA),hsqldb) \
- 	i18nlangtag \
  	i18nutil \
  	index_data \
+ 	$(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), libreofficekitgtk) \
 @@ -570,7 +578,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
  	package2 \
  	$(if $(USING_X11),recentfile) \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git