[libreoffice] 01/03: start 6.1

[Rene Engelhard]

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

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

commit 33f006f193fb4d0de141e325ba357940e7901561
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 28 00:05:03 2017 +0100

    start 6.1
---
 changelog                                    |  6 +++
 patches/fix-includes-in-aarch64-bridge.patch | 70 ----------------------------
 patches/series                               |  1 -
 rules                                        |  6 +--
 4 files changed, 9 insertions(+), 74 deletions(-)

diff --git a/changelog b/changelog
index 823b7ff..870b955 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:6.1.0~alpha1~git20171125-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot
+
+ -- Rene Engelhard <rene at debian.org>  Tue, 07 Nov 2017 20:59:01 +0100
+
 libreoffice (1:6.0.0~beta1-2) UNRELEASED; urgency=medium
 
   * debian/libreoffice-common.{triggers,postinst}.in,
diff --git a/patches/fix-includes-in-aarch64-bridge.patch b/patches/fix-includes-in-aarch64-bridge.patch
deleted file mode 100644
index 45e0c79..0000000
--- a/patches/fix-includes-in-aarch64-bridge.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 897c07bda2d116bcc2fa4a64c1eb75a52651c991 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Sun, 26 Nov 2017 16:04:25 +0100
-Subject: [PATCH] fix includes in aarch64 bridge
-
-Change-Id: Ia27f15483c27bc43a3cd3a74432f15fa928ad6da
----
- bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx                 | 2 +-
- bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx | 2 +-
- bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx             | 2 +-
- bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx             | 4 ++--
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
-index fa6ffebfbc17..da22eb436b8f 100644
---- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
-+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
-@@ -38,7 +38,7 @@
- #include <uno/any2.h>
- #include <uno/mapping.h>
- 
--#include <abi.hxx>
-+#include "abi.hxx"
- #include <osl/mutex.hxx>
- #include <unordered_map>
- 
-diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx
-index 09f7696cfb4a..2f7188ea4f99 100644
---- a/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx
-+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx
-@@ -24,7 +24,7 @@
- #include <sal/types.h>
- #include <sal/alloca.h>
- 
--#include <callvirtualfunction.hxx>
-+#include "callvirtualfunction.hxx"
- 
- void callVirtualFunction(
-     unsigned long function, unsigned long * gpr, unsigned long * fpr,
-diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
-index 3d8eea4503e9..d867a04dd299 100644
---- a/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
-+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
-@@ -40,7 +40,7 @@
- #include <types.hxx>
- #include <vtablefactory.hxx>
- 
--#include <abi.hxx>
-+#include "abi.hxx"
- 
- extern "C" void vtableSlotCall_();
- 
-diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx
-index 4e7d69b0a871..8faccbf3edaf 100644
---- a/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx
-+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx
-@@ -42,8 +42,8 @@
- #include <uno/any2.h>
- #include <uno/data.h>
- 
--#include <abi.hxx>
--#include <callvirtualfunction.hxx>
-+#include "abi.hxx"
-+#include "callvirtualfunction.hxx"
- 
- namespace {
- 
--- 
-2.14.1
-
diff --git a/patches/series b/patches/series
index fdf594d..e3d0b7f 100644
--- a/patches/series
+++ b/patches/series
@@ -32,4 +32,3 @@ cppunit-optional.diff
 disable-unused-test-programs.diff
 disable-tests-somehow-needing-more-fonts.diff
 tdf108963-test.diff
-fix-includes-in-aarch64-bridge.patch
diff --git a/rules b/rules
index c698106..9f47224 100755
--- a/rules
+++ b/rules
@@ -22,8 +22,8 @@ CURDIR ?= $(realpath $(dir $(firstword $(MAKEFILE_LIST)))/..)
 BASE_VERSION:=$(shell echo $(DEB_VERSION) | cut -d: -f1):$(DEB_VERSION_UPSTREAM)
 BINARY_VERSION=$(DEB_VERSION)
 #HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d: -f2 | tr [~] [\\-])
-HELP_L10N_VIRTUAL_VERSION:=6.0
-OOVER:=6.0
+HELP_L10N_VIRTUAL_VERSION:=6.1
+OOVER:=6.1
 NEXT_OOVER:=$(shell echo "$(OOVER) + 0.1" | bc)
 
 ARCH_INDEP_PACKAGES := $(shell dh_listpackages -i)
@@ -74,7 +74,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-6-0
+GIT_BRANCH=master
 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