[liborcus] 01/05: 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 liborcus.

commit e12de583b3cdb2ecc6108c6bf16c1abf06fe15de
Merge: 39398c1 73f8e66
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Sep 7 22:21:34 2016 +0200

    Merge branch 'master' into experimental

 debian/compat               |  2 +-
 debian/control              | 10 ++++++++--
 debian/liborcus-dev.install |  6 +++---
 debian/rules                |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --cc debian/control
index 73dec58,8c68f5e..0a5e882
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,8 +1,9 @@@
  Source: liborcus
  Priority: optional
- 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-iostreams-dev, libboost-program-options-dev, libboost-filesystem-dev, libmdds-dev (>= 1.2), chrpath, libixion-dev (>= 0.12.0~), python3-dev, sphinx-common
+ 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-iostreams-dev, libboost-program-options-dev, libboost-filesystem-dev, libmdds-dev (>= 1.2), chrpath, libixion-dev (>= 0.11.0~), python3-dev
++Build-Depends: debhelper (>= 9), zlib1g-dev, python3, dh-autoreconf, pkg-config, libboost-system-dev, dpkg-dev (>= 1.16.1), libboost-iostreams-dev, libboost-program-options-dev, libboost-filesystem-dev, libmdds-dev (>= 1.2), chrpath, libixion-dev (>= 0.12.0~), python3-dev, 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/orcus/orcus
@@@ -10,7 -10,8 +11,8 @@@
  Package: liborcus-dev
  Section: libdevel
  Architecture: any
+ Multi-Arch: same
 -Depends: liborcus-0.11-0 (= ${binary:Version}), liborcus-spreadsheet-model-0.11-0 (= ${binary:Version}), ${misc:Depends}
 +Depends: liborcus-0.12-0 (= ${binary:Version}), liborcus-spreadsheet-model-0.12-0 (= ${binary:Version}), ${misc:Depends}
  Description: library for processing spreadsheet documents -- development
   Orcus is a library that provides a collection of standalone file processing
   filters.  It is currently focused on providing filters for spreadsheet
@@@ -23,9 -24,11 +25,11 @@@
   This package contains headers, pkg-config file and static library for
   developing applications using Orcus.
  
 -Package: liborcus-0.11-0
 +Package: liborcus-0.12-0
  Section: libs
  Architecture: any
+ Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
  Depends: ${shlibs:Depends}, ${misc:Depends}
  Description: library for processing spreadsheet documents
   Orcus is a library that provides a collection of standalone file processing
@@@ -36,9 -39,11 +40,11 @@@
   The library currently includes filters for xlsx, ods, csv, and generic XML
   formats.
  
 -Package: liborcus-spreadsheet-model-0.11-0
 +Package: liborcus-spreadsheet-model-0.12-0
  Section: libs
  Architecture: any
+ Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
  Depends: ${shlibs:Depends}, ${misc:Depends}
  Description: library for processing spreadsheet documents - spreadsheet model library
   Orcus is a library that provides a collection of standalone file processing
diff --cc debian/rules
index d3adc43,3cc6533..cf2cddd
--- a/debian/rules
+++ b/debian/rules
@@@ -47,11 -36,7 +47,11 @@@ override_dh_auto_test
  endif
  
  override_dh_auto_install:
 -	dh_auto_install
 -	find debian/tmp/usr/lib/python* -name "*.*a" -exec rm {} \;
 -	chrpath -d debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/liborcus-0.11.so.0.0.0
 +	# otherwise dh_auto_install -pliborcus-doc doesn't work because there's
 +	# no debian/tmp it can cd from
 +	mkdir -p debian/tmp
 +	if [ -d src/.libs ]; then dh_auto_install; \
 +	find debian/tmp/usr/lib/python* -name "*.*a" -exec rm {} \; ; \
- 	chrpath -d debian/tmp/usr/lib/liborcus-0.12.so.0.0.0; \
++	chrpath -d debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/liborcus-0.12.so.0.0.0; \
 +	else dh_auto_install -- -pliborcus-doc; fi
  

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