[SCM] qtmultimedia packaging branch, master, updated. debian/5.0.2-4-7-gef58310

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit ef58310c7f41ff81f74f02d07847a6ec0a09da79
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Jul 11 20:34:20 2013 -0300

    Remove package qtmultimedia5-private-dev.
    
    Nothing in the Qt stack seems to be using it. Can be reintroduced later if needed.
---
 debian/changelog                         |    4 ++
 debian/control                           |   14 -------
 debian/qtmultimedia5-private-dev.install |   65 ------------------------------
 debian/rules                             |    4 ++
 4 files changed, 8 insertions(+), 79 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7cf2cf7..368f90d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ qtmultimedia-opensource-src (5.1.0-1) UNRELEASED; urgency=low
   * Update symbols files.
   * Fix watch file.
   * Bump build dependencies to 5.1.0~.
+  * Remove package qtmultimedia5-private-dev. Nothing in the Qt stack seems to
+    be using it. Can be reintroduced later if needed.
+    - Remove associated install file.
+    - Remove the files from debian/tmp before installing the packages.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 03 Jul 2013 19:40:01 +0400
 
diff --git a/debian/control b/debian/control
index be59361..7b0249c 100644
--- a/debian/control
+++ b/debian/control
@@ -144,20 +144,6 @@ Description: APIs for multimedia functionality - development files
  This package contains the development files needed to build Qt applications
  using Qt Multimedia libraries.
 
-Package: qtmultimedia5-private-dev
-Architecture: any
-Section: libdevel
-Pre-Depends: dpkg (>= 1.15.6~)
-Depends: qtmultimedia5-dev (= ${binary:Version}), ${misc:Depends}
-Description: APIs for multimedia functionality - 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 5 applications like Qt Creator QML Designer plugin.
- .
- Use at your own risk.
-
 Package: qtmultimedia5-dbg
 Architecture: any
 Multi-Arch: same
diff --git a/debian/qtmultimedia5-private-dev.install b/debian/qtmultimedia5-private-dev.install
deleted file mode 100644
index 16c9c0b..0000000
--- a/debian/qtmultimedia5-private-dev.install
+++ /dev/null
@@ -1,65 +0,0 @@
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/gstvideoconnector_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/playlistfileparser_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qabstractvideobuffer_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qaudio_mac_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qaudiobuffer_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qaudiodevicefactory_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qaudiodeviceinfo_alsa_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qaudiodeviceinfo_mac_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qaudiodeviceinfo_win32_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qaudiohelpers_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qaudioinput_alsa_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qaudioinput_mac_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qaudioinput_win32_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qaudiooutput_alsa_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qaudiooutput_mac_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qaudiooutput_win32_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qgstappsrc_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qgstbufferpoolinterface_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qgstcodecsinfo_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qgstreameraudioinputselector_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qgstreameraudioprobecontrol_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qgstreamerbushelper_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qgstreamergltexturerenderer_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qgstreamermessage_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qgstreamervideoinputdevicecontrol_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qgstreamervideooverlay_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qgstreamervideoprobecontrol_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qgstreamervideorenderer_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qgstreamervideorendererinterface_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qgstreamervideowidget_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qgstreamervideowindow_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qgstutils_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qgstvideobuffer_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qgstxvimagebuffer_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qimagevideobuffer_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qmediacontrol_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qmedianetworkplaylistprovider_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qmediaobject_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qmediaplaylist_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qmediaplaylistcontrol_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qmediaplaylistioplugin_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qmediaplaylistnavigator_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qmediaplaylistprovider_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qmediaplaylistsourcecontrol_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qmediapluginloader_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qmediarecorder_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qmediaresourcepolicy_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qmediaresourcepolicyplugin_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qmediaresourceset_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qmediaservice_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qmediaserviceprovider_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qmemoryvideobuffer_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qsamplecache_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qsgvideonode_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qsoundeffect_pulse_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qsoundeffect_qaudio_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qtmultimediaquickdefs_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qvideosurfacegstsink_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qvideosurfaceoutput_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qwavedecoder_p.h
-usr/include/qt5/QtMultimedia/*/QtMultimedia/private/qx11videosurface_p.h
-usr/include/qt5/QtMultimediaWidgets/*/QtMultimediaWidgets/private/qeglimagetexturesurface_p.h
-usr/include/qt5/QtMultimediaWidgets/*/QtMultimediaWidgets/private/qpaintervideosurface_mac_p.h
-usr/include/qt5/QtMultimediaWidgets/*/QtMultimediaWidgets/private/qpaintervideosurface_p.h
-usr/include/qt5/QtMultimediaWidgets/*/QtMultimediaWidgets/private/qvideowidget_p.h
diff --git a/debian/rules b/debian/rules
index 933e65a..46a1c8c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,10 @@ override_dh_auto_build-indep:
 
 override_dh_auto_install-arch:
 	dh_auto_install
+
+	# Remove private headers.
+	rm -rfv debian/tmp/usr/include/qt5/QtMultimedia/*/QtMultimedia/private
+	rm -rfv debian/tmp/usr/include/qt5/QtMultimediaWidgets/*/QtMultimediaWidgets/private/
 	
 	# Fix wrong path in pkgconfig files
 	find $(CURDIR)/debian/tmp/usr/lib/*/pkgconfig -type f -name '*.pc' \

-- 
qtmultimedia packaging