[SCM] Qt 4 packaging branch, master, updated. debian/4.8.6+git155-g716fbae+dfsg-2-6-g1378500

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 1378500a18d9760eeec2cc477d39139e98b8cae8
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed May 6 14:15:43 2015 -0300

    Remove libqt4-private-dev.
    
    Only gammaray is using it and it's about to use an internal copy.
---
 debian/changelog                  |  2 ++
 debian/control                    | 13 -------------
 debian/libqt4-private-dev.install |  8 --------
 debian/rules                      | 12 ------------
 4 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4f1ba66..236e246 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qt4-x11 (4:4.8.6+git155-g716fbae+dfsg-3) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Remove dummy transitional packages libqt4-webkit[-dbg], libqt4-assistant,
     libqt4-gui and libqt4-core.
+  * Remove libqt4-private-dev. The only package using it is gammaray (#763852)
+    which at the moment of this writing has it fixed in it's repo.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 05 May 2015 18:50:37 -0300
 
diff --git a/debian/control b/debian/control
index 38afb92..8f38176 100644
--- a/debian/control
+++ b/debian/control
@@ -512,19 +512,6 @@ Description: Qt 4 development programs
  applications, such as moc, qdbuscpp2xml, qdbusxml2cpp, qt3to4, rcc, uic3,
  and uic.
 
-Package: libqt4-private-dev
-Architecture: any
-Section: libdevel
-Depends: libqt4-dev (= ${binary:Version}), ${misc:Depends}
-Description: Qt 4 private development files
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the private header development files for building some
- Qt 4 applications like Qt Creator QML Designer plugin.
- .
- Use at your own risk.
-
 Package: libqt4-opengl-dev
 Architecture: any
 Section: libdevel
diff --git a/debian/libqt4-private-dev.install b/debian/libqt4-private-dev.install
deleted file mode 100644
index edfefa3..0000000
--- a/debian/libqt4-private-dev.install
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/include/qt4/QtCore/private/
-usr/include/qt4/QtDeclarative/private/
-usr/include/qt4/QtGui/private/
-usr/include/qt4/QtScript/private/
-usr/include/src/corelib/
-usr/include/src/declarative/
-usr/include/src/gui/
-usr/include/src/script/
diff --git a/debian/rules b/debian/rules
index 8a84e6e..e07d3b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -263,18 +263,6 @@ override_dh_auto_install:
 	# Remove libtool-like files
 	rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
-	# Ship private headers - ugly hack to build Qt Creator QML Designer
-	cd $(CURDIR)/include && rsync -aR QtCore/private \
-	                                  QtDeclarative/private \
-	                                  QtGui/private \
-	                                  QtScript/private \
-	                                  ../debian/tmp/usr/include/qt4/
-	cd $(CURDIR) && rsync -aR src/corelib/*/*_p.h \
-	                          src/declarative/*/*_p.h \
-	                          src/gui/*/*_p.h \
-	                          src/script/*/*_p.h \
-	                          debian/tmp/usr/include/
-
 	# Fix wrong path in pkgconfig files
 	find $(CURDIR)/debian/tmp/usr/lib/*/pkgconfig -type f -name '*.pc' \
 		-exec perl -pi -e "s, -L$(CURDIR)/?\S+,,g" {} \;

-- 
Qt 4 packaging