[SCM] qtsvg packaging branch, experimental, updated. debian/5.5.1-2-6-g4973000

Dmitry Shachnev mitya57 at moszumanska.debian.org
Sat Feb 20 18:36:14 UTC 2016


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

The following commit has been merged in the experimental branch:
commit 6b7bbcbf5277102bd8a2da71964b8c3a657c00ea
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Feb 20 16:26:34 2016 +0300

    Stop running pkgkde-mark-qt5-private-symbols script during build.
    
    The new way is that the maintainers run it themselves after each symbols
    update.
    
    Also drop the associated hack to move the private headers from
    debian/tmp.
---
 debian/changelog |  5 +++++
 debian/rules     | 15 ++-------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e7b013..354bd87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ qtsvg-opensource-src (5.6.0~beta-1) UNRELEASED; urgency=medium
   * New upstream beta release.
     - Bump Qt build dependencies.
 
+  [ Dmitry Shachnev ]
+  * Stop running pkgkde-mark-qt5-private-symbols script during build. The new
+    way is that the maintainers run it themselves after each symbols update.
+    Also drop the associated hack to move the private headers from debian/tmp.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 20 Feb 2016 09:53:23 -0300
 
 qtsvg-opensource-src (5.5.1-2) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 9a0c403..c84ff74 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,10 +39,8 @@ override_dh_auto_install-arch:
 	# Remove libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
-	# Move private headers out of debian/tmp
-	mkdir -p debian/private-headers
-	mv -v debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtSvg/*/QtSvg/private \
-		debian/private-headers/QtSvg
+	# Remove private headers
+	rm -rfv debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtSvg/*/QtSvg/private
 
 	# Remove other private stuff
 	rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/modules/qt_lib_svg_private.pri
@@ -52,12 +50,3 @@ override_dh_auto_install-indep:
 
 override_dh_install:
 	dh_install --fail-missing
-
-override_dh_makeshlibs:
-	dh_makeshlibs
-	# Check for private symbols not marked as such.
-	pkgkde-mark-private-symbols debian/private-headers
-
-override_dh_clean:
-	dh_clean
-	rm -rfv debian/private-headers

-- 
qtsvg packaging



More information about the pkg-kde-commits mailing list