Merge lp:~jamesh/thumbnailer/qml-module-package-name into lp:thumbnailer/devel

[James Henstridge]

Rename the QML module binary package to qml-module-xxx

Rename the QML module binary package to qml-module-xxx

I also took the liberty of updating the change log to cover the other changes we've made since the last landing (skipping the change and revert of vs-thumb).

[Michi Henning (michihenning)]

Looks good. There is a merge conflict in changelog though.

review: Needs Fixing

[lp:~jamesh/thumbnailer/qml-module-package-name]

276. By James Henstridge on 2015-09-15

Merge from devel.

[Michi Henning (michihenning)]

Cool.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:276
http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-ci/450/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-wily-amd64-ci/260
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-wily-armhf-ci/265
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-wily-armhf-ci/265/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-devel-wily-i386-ci/259

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/thumbnailer-devel-ci/450/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2015-09-15 00:50:34 +0000
+++ debian/changelog	2015-09-15 03:46:10 +0000
@@ -9,11 +9,25 @@
     exits after 30 seconds if it is started only to, for example,
     retrieve the stats. Activity on the admin interface now keeps
     the service alive the same way activity on the thumbnailer interface does.
-  * Added average hit and miss run length to stats returned by thumbnailer-admin.
+  * Added average hit and miss run length to stats returned by
+    thumbnailer-admin.
   * Changed semantics for requests with (0,0) size. All requests are now
     clamped to a 1920x1920 bounding box.
   * Fixed incorrect timeout semantics for unexpected network errors.
 
+  [ James Henstridge ]
+  * Renamed QML package to qml-module-XXX format and add transitional
+    package. (LP: #1342031)
+  * Port QML module to use libthumbnailer-qt.
+
+  [ Xavi Garcia ]
+  * Add new libthumbnailer-qt1.0 library, providing a C++ client API.
+
+  [ Albert Astals Cid ]
+  * In QML image provider, only create QQuickTextureFactory when
+    needed, fixing a memory leak when requests are cancelled. (LP:
+    #1484914)
+
  -- Michi Henning <[e-mail]>  Thu, 06 Aug 2015 15:13:17 +1000
 
 thumbnailer (2.2+15.10.20150801-0ubuntu1) wily; urgency=medium
 
=== modified file 'debian/control'
--- debian/control	2015-09-10 10:01:34 +0000
+++ debian/control	2015-09-15 03:46:10 +0000
@@ -50,6 +50,19 @@
 Package: qtdeclarative5-ubuntu-thumbnailer0.1
 Architecture: any
 Multi-Arch: same
+Section: oldlibs
+Depends: qml-module-ubuntu-thumbnailer0.1,
+         ${misc:Depends},
+Description: transitional dummy package for QML interface for the thumbnailer.
+ This package provides image providers that allow access to the
+ thumbnailer from Qt Quick 2 / QML applications
+ .
+ This is a transitional dummy package for qml-module-ubuntu-thumbnailer0.1
+ which can be safely removed.
+
+Package: qml-module-ubuntu-thumbnailer0.1
+Architecture: any
+Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
@@ -58,6 +71,8 @@
 Provides: ubuntu-thumbnailer-impl,
           ubuntu-thumbnailer-impl-0,
 Recommends: thumbnailer-service (= ${binary:Version}),
+Breaks: qtdeclarative5-ubuntu-thumbnailer0.1 (<< 2.3~)
+Replaces: qtdeclarative5-ubuntu-thumbnailer0.1 (<< 2.3~)
 Description: QML interface for the thumbnailer.
  This package provides image providers that allow access to the
  thumbnailer from Qt Quick 2 / QML applications.
 
=== renamed file 'debian/qtdeclarative5-ubuntu-thumbnailer0.1.install' => 'debian/qml-module-ubuntu-thumbnailer0.1.install'
=== renamed file 'debian/qtdeclarative5-ubuntu-thumbnailer0.1.lintian-overrides' => 'debian/qml-module-ubuntu-thumbnailer0.1.lintian-overrides'
--- debian/qtdeclarative5-ubuntu-thumbnailer0.1.lintian-overrides	2015-08-06 06:20:29 +0000
+++ debian/qml-module-ubuntu-thumbnailer0.1.lintian-overrides	2015-09-15 03:46:10 +0000
@@ -1,1 +1,1 @@
-qtdeclarative5-ubuntu-thumbnailer0.1 binary: package-has-long-file-name
+qml-module-ubuntu-thumbnailer0.1 binary: package-has-long-file-name