diff options
| author | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2014-05-23 16:11:08 -0300 |
|---|---|---|
| committer | Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> | 2014-05-23 16:11:08 -0300 |
| commit | 0b34fd46a27459a9ad33212054da86d788bd78ec (patch) | |
| tree | 659c7480f1502cd5126cde97d9bbfc6494b75e42 /debian | |
| parent | 94385fe7817450c1f4132e93942c505aaf322895 (diff) | |
| download | qt5webkit-0b34fd46a27459a9ad33212054da86d788bd78ec.tar.gz | |
Remove private headers with m-a path.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | debian/rules | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index ccc2dd6..1d05103 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ qtwebkit-opensource-src (5.3.0+dfsg-1) UNRELEASED; urgency=medium * Refresh no_gc_sections.diff. * Install headers in their new multi-arch qualified path. Marhe the development package as Multi-Arch: same. + * Take into account the new multi-arch path for removing the private + headers. -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sat, 17 May 2014 23:25:31 -0300 diff --git a/debian/rules b/debian/rules index 0813ae3..81ed086 100755 --- a/debian/rules +++ b/debian/rules @@ -65,11 +65,11 @@ override_dh_auto_install-arch: -exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \; # Remove private headers - rm -rf debian/tmp/usr/include/qt5/QtWebKit/*/QtWebKit - rm -rf debian/tmp/usr/include/qt5/QtWebKitWidgets/*/QtWebKitWidgets + rm -rf debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtWebKit/*/QtWebKit + rm -rf debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtWebKitWidgets/*/QtWebKitWidgets # And associated files - rm -fv debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_webkit_private.pri - rm -fv debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri + rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/modules/qt_lib_webkit_private.pri + rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri # Remove libtool-like files rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la |