[libreoffice] 83/152: Import 1:5.2.0~beta1-1ubuntu2

[Rene Engelhard]

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

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit aea9f1bf1ccd2437aa5ced2804245f3d609638cf
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Thu Jun 30 22:23:45 2016 +0200

    Import 1:5.2.0~beta1-1ubuntu2
---
 changelog     | 12 ++++++++++++
 control       |  0
 rules         |  5 +++++
 tests/control |  2 +-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 00e86d4..48fc273 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,15 @@
+libreoffice (1:5.2.0~beta1-1ubuntu2) yakkety; urgency=medium
+
+  * for now stay with plain libreoffice-dbg
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Tue, 07 Jun 2016 13:40:58 +0200
+
+libreoffice (1:5.2.0~beta1-1ubuntu1) yakkety; urgency=medium
+
+  * first post-merge build of 5.2
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Mon, 06 Jun 2016 00:10:23 +0200
+
 libreoffice (1:5.2.0~beta1-1) experimental; urgency=medium
 
   * New upstream beta release
diff --git a/control b/control
deleted file mode 100644
index e69de29..0000000
diff --git a/rules b/rules
index 2a981d1..7225c83 100755
--- a/rules
+++ b/rules
@@ -200,6 +200,11 @@ BUILD_DBG_PACKAGE=n
 ifneq (noddebs,$(findstring noddebs,$(DEB_BUILD_OPTIONS)))
 BUILD_DBGSYM_PACKAGES=y
 endif
+ifeq "$(DEB_VENDOR)" "Ubuntu"
+  # for now stay with plain libreoffice-dbg
+  BUILD_DBG_PACKAGE=y
+  BUILD_DBGSYM_PACKAGES=n
+endif
 
 ifeq "$(BUILD_DBGSYM_PACKAGES)$(BUILD_DBG_PACKAGE)" "yy"
 $(error only either -dbgsym or -dbg allowed)
diff --git a/tests/control b/tests/control
index daceace..c21ae5b 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
 Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~2 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libpoppler-dev (>= 0.12.0), libpoppler-private-dev, li [...]
 
 Tests: pyuno-import
 Depends: python3-uno

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git