[SCM] QCA2 library packaging branch, kubuntu_unstable, updated. debian/2.0.3-6-40-gc07c71a

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/qca2.git;a=commitdiff;h=c07c71a

The following commit has been merged in the kubuntu_unstable branch:
commit c07c71ac153f53f61de03887c3c36bb3bf998175
Merge: ec43d14f4decc1fef1359426dfe24c959af4fb72 ddc0d8721ea489e1af54794e4c6e17117361ecac
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Jan 21 11:29:58 2015 +0100

    merged kubuntu_vivid_archive

 debian/changelog                              |   17 +-
 debian/control                                |   89 +-
 debian/copyright                              |   19 +-
 debian/libqca-qt5-2-dev.install               |    5 -
 debian/libqca-qt5-2-plugins.install           |    5 -
 debian/libqca-qt5-2-plugins.lintian-overrides |    4 -
 debian/libqca-qt5-2.install                   |    1 -
 debian/libqca-qt5-2.symbols                   | 3235 -------------------------
 debian/libqca2-dev.install                    |    4 +-
 debian/libqca2-plugins.install                |    4 +-
 debian/libqca2.symbols                        |  154 +-
 debian/patches/series                         |    2 +
 debian/patches/upstream_watchfile-fixes.diff  |   48 +
 debian/qca-qt5-2-utils.install                |    3 -
 debian/qca-qt5-2-utils.lintian-overrides      |    1 -
 debian/rules                                  |   29 +-
 16 files changed, 181 insertions(+), 3439 deletions(-)

diff --cc debian/rules
index 437838b,e91cc23..0ef9875
--- a/debian/rules
+++ b/debian/rules
@@@ -7,40 -7,18 +7,17 @@@ include /usr/share/pkg-kde-tools/qt-kde
  
  DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
  
- # Separate Qt 5 build entirely to avoid one build overriding the other.
- QT5_PACKAGES = $(shell grep Package: debian/control | grep qt5 | grep -v '\-dbg' | sed -e 's/Package: //g')
- QT5_BUILD_DIR = "obj-$(DEB_HOST_MULTIARCH)-qt5"
- QT5_DH_EXCLUDE := $(foreach package, $(QT5_PACKAGES), -N $(package))
- QT5_DH_INCLUDE := $(foreach package, $(QT5_PACKAGES), -p $(package))
- 
- override_dh_auto_clean:
- 	$(overridden_command)
- 	rm -rf $(QT5_BUILD_DIR) debian/tmp-qt5
--
  override_dh_auto_configure:
- 	$(overridden_command) -- \
- 		-DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \
- 		-DQT4_BUILD=true \
- 		-DQCA_FEATURE_INSTALL_DIR=/usr/share/qt4/mkspecs/features/
- 	$(overridden_command) --builddirectory=$(QT5_BUILD_DIR) -- \
- 		-DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \
- 		-DQT4_BUILD=false \
- 		-DQCA_FEATURE_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/features \
- 		-DQCA_SUFFIX="qt5"
 -	$(overridden_command)                                   -- -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" -DQT4_BUILD=true
++	$(overridden_command) -- -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" -DQT4_BUILD=true
  
  override_dh_auto_build:
  	$(overridden_command)
  
  override_dh_auto_install:
  	$(overridden_command)
- 	$(overridden_command) --builddirectory=$(QT5_BUILD_DIR) --destdir=debian/tmp-qt5
  
  override_dh_install:
--	$(overridden_command) $(QT5_DH_EXCLUDE)
- 	# Qt 5 needs to fail missing as it won't be covered in regular list-missing magic :'<
- 	$(overridden_command) $(QT5_DH_INCLUDE) --sourcedir=debian/tmp-qt5 --fail-missing
++	$(overridden_command)
  
  override_dh_strip:
--	$(overridden_command) $(QT5_DH_EXCLUDE) --dbg-package=libqca2-dbg
- 	$(overridden_command) $(QT5_DH_INCLUDE) --dbg-package=libqca-qt5-2-dbg
++	$(overridden_command) --dbg-package=libqca2-dbg

-- 
QCA2 library packaging