[SCM] qtbase packaging branch, experimental, updated. debian/5.8.0+dfsg-1-8-gd2643de
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Sat Feb 11 09:32:24 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=4873c1b
The following commit has been merged in the experimental branch:
commit 4873c1b50954fb7c61b263b523e44dc1c8633dd8
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Fri Feb 10 18:34:29 2017 +0300
Switch from *.install-* files to dh-exec based .install files.
---
debian/changelog | 1 +
debian/control | 1 +
debian/libqt5core5a.install | 3 ++
debian/libqt5core5a.install-common | 1 -
debian/libqt5core5a.install-i386 | 1 -
debian/libqt5gui5.install | 26 ++++++++++++
debian/libqt5gui5.install-common | 13 ------
debian/libqt5gui5.install-i386 | 1 -
debian/libqt5gui5.install-kfreebsd | 5 ---
debian/libqt5gui5.install-linux | 11 -----
debian/libqt5network5.install | 5 +++
debian/libqt5network5.install-common | 2 -
debian/libqt5network5.install-linux | 2 -
...ase5-dev.install-common => qtbase5-dev.install} | 5 +++
debian/qtbase5-dev.install-kfreebsd | 4 --
debian/qtbase5-dev.install-linux | 4 --
debian/rules | 49 ----------------------
17 files changed, 41 insertions(+), 93 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b61189c..f597f8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtbase-opensource-src (5.8.0+dfsg-2) UNRELEASED; urgency=medium
* Add a patch to fix compilation error on big endian systems because of
missing semicolon (qvnc_semicolon.diff).
* Add a patch to fix compilation error on Hurd (hurd_tilde.diff).
+ * Switch from *.install-* files to dh-exec based .install files.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 10 Feb 2017 16:46:27 +0300
diff --git a/debian/control b/debian/control
index 678e48f..d0f6ad2 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Uploaders: Sune Vuorela <sune at debian.org>,
Dmitry Shachnev <mitya57 at debian.org>
Build-Depends: debhelper (>= 9.20160114~),
default-libmysqlclient-dev,
+ dh-exec,
dpkg-dev (>= 1.16.1),
firebird-dev [kfreebsd-any linux-any],
freetds-dev,
diff --git a/debian/libqt5core5a.install b/debian/libqt5core5a.install
new file mode 100755
index 0000000..af93654
--- /dev/null
+++ b/debian/libqt5core5a.install
@@ -0,0 +1,3 @@
+#! /usr/bin/dh-exec
+[any-i386] usr/lib/*/sse2/libQt5Core.so.*
+usr/lib/*/libQt5Core.so.*
diff --git a/debian/libqt5core5a.install-common b/debian/libqt5core5a.install-common
deleted file mode 100644
index 9e7ea9b..0000000
--- a/debian/libqt5core5a.install-common
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libQt5Core.so.*
diff --git a/debian/libqt5core5a.install-i386 b/debian/libqt5core5a.install-i386
deleted file mode 100644
index dff78b8..0000000
--- a/debian/libqt5core5a.install-i386
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/sse2/libQt5Core.so.*
diff --git a/debian/libqt5gui5.install b/debian/libqt5gui5.install
new file mode 100755
index 0000000..f83b90c
--- /dev/null
+++ b/debian/libqt5gui5.install
@@ -0,0 +1,26 @@
+#! /usr/bin/dh-exec
+[any-i386] usr/lib/*/sse2/libQt5Gui.so.*
+[kfreebsd-any linux-any] usr/lib/*/libQt5EglFSDeviceIntegration.so.*
+[kfreebsd-any linux-any] usr/lib/*/libQt5EglFsKmsSupport.so.*
+[kfreebsd-any linux-any] usr/lib/*/qt5/plugins/egldeviceintegrations/*
+[kfreebsd-any linux-any] usr/lib/*/qt5/plugins/platforms/libqeglfs.so
+[kfreebsd-any linux-any] usr/lib/*/qt5/plugins/platforms/libqminimalegl.so
+[linux-any] usr/lib/*/qt5/plugins/generic/libqevdevkeyboardplugin.so
+[linux-any] usr/lib/*/qt5/plugins/generic/libqevdevmouseplugin.so
+[linux-any] usr/lib/*/qt5/plugins/generic/libqevdevtabletplugin.so
+[linux-any] usr/lib/*/qt5/plugins/generic/libqevdevtouchplugin.so
+[linux-any] usr/lib/*/qt5/plugins/generic/libqlibinputplugin.so
+[linux-any] usr/lib/*/qt5/plugins/platforms/libqlinuxfb.so
+usr/lib/*/libQt5Gui.so.*
+usr/lib/*/libQt5XcbQpa.so.*
+usr/lib/*/qt5/plugins/generic/libqtuiotouchplugin.so
+usr/lib/*/qt5/plugins/imageformats/libqgif.so
+usr/lib/*/qt5/plugins/imageformats/libqico.so
+usr/lib/*/qt5/plugins/imageformats/libqjpeg.so
+usr/lib/*/qt5/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so
+usr/lib/*/qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so
+usr/lib/*/qt5/plugins/platforms/libqminimal.so
+usr/lib/*/qt5/plugins/platforms/libqoffscreen.so
+usr/lib/*/qt5/plugins/platforms/libqvnc.so
+usr/lib/*/qt5/plugins/platforms/libqxcb.so
+usr/lib/*/qt5/plugins/xcbglintegrations/*
diff --git a/debian/libqt5gui5.install-common b/debian/libqt5gui5.install-common
deleted file mode 100644
index 9a7be0f..0000000
--- a/debian/libqt5gui5.install-common
+++ /dev/null
@@ -1,13 +0,0 @@
-usr/lib/*/libQt5Gui.so.*
-usr/lib/*/libQt5XcbQpa.so.*
-usr/lib/*/qt5/plugins/generic/libqtuiotouchplugin.so
-usr/lib/*/qt5/plugins/imageformats/libqgif.so
-usr/lib/*/qt5/plugins/imageformats/libqico.so
-usr/lib/*/qt5/plugins/imageformats/libqjpeg.so
-usr/lib/*/qt5/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so
-usr/lib/*/qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so
-usr/lib/*/qt5/plugins/platforms/libqminimal.so
-usr/lib/*/qt5/plugins/platforms/libqoffscreen.so
-usr/lib/*/qt5/plugins/platforms/libqxcb.so
-usr/lib/*/qt5/plugins/platforms/libqvnc.so
-usr/lib/*/qt5/plugins/xcbglintegrations/*
diff --git a/debian/libqt5gui5.install-i386 b/debian/libqt5gui5.install-i386
deleted file mode 100644
index 4732aad..0000000
--- a/debian/libqt5gui5.install-i386
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/sse2/libQt5Gui.so.*
diff --git a/debian/libqt5gui5.install-kfreebsd b/debian/libqt5gui5.install-kfreebsd
deleted file mode 100644
index 90f5a42..0000000
--- a/debian/libqt5gui5.install-kfreebsd
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/*/libQt5EglFSDeviceIntegration.so.*
-usr/lib/*/libQt5EglFsKmsSupport.so.*
-usr/lib/*/qt5/plugins/egldeviceintegrations/*
-usr/lib/*/qt5/plugins/platforms/libqeglfs.so
-usr/lib/*/qt5/plugins/platforms/libqminimalegl.so
diff --git a/debian/libqt5gui5.install-linux b/debian/libqt5gui5.install-linux
deleted file mode 100644
index 06a36d2..0000000
--- a/debian/libqt5gui5.install-linux
+++ /dev/null
@@ -1,11 +0,0 @@
-usr/lib/*/libQt5EglFSDeviceIntegration.so.*
-usr/lib/*/libQt5EglFsKmsSupport.so.*
-usr/lib/*/qt5/plugins/egldeviceintegrations/*
-usr/lib/*/qt5/plugins/generic/libqevdevkeyboardplugin.so
-usr/lib/*/qt5/plugins/generic/libqevdevmouseplugin.so
-usr/lib/*/qt5/plugins/generic/libqevdevtabletplugin.so
-usr/lib/*/qt5/plugins/generic/libqevdevtouchplugin.so
-usr/lib/*/qt5/plugins/generic/libqlibinputplugin.so
-usr/lib/*/qt5/plugins/platforms/libqeglfs.so
-usr/lib/*/qt5/plugins/platforms/libqlinuxfb.so
-usr/lib/*/qt5/plugins/platforms/libqminimalegl.so
diff --git a/debian/libqt5network5.install b/debian/libqt5network5.install
new file mode 100755
index 0000000..74a2876
--- /dev/null
+++ b/debian/libqt5network5.install
@@ -0,0 +1,5 @@
+#! /usr/bin/dh-exec
+[linux-any] usr/lib/*/qt5/plugins/bearer/libqconnmanbearer.so
+[linux-any] usr/lib/*/qt5/plugins/bearer/libqnmbearer.so
+usr/lib/*/libQt5Network.so.*
+usr/lib/*/qt5/plugins/bearer/libqgenericbearer.so
diff --git a/debian/libqt5network5.install-common b/debian/libqt5network5.install-common
deleted file mode 100644
index d5b2c30..0000000
--- a/debian/libqt5network5.install-common
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libQt5Network.so.*
-usr/lib/*/qt5/plugins/bearer/libqgenericbearer.so
diff --git a/debian/libqt5network5.install-linux b/debian/libqt5network5.install-linux
deleted file mode 100644
index b87a3d6..0000000
--- a/debian/libqt5network5.install-linux
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/qt5/plugins/bearer/libqconnmanbearer.so
-usr/lib/*/qt5/plugins/bearer/libqnmbearer.so
diff --git a/debian/qtbase5-dev.install-common b/debian/qtbase5-dev.install
old mode 100644
new mode 100755
similarity index 99%
rename from debian/qtbase5-dev.install-common
rename to debian/qtbase5-dev.install
index 5759a94..624c341
--- a/debian/qtbase5-dev.install-common
+++ b/debian/qtbase5-dev.install
@@ -1,3 +1,8 @@
+#! /usr/bin/dh-exec
+[kfreebsd-any linux-any] usr/lib/*/libQt5EglFSDeviceIntegration.prl
+[kfreebsd-any linux-any] usr/lib/*/libQt5EglFSDeviceIntegration.so
+[kfreebsd-any linux-any] usr/lib/*/libQt5EglFsKmsSupport.prl
+[kfreebsd-any linux-any] usr/lib/*/libQt5EglFsKmsSupport.so
usr/include/*/qt5/QtConcurrent/QtConcurrent
usr/include/*/qt5/QtConcurrent/QtConcurrentDepends
usr/include/*/qt5/QtConcurrent/QtConcurrentFilter
diff --git a/debian/qtbase5-dev.install-kfreebsd b/debian/qtbase5-dev.install-kfreebsd
deleted file mode 100644
index 0350ba5..0000000
--- a/debian/qtbase5-dev.install-kfreebsd
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/*/libQt5EglFSDeviceIntegration.prl
-usr/lib/*/libQt5EglFSDeviceIntegration.so
-usr/lib/*/libQt5EglFsKmsSupport.prl
-usr/lib/*/libQt5EglFsKmsSupport.so
diff --git a/debian/qtbase5-dev.install-linux b/debian/qtbase5-dev.install-linux
deleted file mode 100644
index 0350ba5..0000000
--- a/debian/qtbase5-dev.install-linux
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/*/libQt5EglFSDeviceIntegration.prl
-usr/lib/*/libQt5EglFSDeviceIntegration.so
-usr/lib/*/libQt5EglFsKmsSupport.prl
-usr/lib/*/libQt5EglFsKmsSupport.so
diff --git a/debian/rules b/debian/rules
index b2a14fe..8678fce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,24 +17,6 @@ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
# Upstream changelog
upstream_changes := dist/changes-$(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | cut -f1 -d '-' | sed -e 's/+dfsg//' | sed -e 's/+git.*//')
-# To easier the files installation according to OSes and CPUs, we create three
-# kinds of install files: foo.install-common, foo.install-$DEB_HOST_ARCH_CPU and
-# foo.install-$DEB_HOST_ARCH_OS. In this case we can fine-tune what we install.
-#
-# Note that if any foo.install-* file exists and foo.install exist too, the
-# later will get overwritten.
-#
-# I've opened a bug in debhelper to allow this:
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=703201
-
-# Retrieve packages that have a .install-common file
-pkgs_with_common = $(patsubst debian/%.install-common,%,$(wildcard debian/*.install-common))
-# Retrieve packages that have a .install-$DEB_HOST_ARCH_CPU file
-pkgs_with_arch = $(patsubst debian/%.install-$(DEB_HOST_ARCH_CPU),%,$(wildcard debian/*.install-$(DEB_HOST_ARCH_CPU)))
-# Retrieve packages that have a .install-$DEB_HOST_ARCH_OS file
-pkgs_with_os = $(patsubst debian/%.install-$(DEB_HOST_ARCH_OS),%,$(wildcard debian/*.install-$(DEB_HOST_ARCH_OS)))
-
-
ifneq (,$(filter libqt5sql5-ibase,$(shell dh_listpackages)))
extra_configure_opts += -plugin-sql-ibase
else
@@ -289,21 +271,6 @@ override_dh_auto_install-indep:
dh_auto_build -- INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
override_dh_install:
- # Now flush all the .install-* files as .install files.
- set -e; for pkg in $(pkgs_with_common); do \
- cat debian/$$pkg.install-common >> debian/$$pkg.install ; \
- done
-
- set -e; for pkg in $(pkgs_with_arch); do \
- cat debian/$$pkg.install-$(DEB_HOST_ARCH_CPU) >> debian/$$pkg.install ; \
- done
-
- set -e; for pkg in $(pkgs_with_os); do \
- cat debian/$$pkg.install-$(DEB_HOST_ARCH_OS) >> debian/$$pkg.install ; \
- done
-
- # Call dh_install normally. It will process .install, .install.ARCH
- # and/or .install.OS files.
dh_install --fail-missing
override_dh_installdocs:
@@ -323,19 +290,3 @@ override_dh_strip:
override_dh_makeshlibs:
dh_makeshlibs -V -XlibQt5EglFSDeviceIntegration -XlibQt5EglFsKmsSupport -XlibQt5XcbQpa
-
-override_dh_clean:
- dh_clean
-
- # Don't forget to remove the .install files we generated.
- for pkg in $(pkgs_with_common); do \
- rm -f debian/$$pkg.install ; \
- done
-
- for pkg in $(pkgs_with_arch); do \
- rm -f debian/$$pkg.install ; \
- done
-
- for pkg in $(pkgs_with_os); do \
- rm -f debian/$$pkg.install ; \
- done
--
qtbase packaging
More information about the pkg-kde-commits
mailing list