Merge lp:~ken-vandine/biometryd/sync_yakkety_to_trunk into lp:biometryd

[Ken VanDine]

Sync changes that have already landed in yakkety to trunk

Sync changes that have already landed in yakkety to trunk

=== modified file 'debian/changelog'
--- debian/changelog	2016-06-28 06:20:19 +0000
+++ debian/changelog	2016-09-22 16:58:43 +0000
@@ -1,3 +1,22 @@
+biometryd (0.0.1+16.10.20160628-0ubuntu4) yakkety; urgency=medium
+
+  * Skip qml test on powerpc, segfaults. LP: #1606927
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 18 Aug 2016 15:44:55 +0100
+
+biometryd (0.0.1+16.10.20160628-0ubuntu3) yakkety; urgency=medium
+
+  * Cast enum to int, to use in another enum. Fixes FTBFS with gcc6.
+  * Rebuild for boost soname change.
+
+ -- Dimitri John Ledkov <[e-mail]>  Thu, 18 Aug 2016 11:13:07 +0100
+
+biometryd (0.0.1+16.10.20160628-0ubuntu2) yakkety; urgency=medium
+
+  * No-change rebuild for boost soname change.
+
+ -- Matthias Klose <[e-mail]>  Thu, 04 Aug 2016 08:11:16 +0000
+
 biometryd (0.0.1+16.10.20160628-0ubuntu1) yakkety; urgency=medium
 
   * Add an initial snapcraft.yaml setup for biometryd.
 
=== modified file 'debian/control'
--- debian/control	2016-05-11 20:58:11 +0000
+++ debian/control	2016-09-22 16:58:43 +0000
@@ -37,7 +37,7 @@
 # upstream branch
 Vcs-Bzr: lp:biometryd
 
-Package: libbiometryd0
+Package: libbiometryd1
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
@@ -56,7 +56,7 @@
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
-Depends: libbiometryd0 (= ${binary:Version}),
+Depends: libbiometryd1 (= ${binary:Version}),
          ${misc:Depends},
 Description: biometryd mediates/multiplexes to biometric devices - runtime library 
  biometryd mediates and multiplexes access to biometric devices present on the system,
@@ -69,7 +69,7 @@
 Package: biometryd-bin
 Section: devel
 Architecture: any
-Depends: libbiometryd0 (= ${binary:Version}),
+Depends: libbiometryd1 (= ${binary:Version}),
          ${misc:Depends},
 Description: biometryd mediates/multiplexes to biometric devices - daemon/helper binaries
  biometryd mediates and multiplexes access to biometric devices present on the system,
@@ -81,7 +81,7 @@
 Package: qml-module-biometryd
 Section: devel
 Architecture: any
-Depends: libbiometryd0 (= ${binary:Version}),
+Depends: libbiometryd1 (= ${binary:Version}),
          ${misc:Depends},
 Description: biometryd mediates/multiplexes to biometric devices - QML bindings
  biometryd mediates and multiplexes access to biometric devices present on the system,
 
=== modified file 'debian/rules'
--- debian/rules	2016-05-02 06:16:01 +0000
+++ debian/rules	2016-09-22 16:58:43 +0000
@@ -24,7 +24,7 @@
 	dh $@ --fail-missing
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DBIOMETRYD_VERSION_MAJOR=$(major) -DBIOMETRYD_VERSION_MINOR=$(minor) -DBIOMETRYD_VERSION_PATCH=$(patch)
+	dh_auto_configure -- -DBIOMETRYD_VERSION_MAJOR=$(major) -DBIOMETRYD_VERSION_MINOR=$(minor) -DBIOMETRYD_VERSION_PATCH=$(patch) -DDEB_TARGET_ARCH=$(DEB_TARGET_ARCH)
 
 override_dh_auto_clean:
 	/bin/sh $(CURDIR)/debian/gen-debian-files.sh $(CURDIR)/debian
 
=== modified file 'src/biometry/qml/Biometryd/fingerprint_reader.h'
--- src/biometry/qml/Biometryd/fingerprint_reader.h	2016-05-04 14:06:05 +0000
+++ src/biometry/qml/Biometryd/fingerprint_reader.h	2016-09-22 16:58:43 +0000
@@ -44,15 +44,15 @@
     /// @brief Direction enumerates all known direction hints.
     enum class Direction
     {
-        NotAvailable    = biometry::devices::FingerprintReader::Direction::not_available,
-        SouthWest       = biometry::devices::FingerprintReader::Direction::south_west,
-        South           = biometry::devices::FingerprintReader::Direction::south,
-        SouthEast       = biometry::devices::FingerprintReader::Direction::south_east,
-        NorthWest       = biometry::devices::FingerprintReader::Direction::north_west,
-        North           = biometry::devices::FingerprintReader::Direction::north,
-        NorthEast       = biometry::devices::FingerprintReader::Direction::north_east,
-        East            = biometry::devices::FingerprintReader::Direction::east,
-        West            = biometry::devices::FingerprintReader::Direction::west
+        NotAvailable    = int(biometry::devices::FingerprintReader::Direction::not_available),
+	SouthWest       = int(biometry::devices::FingerprintReader::Direction::south_west),
+	South           = int(biometry::devices::FingerprintReader::Direction::south),
+        SouthEast       = int(biometry::devices::FingerprintReader::Direction::south_east),
+        NorthWest       = int(biometry::devices::FingerprintReader::Direction::north_west),
+        North           = int(biometry::devices::FingerprintReader::Direction::north),
+        NorthEast       = int(biometry::devices::FingerprintReader::Direction::north_east),
+        East            = int(biometry::devices::FingerprintReader::Direction::east),
+	    West            = int(biometry::devices::FingerprintReader::Direction::west)
     };
 
     /// @brief FingerprintReader initializes a new instance with the given parent.
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-06-21 09:52:26 +0000
+++ tests/CMakeLists.txt	2016-09-22 16:58:43 +0000
@@ -75,6 +75,8 @@
 BIOMETRYD_ADD_TEST(test_cmds_run cmds/test_run.cpp)
 BIOMETRYD_ADD_TEST(test_cmds_test cmds/test_test.cpp)
 
+if ("DEB_TARGET_ARCH" STREQUAL "powerpc")
+else()
 add_executable(test_qml_plugin test_qml_plugin.cpp)
 qt5_use_modules(test_qml_plugin Core Qml Quick QuickTest)
 add_test(test_qml_plugin test_qml_plugin)
@@ -84,4 +86,6 @@
 foreach (QML_FILE ${BIOMETRYD_QML_TEST_FILES})
     message(INFO  ${QML_FILE})
     configure_file(${QML_FILE} ${QML_FILE} COPYONLY)
-endforeach(QML_FILE)
+  endforeach(QML_FILE)
+endif()
+