Merge lp:~mitya57/kubuntu-packaging/qtsensors-5.2.1+dfsg-4ubuntu1 into lp:~kubuntu-packagers/kubuntu-packaging/qtsensors-opensource-src

[Dmitry Shachnev]

* Merge with Debian unstable, remaining change:
   - Add enable_make_check.patch to disable some failing tests.

* Merge with Debian unstable, remaining change:
  - Add enable_make_check.patch to disable some failing tests.

This brings the new naming for QML module package.

[Dmitry Shachnev (mitya57)]

This upload should be coordinated with QtWebKit, as I dropped qtsensors5-dev transitional package (and current QtWebKit in archive depends on it).

[Timo Jyrinki (timo-jyrinki)]

Regardless of when this (and especially the qtwebkit) gets uploaded, this is a good thing to have.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-17 14:44:32 +0000
+++ debian/changelog	2014-05-03 06:20:22 +0000
@@ -1,3 +1,29 @@
+qtsensors-opensource-src (5.2.1+dfsg-4ubuntu1) utopic; urgency=medium
+
+  * Merge with Debian unstable, remaining change:
+    - Add enable_make_check.patch to disable some failing tests.
+
+ -- Dmitry Shachnev <[e-mail]>  Sat, 03 May 2014 10:01:10 +0400
+
+qtsensors-opensource-src (5.2.1+dfsg-4) unstable; urgency=medium
+
+  * Rename QML module qtdeclarative5-qtsensors-plugin to qml-module-qtsensors,
+    providing proper Break+Replaces and file renamings.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <[e-mail]>  Thu, 03 Apr 2014 11:51:37 -0300
+
+qtsensors-opensource-src (5.2.1+dfsg-3) unstable; urgency=medium
+
+  [ Dmitry Shachnev ]
+  * Use dh_auto_test to run the tests.
+  * Remove dh_builddeb override, xz is now the default compression method.
+  * Remove dh_auto_build-arch override, it is not needed.
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Upload to unstable.
+
+ -- Lisandro Damián Nicanor Pérez Meyer <[e-mail]>  Mon, 24 Mar 2014 23:22:30 -0300
+
 qtsensors-opensource-src (5.2.1+dfsg-2ubuntu2) trusty; urgency=medium
 
   * Break/replace the correct package. Fixes upgrade bug (LP: #1308212).
@@ -133,36 +159,3 @@
   * Initial release (Closes: #697509).
 
  -- Lisandro Damián Nicanor Pérez Meyer <[e-mail]>  Mon, 21 Oct 2013 22:47:26 -0300
-
-qtsensors-opensource-src (5.0~git20130507-0ubuntu3) saucy; urgency=low
-
-  * Run tests during build (LP: #1193370).
-  * Bump Standards-Version to 3.9.4, no changes needed.
-
- -- Dmitry Shachnev <[e-mail]>  Sat, 21 Sep 2013 14:15:40 +0400
-
-qtsensors-opensource-src (5.0~git20130507-0ubuntu2) saucy; urgency=low
-
-  * Add version dependency to Qt 5.0.2
-
- -- Timo Jyrinki <[e-mail]>  Fri, 24 May 2013 17:31:18 +0300
-
-qtsensors-opensource-src (5.0~git20130507-0ubuntu1) saucy; urgency=low
-
-  [ Timo Jyrinki ]
-  * Fix pkgconfig Libs.private path (LP: #1125156)
-  * New upstream snapshot.
-
-  [ Ken VanDine ]
-  * debian/control
-    - Only build for arches supported by qtdeclarative
-
- -- Timo Jyrinki <[e-mail]>  Wed, 08 May 2013 11:27:52 +0300
-
-qtsensors-opensource-src (5.0~git20130115-0ubuntu1) raring; urgency=low
-
-  * Initial release
-  * Cherry-pick from upstream:
-    - add_license_files.patch
-
- -- Timo Jyrinki <[e-mail]>  Fri, 18 Jan 2013 13:56:03 +0200

=== modified file 'debian/control'
--- debian/control	2014-04-16 07:05:34 +0000
+++ debian/control	2014-05-03 06:20:22 +0000
@@ -8,7 +8,8 @@
            Sune Vuorela <[e-mail]>,
            Pino Toscano <[e-mail]>,
            Lisandro Damián Nicanor Pérez Meyer <[e-mail]>,
-           Timo Jyrinki <[e-mail]>
+           Timo Jyrinki <[e-mail]>,
+           Dmitry Shachnev <[e-mail]>
 Build-Depends: debhelper (>= 9.0.0),
                pkg-kde-tools,
                qtbase5-private-dev (>= 5.2.1+dfsg~),
@@ -19,8 +20,8 @@
                      qttools5-dev-tools (>= 5.2.1~)
 Standards-Version: 3.9.5
 Homepage: http://qt-project.org/
-Vcs-Bzr: lp:~kubuntu-packagers/kubuntu-packaging/qtsensors-opensource-src
-Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/qtsensors-opensource-src
+Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtsensors.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qtsensors.git
 
 Package: libqt5sensors5
 Architecture: any
@@ -34,33 +35,34 @@
  This package contains Qt Sensors module.
 
 Package: qtdeclarative5-qtsensors-plugin
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Qt 5 Sensors module QML plugin
- 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 Qt Sensors QML plugin for Qt Declarative.
-
-Package: qtsensors5-dev
+Architecture: all
 Section: oldlibs
+Depends: qml-module-qtsensors, ${misc:Depends}
+Description: transitional dummy package for Qt 5 Sensors QML module
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This is a transitional dummy package which can be safely removed.
+
+Package: qml-module-qtsensors
 Architecture: any
-Depends: libqt5sensors5-dev (= ${binary:Version}), ${misc:Depends}
-Description: transitional dummy package
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: qtdeclarative5-qtsensors-plugin (<< 5.2.1+dfsg-4~)
+Replaces: qtdeclarative5-qtsensors-plugin (<< 5.2.1+dfsg-4~)
+Description: Qt 5 Sensors QML module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
- This is a transitional dummy package to libqt5sensors5-dev. It can be
- safely removed.
+ This package contains the Qt Sensors QML module for Qt Declarative.
 
 Package: libqt5sensors5-dev
 Section: libdevel
 Architecture: any
 Depends: libqt5sensors5 (= ${binary:Version}), qtbase5-dev, ${misc:Depends}
-Breaks: qtsensors5-dev (<< 5.1.1+dfsg-2~)
-Replaces: qtsensors5-dev (<< 5.1.1+dfsg-2~)
+Breaks: libqtsensors5-dev (<< 5.1.1+dfsg-2~)
+Replaces: libqtsensors5-dev (<< 5.1.1+dfsg-2~)
 Description: Qt 5 Sensors 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.
@@ -72,7 +74,7 @@
 Architecture: any
 Multi-Arch: same
 Section: x11
-Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 5 sensors examples
  Qt is a cross-platform C++ application framework. Qt's primary feature

=== modified file 'debian/libqt5sensors5-dev.install'
--- debian/libqt5sensors5-dev.install	2014-02-11 05:02:19 +0000
+++ debian/libqt5sensors5-dev.install	2014-05-03 06:20:22 +0000
@@ -1,4 +1,3 @@
-usr/include/qt5/QtSensors/QtSensorsDepends
 usr/include/qt5/QtSensors/QAccelerometer
 usr/include/qt5/QtSensors/QAccelerometerFilter
 usr/include/qt5/QtSensors/QAccelerometerReading
@@ -60,6 +59,7 @@
 usr/include/qt5/QtSensors/QTiltReading
 usr/include/qt5/QtSensors/QTiltSensor
 usr/include/qt5/QtSensors/QtSensors
+usr/include/qt5/QtSensors/QtSensorsDepends
 usr/include/qt5/QtSensors/QtSensorsVersion
 usr/include/qt5/QtSensors/qaccelerometer.h
 usr/include/qt5/QtSensors/qaltimeter.h

=== renamed file 'debian/qtdeclarative5-qtsensors-plugin.install' => 'debian/qml-module-qtsensors.install'
=== modified file 'debian/rules'
--- debian/rules	2014-02-27 08:21:43 +0000
+++ debian/rules	2014-05-03 06:20:22 +0000
@@ -22,17 +22,11 @@
 override_dh_auto_configure:
 	qmake QT_BUILD_PARTS+=tests
 
-override_dh_auto_build-arch:
-	# This override may seem futile, but it helps us make sure that the tools
-	# needed for building the docs are built before calling them.
-	# If there's a better way, do not hesitate to tell us.
-	dh_auto_build
-
 override_dh_auto_build-indep:
 	dh_auto_build -Smakefile -- docs
 
 override_dh_auto_test:
-	xvfb-run -a make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
+	xvfb-run -a dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
 
 override_dh_auto_install-arch:
 	dh_auto_install
@@ -64,9 +58,6 @@
 
 	dh_install --fail-missing
 
-override_dh_builddeb:
-	dh_builddeb -- -Zxz
-
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf doc/qtsensors doc/qtsensors.qch