[libixion] 04/06: Merge branch 'master' into experimental

[Rene Engelhard]

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

rene pushed a commit to branch experimental
in repository libixion.

commit cdb33dd7a1a088b69ac8737c477aa79b4eb12ffd
Merge: 738873e 24320b5
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Sep 7 21:06:35 2016 +0200

    Merge branch 'master' into experimental

 debian/changelog               | 6 ++++++
 debian/compat                  | 2 +-
 debian/control                 | 5 ++++-
 debian/libixion-0.12-0.install | 2 +-
 debian/libixion-dev.install    | 6 +++---
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 005ef3e,628d9ca..e02efa9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,16 +1,27 @@@
 -libixion (0.11.1-3) unstable; urgency=medium
 +libixion (0.12.0-2) experimental; urgency=medium
  
 -  * [2173411] move Maintainer: to Debian LibreOffice Maintainers
 -  * [a5d70bb] multiarchify (closes: #798609)
 +  * [21ed27b] add missing python3-sphinx-bootstrap-theme,python3-breathe to
 +              Build-Depends-Indep
 +  * [8c3d270] use --with sphinxdoc
 +  * [16a28a9] add sphinx-common to Build-Depends for --with sphinxdoc
 +  * [ece7cba] use usr/lib/python*/*-packages/ixion.so in python3-ixion.install
  
 - -- Rene Engelhard <rene at debian.org>  Wed, 07 Sep 2016 20:44:49 +0200
 + -- Rene Engelhard <rene at debian.org>  Tue, 23 Aug 2016 22:42:20 +0200
 +
 +libixion (0.12.0-1) experimental; urgency=medium
 +
 +  * [88a7a13] Imported Upstream version 0.12.0
 +  * [fcdaf76] adapt for libixion-0.12.so.0
 +  * [93015c5] build libixion-doc
 +
 + -- Rene Engelhard <rene at debian.org>  Mon, 25 Jul 2016 14:13:16 +0200
  
+ libixion (0.11.1-2) unstable; urgency=medium
+ 
+   * upload to unstable
+ 
+  -- Rene Engelhard <rene at debian.org>  Sat, 14 May 2016 10:44:19 +0200
+ 
  libixion (0.11.1-1) experimental; urgency=medium
  
    * Imported Upstream version 0.11.1
diff --cc debian/control
index 2599885,e767292..92a8269
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,8 +1,8 @@@
  Source: libixion
  Priority: optional
 -Maintainer: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
 -Uploaders: Rene Engelhard <rene at debian.org>
 -Build-Depends: debhelper (>= 9), zlib1g-dev, python3, dh-autoreconf, pkg-config, libboost-system-dev, dpkg-dev (>= 1.16.1), libboost-thread-dev, libboost-program-options-dev, libmdds-dev (>= 1.2), python3-dev, dh-python
 +Maintainer: Rene Engelhard <rene at debian.org>
- Build-Depends: debhelper (>= 8.0.0), zlib1g-dev, python3, dh-autoreconf, pkg-config, libboost-system-dev, dpkg-dev (>= 1.16.1), libboost-thread-dev, libboost-program-options-dev, libmdds-dev (>= 1.2), python3-dev, dh-python, sphinx-common
++Build-Depends: debhelper (>= 9), zlib1g-dev, python3, dh-autoreconf, pkg-config, libboost-system-dev, dpkg-dev (>= 1.16.1), libboost-thread-dev, libboost-program-options-dev, libmdds-dev (>= 1.2), python3-dev, dh-python, sphinx-common
 +Build-Depends-Indep: doxygen, python3-sphinx, python3-sphinx-bootstrap-theme,python3-breathe
  Standards-Version: 3.9.3
  Section: libs
  Homepage: https://gitlab.com/ixion/ixion
@@@ -10,7 -10,8 +10,8 @@@
  Package: libixion-dev
  Section: libdevel
  Architecture: any
+ Multi-Arch: same
 -Depends: libixion-0.11-0 (= ${binary:Version}), ${misc:Depends}, libmdds-dev (>= 1.2)
 +Depends: libixion-0.12-0 (= ${binary:Version}), ${misc:Depends}, libmdds-dev (>= 1.2)
  Description: general purpose formula parser & interpreter library -- development
   Ixion is a general purpose formula parser & interpreter that can calculate
   multiple named targets, or “cells”.
@@@ -18,9 -19,11 +19,11 @@@
   This package contains headers, pkg-config file and static library for
   developing applications using Ixion.
  
 -Package: libixion-0.11-0
 +Package: libixion-0.12-0
  Section: libs
  Architecture: any
+ Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
  Depends: ${shlibs:Depends}, ${misc:Depends}
  Description: general purpose formula parser & interpreter library
   Ixion is a general purpose formula parser & interpreter that can calculate
diff --cc debian/libixion-0.12-0.install
index cd8e23a,0000000..6dc3232
mode 100644,000000..100644
--- a/debian/libixion-0.12-0.install
+++ b/debian/libixion-0.12-0.install
@@@ -1,1 -1,0 +1,1 @@@
- usr/lib/libixion*-0.12.so.*
++usr/lib/*/libixion*-0.12.so.*

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