[libreoffice] 01/01: start 5.0.4 stuff; back to -5-0; update icu-56.diff
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.0
in repository libreoffice.
commit 0f8f05f5e5a58361b0c195e74976fbf0e3c69438
Author: Rene Engelhard <rene@debian.org>
Date: Sun Nov 8 12:18:05 2015 +0100
start 5.0.4 stuff; back to -5-0; update icu-56.diff
---
changelog | 6 ++++++
patches/icu-56.diff | 60 ++++++++++++++++++++++++-----------------------------
rules | 2 +-
3 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/changelog b/changelog
index 325cfca..92f87d8 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.0.4~rc1~git20151108-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <rene@debian.org> Mon, 02 Nov 2015 23:02:09 +0100
+
libreoffice (1:5.0.3-1) UNRELEASED; urgency=medium
* New upstream release (identical to rc2)
diff --git a/patches/icu-56.diff b/patches/icu-56.diff
index 46ac8e0..2177f57 100644
--- a/patches/icu-56.diff
+++ b/patches/icu-56.diff
@@ -1,10 +1,3 @@
-From 5b7e8efbf4d73e385c8fb3469a23c0b2592bfb57 Mon Sep 17 00:00:00 2001
-From: Eike Rathke <erack@redhat.com>
-Date: Tue, 20 Oct 2015 14:19:12 +0200
-Subject: Upgrade to ICU 56.1
-
-Change-Id: Icc3d66c16fca95aa890aee6c67c84674fef878fc
-
From 2d636b56d8ae75140a1d972b52a0fdb7bffae8c3 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Wed, 21 Oct 2015 14:47:04 +0200
@@ -22,44 +15,45 @@ Change-Id: I08acd0f6bc1a00b9dbaa6711b09222eff388ad17
diff -u b/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
--- b/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
-@@ -1582,6 +1582,38 @@
- aAllSubsets.push_back( Subset( 0x118A0, 0x118FF, RID_SUBSETSTR_WARANG_CITI ) );
+@@ -1575,29 +1575,35 @@ void SubsetMap::InitList()
break;
#endif
-+#if U_ICU_VERSION_MAJOR_NUM >= 56
-+ case UBLOCK_AHOM:
+ #if U_ICU_VERSION_MAJOR_NUM >= 56
+- /* FIXME: add RID_... to include/svx/ucsubset.hrc and
+- * strings to svx/source/dialog/ucsubset.src and Unicode
+- * block ranges to aAllSubsets, for now this only
+- * compiles.. */
+ case UBLOCK_AHOM:
+ aAllSubsets.push_back( Subset( 0x11700, 0x1173F, RID_SUBSETSTR_AHOM ) );
-+ break;
-+ case UBLOCK_ANATOLIAN_HIEROGLYPHS:
+ break;
+ case UBLOCK_ANATOLIAN_HIEROGLYPHS:
+ aAllSubsets.push_back( Subset( 0x14400, 0x1467F, RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS ) );
-+ break;
-+ case UBLOCK_CHEROKEE_SUPPLEMENT:
+ break;
+ case UBLOCK_CHEROKEE_SUPPLEMENT:
+ aAllSubsets.push_back( Subset( 0xAB70, 0xABFF, RID_SUBSETSTR_CHEROKEE_SUPPLEMENT ) );
-+ break;
-+ case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E:
+ break;
+ case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E:
+ aAllSubsets.push_back( Subset( 0x2B820, 0x2CEAF, RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E ) );
-+ break;
-+ case UBLOCK_EARLY_DYNASTIC_CUNEIFORM:
+ break;
+ case UBLOCK_EARLY_DYNASTIC_CUNEIFORM:
+ aAllSubsets.push_back( Subset( 0x12480, 0x1254F, RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM ) );
-+ break;
-+ case UBLOCK_HATRAN:
+ break;
+ case UBLOCK_HATRAN:
+ aAllSubsets.push_back( Subset( 0x108E0, 0x108FF, RID_SUBSETSTR_HATRAN ) );
-+ break;
-+ case UBLOCK_MULTANI:
+ break;
+ case UBLOCK_MULTANI:
+ aAllSubsets.push_back( Subset( 0x11280, 0x112AF, RID_SUBSETSTR_MULTANI ) );
-+ break;
-+ case UBLOCK_OLD_HUNGARIAN:
+ break;
+ case UBLOCK_OLD_HUNGARIAN:
+ aAllSubsets.push_back( Subset( 0x10C80, 0x10CFF, RID_SUBSETSTR_OLD_HUNGARIAN ) );
-+ break;
-+ case UBLOCK_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS:
+ break;
+ case UBLOCK_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS:
+ aAllSubsets.push_back( Subset( 0x1F900, 0x1F9FF, RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS ) );
-+ break;
-+ case UBLOCK_SUTTON_SIGNWRITING:
+ break;
+ case UBLOCK_SUTTON_SIGNWRITING:
+ aAllSubsets.push_back( Subset( 0x1D800, 0x1DAAF, RID_SUBSETSTR_SUTTON_SIGNWRITING ) );
-+ break;
-+#endif
-
- }
+ break;
+ #endif
--- a/include/svx/ucsubset.hrc
+++ b/include/svx/ucsubset.hrc
diff --git a/rules b/rules
index e7ad78b..53faae3 100755
--- a/rules
+++ b/rules
@@ -72,7 +72,7 @@ lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentf
# NOT in proper libreoffice-3-6 branch
# use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=libreoffice-5-0-3
+GIT_BRANCH=libreoffice-5-0
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: