[libreoffice] 27/152: Merge tag 'libreoffice_5.1.0_rc1-1' of git://anonscm.debian.org/pkg-openoffice/libreoffice into ubuntu-xenial-5.1

[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 22ac187b95ac59e0e232e0704cc7ec6293937bb8
Merge: cc83fe0 2d84a5a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Jan 13 11:14:55 2016 +0100

    Merge tag 'libreoffice_5.1.0_rc1-1' of git://anonscm.debian.org/pkg-openoffice/libreoffice into ubuntu-xenial-5.1
    
    tag libreoffice 1:5.1.0~rc1-1

 changelog                                 |  28 ++-
 ure.poms => libreoffice-officebean.poms   |   4 +-
 patches/disable-npapi-plugin-support.diff |  28 +++
 patches/poms.diff                         | 322 ++++++++++++++++++++++++++++++
 patches/series                            |   2 +
 pom.juh.xml.in                            |  33 ---
 pom.jurt.xml.in                           |  33 ---
 pom.ridl.xml.in                           |  33 ---
 pom.unoil.xml.in                          |  33 ---
 rules                                     |  44 ++--
 shlibs.override.orcus                     |   3 +-
 source/include-binaries                   |   1 -
 ure.poms                                  |   1 +
 13 files changed, 405 insertions(+), 160 deletions(-)

diff --cc changelog
index 85dcc03,ab6085b..5d4bfce
--- a/changelog
+++ b/changelog
@@@ -1,16 -1,15 +1,27 @@@
- libreoffice (1:5.1.0~rc1-0ubuntu1) xenial; urgency=medium
++libreoffice (1:5.1.0~rc1-1ubuntu1) xenial; urgency=medium
 +
 +  * bump to rc1 and enable l10n
 +
 + -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Mon, 11 Jan 2016 22:36:03 +0100
 +
+ libreoffice (1:5.1.0~rc1-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+     - doesn't link evoab2 to gtk2 anymore (closes: #807640)
+ 
+   * debian/patches/disable-npapi-plugin-support.diff: as name says,
+     the only serious usecase is the doomed Flash anyway and it's
+     causes a link against gtk2 in -core (closes: #807601)
+ 
+  -- Rene Engelhard <rene at debian.org>  Wed, 16 Dec 2015 10:15:06 +0100
+ 
 +libreoffice (1:5.1.0~beta1-0ubuntu1) xenial; urgency=medium
 +
 +  * new upstream prerelease
 +
 + -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Mon, 30 Nov 2015 23:31:49 +0100
 +
- libreoffice (1:5.1.0~beta1-1) experimental; urgency=medium
+ libreoffice (1:5.1.0~beta2-1) experimental; urgency=medium
  
    * New upstream beta release
      - fixes crash when selecting the border style in some window managers
@@@ -31,21 -35,14 +47,27 @@@
      use pure perl for determining the version; taken from upstreams win
      installer
  
-  -- Rene Engelhard <rene at debian.org>  Thu, 26 Nov 2015 00:35:29 +0100
+   * debian/ure.poms, debian/rules: also install ures unoloader.jar into maven
+   * debian/libreoffice-officebean.poms, debian/rules: also install
+     officebean.jar into maven
+   * debian/*.pom.in, debian/rules: remove own poms and create final poms
+     with version from upstreams one
+ 
+  -- Rene Engelhard <rene at debian.org>  Fri, 04 Dec 2015 08:04:18 +0100
  
 +libreoffice (1:5.1.0~alpha1-4ubuntu4) xenial; urgency=medium
 +
 +  * add all build deps for report builder
 +
 + -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Thu, 26 Nov 2015 15:31:59 +0100
 +
 +libreoffice (1:5.1.0~alpha1-4ubuntu3) xenial; urgency=medium
 +
 +  * revert move of liblpsolve when --with-system-lpsolve, is already done
 +    upstream
 +
 + -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Tue, 24 Nov 2015 05:09:06 +0100
 +
  libreoffice (1:5.1.0~alpha1-4) experimental; urgency=medium
  
    * debian/rules:
diff --cc patches/series
index 42a819c,54e13cd..4c76d4b
--- a/patches/series
+++ b/patches/series
@@@ -26,5 -27,6 +26,7 @@@ odk-no-dot.dif
  hppa-is-32bit.diff
  gcj-no-bitness-check.diff
  rsc-no-error-about-unknown-switch.diff
 -debian-branding.diff
+ poms.diff
+ disable-npapi-plugin-support.diff
 +lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
 +integraltrans.diff
diff --cc rules
index 676d7e0,5124083..4464c04
--- a/rules
+++ b/rules
@@@ -405,8 -394,9 +396,8 @@@ endi
  ENABLE_EVO2=y
  ENABLE_GCONF=y
  ENABLE_GIO=y
 -ENABLE_DCONF=y
  ENABLE_RANDR=y
- SYSTEM_STUFF += npapi-headers
+ #SYSTEM_STUFF += npapi-headers
  PACKAGE_BASE=y
  ENABLE_GRAPHITE=y
  SYSTEM_STUFF += graphite

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