Merge lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative-opensource-src_fixpkgname into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

[Timo Jyrinki]

[ Lisandro Damián Nicanor Pérez Meyer ]
qml-model-qtqml-models2 should have been named qml-module-qtqml-models2.
Create qml-module-qtqml-models2 and make qml-model-qtqml-models2 a
transitional dummy package.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:149
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-armhf-ci/22

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/22/rebuild

review: Approve (continuous-integration)

[lp:~timo-jyrinki/kubuntu-packaging/qtdeclarative-opensource-src_fixpkgname]

150. By Timo Jyrinki on 2014-05-22

Tweak the Replaces to work on Ubuntu

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:150
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-trusty-armhf-ci/23

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/23/rebuild

review: Approve (continuous-integration)

[Scott Kitterman (kitterman)]

This can wait to be done with 5.3.0. This will cause the package to have to go through New. 5.3.0 does too. Rather than go through New twice, let's just do it once. There's no rush on this.

review: Disapprove

[Dmitry Shachnev (mitya57)]

Yes, but I'm not sure if we'll get 5.3 soon. It is very probable that we'll have to wait a ~month before we get this bugfix, and people will have to depend on broken package name in reverse dependencies.

[Scott Kitterman (kitterman)]

No reason it should take that long. The packages in Debian Experimental are coming along and since Kubuntu is blocked on 5.3 we really should move forward.

[Timo Jyrinki (timo-jyrinki)]

This was released, and accepted during the night, so I'm going to approve this for merging anyhow.

We try to be as quick as possible with Qt 5.3.

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-21 10:26:38 +0000
+++ debian/changelog	2014-05-22 15:28:03 +0000
@@ -1,3 +1,18 @@
+qtdeclarative-opensource-src (5.2.1-5ubuntu5) utopic; urgency=medium
+
+  * Tweak the Replaces to work on Ubuntu
+
+ -- Timo Jyrinki <[e-mail]>  Thu, 22 May 2014 13:12:34 +0000
+
+qtdeclarative-opensource-src (5.2.1-5ubuntu4) utopic; urgency=medium
+
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * qml-model-qtqml-models2 should have been named qml-module-qtqml-models2.
+    Create qml-module-qtqml-models2 and make qml-model-qtqml-models2 a
+    transitional dummy package.
+
+ -- Timo Jyrinki <[e-mail]>  Thu, 22 May 2014 07:03:25 +0000
+
 qtdeclarative-opensource-src (5.2.1-5ubuntu3) utopic; urgency=medium
 
   * qtquick_delegate_creation_range_itemviews.patch:

=== modified file 'debian/control'
--- debian/control	2014-05-07 08:24:49 +0000
+++ debian/control	2014-05-22 15:28:03 +0000
@@ -149,26 +149,36 @@
 Architecture: any
 Multi-Arch: same
 Section: oldlibs
-Depends: qml-model-qtqml-models2, ${misc:Depends}
+Depends: qml-module-qtqml-models2, ${misc:Depends}
 Description: transitional dummy package for Qt 5 Models2 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-model-qtqml-models2
+Package: qml-module-qtqml-models2
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: qtdeclarative5-models-plugin (<< 5.2.1-5~)
-Replaces: qtdeclarative5-models-plugin (<< 5.2.1-5~)
+Breaks: qtdeclarative5-models-plugin (<< 5.2.1-5~), qml-model-qtqml-models2 (<< 5.2.1-5ubuntu4~)
+Replaces: qtdeclarative5-models-plugin (<< 5.2.1-5~), qml-model-qtqml-models2 (<< 5.2.1-5ubuntu4~)
 Description: Qt 5 Models2 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.
  .
  The Models provides types previously found in Qt Quick module.
 
+Package: qml-model-qtqml-models2
+Architecture: all
+Section: oldlibs
+Depends: qml-module-qtqml-models2, ${misc:Depends}
+Description: transitional dummy package for qml-module-qtqml-models2
+ 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: qtdeclarative5-particles-plugin
 Architecture: any
 Multi-Arch: same
@@ -412,7 +422,7 @@
 Multi-Arch: same
 Section: x11
 Pre-Depends: ${misc:Pre-Depends}
-Depends: qml-model-qtqml-models2,
+Depends: qml-module-qtqml-models2,
          qml-module-qtquick-dialogs,
          qml-module-qtquick-localstorage,
          qml-module-qtquick-particles2,

=== renamed file 'debian/qml-model-qtqml-models2.install' => 'debian/qml-module-qtqml-models2.install'