[libreoffice] 01/01: start 5.0.3 stuff; 795131.diff is upstream
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 60380576cb73290823a6369dde466cacee7edaba
Author: Rene Engelhard <rene@debian.org>
Date: Thu Sep 17 23:17:44 2015 +0200
start 5.0.3 stuff; 795131.diff is upstream
---
changelog | 6 ++++++
patches/795131.diff | 23 -----------------------
patches/series | 1 -
rules | 2 +-
4 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/changelog b/changelog
index 7c7ecc3..0c4a34a 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.0.3~rc1~git20150917-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <rene@debian.org> Thu, 17 Sep 2015 18:20:07 +0200
+
libreoffice (1:5.0.2~rc2-1) UNRELEASED; urgency=medium
* New upstream release candidate
diff --git a/patches/795131.diff b/patches/795131.diff
deleted file mode 100644
index 8acd4cf..0000000
--- a/patches/795131.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-From e5539b0b53ebaf9b792652e4866eeacf8c10b101 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Fri, 28 Aug 2015 15:09:31 +0100
-Subject: deb#795131 plausible fix
-
-Change-Id: I95c191ed865d6920845b146c3ef4baf30280a734
-
-diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
-index 823d741..9d7284f 100644
---- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
-+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
-@@ -382,6 +382,8 @@ Reference< css::datatransfer::XTransferable > VclGtkClipboard::getContents() thr
- void VclGtkClipboard::ClipboardGet(GtkClipboard* /*clipboard*/, GtkSelectionData *selection_data,
- guint info)
- {
-+ if (!m_aContents.is())
-+ return;
-
- GdkAtom type(gdk_atom_intern(OUStringToOString(m_aInfoToFlavor[info].MimeType,
- RTL_TEXTENCODING_UTF8).getStr(),
---
-cgit v0.10.2
-
diff --git a/patches/series b/patches/series
index 9caea4f..8d6e17e 100644
--- a/patches/series
+++ b/patches/series
@@ -30,4 +30,3 @@ gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
liborcus-0.9.1.diff
disable-tiledrendering-test.diff
-795131.diff
diff --git a/rules b/rules
index 624980b..374a49c 100755
--- a/rules
+++ b/rules
@@ -73,7 +73,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-2
+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: