[libreoffice] 01/01: git update; we now support firebird 3.0
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 50923dfd2543c2dfb2ac1d1079945de4207c37e6
Author: Rene Engelhard <rene@debian.org>
Date: Fri Jun 3 22:22:08 2016 +0200
git update; we now support firebird 3.0
---
changelog | 6 ++++++
control | 1 -
rules | 6 +-----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/changelog b/changelog
index a9e0c60..7ca91ae 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.3.0~alpha0~git20160603-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <rene@debian.org> Thu, 26 May 2016 20:00:57 +0200
+
libreoffice (1:5.2.0~beta1-1) experimental; urgency=medium
* New upstream beta release
diff --git a/control b/control
index bccf4f0..2b03843 100644
--- a/control
+++ b/control
@@ -167,7 +167,6 @@ Build-Conflicts: amd-libopencl1,
ant (= 1.8.0-1) [hppa ia64 s390 sparc],
ant (= 1.8.0-2) [hppa ia64 s390 sparc],
ant (= 1.8.0-3) [hppa ia64 s390 sparc],
- firebird-dev (>= 3.0),
flex (= 2.5.34-1) [amd64],
g++-4.6 (= 4.6.1-10),
g++-4.6 (= 4.6.1-11),
diff --git a/rules b/rules
index 306c906..09d1cdf 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
+GIT_BRANCH=master
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
@@ -1848,10 +1848,6 @@ ifneq "$(USE_MARIADB)" "y"
perl -pi -e "s/(Build-Conflicts: .*)/\1,libmariadbclient-dev,/" debian/control
endif
-ifeq "$(ENABLE_FIREBIRD)" "y"
- perl -pi -e "s/(Build-Conflicts: .*)/\1,firebird-dev (>= 3.0),/" debian/control
-endif
-
ifeq (4.4,$(SYSTEM_GCC_VERSION))
perl -pi -e 's/flex \|/flex (>= 2.5.25-7) |/' debian/control
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: