[libreoffice] 01/01: git update; jre-update-gt-99.diff and curl-7.50.0.diff are upstream
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit 60767633fd69d83a3aa52f0a1315606fe76bbbfc
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jul 30 15:34:31 2016 +0200
git update; jre-update-gt-99.diff and curl-7.50.0.diff are upstream
---
changelog | 6 ++++++
patches/curl-7.50.0.diff | 23 -----------------------
patches/jre-update-gt-99.diff | 31 -------------------------------
patches/series | 2 --
rules | 2 +-
5 files changed, 7 insertions(+), 57 deletions(-)
diff --git a/changelog b/changelog
index d57c1b7..5abef53 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.2.1~rc1~git20160730-1) UNRELEASED; urgency=medium
+
+ * new upstream snapshot
+
+ -- Rene Engelhard <rene@debian.org> Sat, 30 Jul 2016 15:31:55 +0200
+
libreoffice (1:5.2.0-1) unstable; urgency=medium
* LibreOffice 5.2.0 final (identical to rc4)
diff --git a/patches/curl-7.50.0.diff b/patches/curl-7.50.0.diff
deleted file mode 100644
index 4a947d0..0000000
--- a/patches/curl-7.50.0.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0b8e589875ffd84150470832de18ebd79989efc0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Mon, 25 Jul 2016 12:08:35 +0100
-Subject: curl 7.50.0 has CURL as typedef struct Curl_easy
-
-Change-Id: I22e5e2cdf78c38087579071c1b1570a8adc7d3c4
-
-diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx
-index be68d9a..315ccb7 100644
---- a/ucb/source/ucp/ftp/ftploaderthread.cxx
-+++ b/ucb/source/ucp/ftp/ftploaderthread.cxx
-@@ -71,7 +71,7 @@ FTPLoaderThread::~FTPLoaderThread() {
-
-
- CURL* FTPLoaderThread::handle() {
-- CURL* ret = osl_getThreadKeyData(m_threadKey);
-+ CURL* ret = static_cast<CURL*>(osl_getThreadKeyData(m_threadKey));
- if(!ret) {
- ret = curl_easy_init();
- if (ret != nullptr) {
---
-cgit v0.10.2
-
diff --git a/patches/jre-update-gt-99.diff b/patches/jre-update-gt-99.diff
deleted file mode 100644
index e92cd7e..0000000
--- a/patches/jre-update-gt-99.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From 191e3809f5d62392bf98b940ad8f6937ae5ee6c6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Fri, 22 Jul 2016 08:22:47 +0100
-Subject: Related: tdf#101057 allow java update version number > 99
-
-Change-Id: Icc37cf248fbf35f108eb5bbb25c36fbd54a9fe85
-(cherry picked from commit 64d3270a89fd88d4d0cf70329af2c66f722fd95e)
-Reviewed-on: https://gerrit.libreoffice.org/27425
-Tested-by: Jenkins <ci@libreoffice.org>
-Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-
-diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
-index 4787440..b4ad701 100644
---- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
-+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
-@@ -135,9 +135,9 @@ bool SunVersion::init(const char *szVersion)
- {
- if ( ! isdigit(*pCur))
- {
-- //1.4.1_01-, 1.4.1_01a, the numerical part may only be 2 chars.
-- int len = pCur - pLast;
-- if (len > 2)
-+ //1.8.0_102-, 1.8.0_01a,
-+ size_t len = pCur - pLast;
-+ if (len > sizeof(buf) - 1)
- return false;
- //we've got the update: 01, 02 etc
- strncpy(buf, pLast, len);
---
-cgit v0.10.2
-
diff --git a/patches/series b/patches/series
index c4e5dd7..8d6d406 100644
--- a/patches/series
+++ b/patches/series
@@ -30,5 +30,3 @@ rsc-no-error-about-unknown-switch.diff
debian-branding.diff
no-packagekit-per-default.diff
sparc64.diff
-jre-update-gt-99.diff
-curl-7.50.0.diff
diff --git a/rules b/rules
index 1827366..25137f7 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-2-0
+GIT_BRANCH=libreoffice-5-2
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: