[SCM] qtchooser packaging branch, master, updated. debian/52-gae5eeef-2-7-gde2e7f5

Dmitry Shachnev mitya57 at moszumanska.debian.org
Mon Mar 21 20:16:25 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtchooser.git;a=commitdiff;h=b42dc5c

The following commit has been merged in the master branch:
commit b42dc5c88bf284e195dfe1017e65c5eccab73515
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Mar 21 21:02:20 2016 +0100

    Ship configuration for Qt 4 and Qt 5 in this package (see #818536).
---
 debian/changelog |  1 +
 debian/control   |  2 ++
 debian/rules     | 12 ++++++++++++
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6079b80..64eb8f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qtchooser (55-gc9562a1-1) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * New upstream git snapshot.
   * Drop obsolete Breaks/Replaces on pre-Jessie packages.
+  * Ship configuration for Qt 4 and Qt 5 in this package (see #818536).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 21 Mar 2016 20:44:52 +0100
 
diff --git a/debian/control b/debian/control
index 8f49607..02b8557 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,8 @@ Package: qtchooser
 Architecture: any
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libqt5core5a (<< 5.5.1+dfsg-16~), libqtcore4 (<< 4:4.8.7+dfsg-7~)
+Replaces: libqt5core5a (<< 5.5.1+dfsg-16~), libqtcore4 (<< 4:4.8.7+dfsg-7~)
 Description: Wrapper to select between Qt development binary versions
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
diff --git a/debian/rules b/debian/rules
index 4252808..7348cb7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,18 @@ override_dh_auto_build:
 override_dh_auto_install:
 	make install INSTALL_ROOT=$(CURDIR)/debian/qtchooser
 
+	mkdir -p $(CURDIR)/debian/qtchooser/usr/share/qtchooser
+	mkdir -p $(CURDIR)/debian/qtchooser/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser
+
+	for ver in 4 5; do \
+		echo "/usr/lib/$(DEB_HOST_MULTIARCH)/qt$${ver}/bin" > $(CURDIR)/debian/qtchooser/usr/share/qtchooser/qt$${ver}-$(DEB_HOST_MULTIARCH).conf; \
+		echo "/usr/lib/$(DEB_HOST_MULTIARCH)" >> $(CURDIR)/debian/qtchooser/usr/share/qtchooser/qt$${ver}-$(DEB_HOST_MULTIARCH).conf; \
+		ln -s /usr/share/qtchooser/qt$${ver}-$(DEB_HOST_MULTIARCH).conf \
+			$(CURDIR)/debian/qtchooser/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/$${ver}.conf; \
+		ln -s /usr/share/qtchooser/qt$${ver}-$(DEB_HOST_MULTIARCH).conf \
+			$(CURDIR)/debian/qtchooser/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/qt$${ver}.conf; \
+	done
+
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	make check QMAKE=/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/qmake

-- 
qtchooser packaging



More information about the pkg-kde-commits mailing list