Merge lp:~ken-vandine/libhud-qt/versioned into lp:libhud-qt

[Ken VanDine]

* rename packages for soname version
  * rename qml binding package to qtdeclarative5-hud1.0 to follow naming
    convention, and adding api version to the name
  * debian/control
    - Added Breaks/Conflicts/Replaces for soname transition
    - bump standards version to latest
    - added Pre-Depends

rename libhud-qt-qml binding package to qtdeclarative5-hud1.0 to follow naming convention, and adding api version to the name

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/libhud-qt-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libhud-qt-quantal-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/libhud-qt-quantal-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libhud-qt-quantal-i386-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libhud-qt-raring-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libhud-qt-raring-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/libhud-qt-raring-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libhud-qt-raring-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libhud-qt-ci/8/rebuild

review: Approve (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

looks good to me! Thanks Ken :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libhud-qt-autolanding/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libhud-qt-quantal-i386-autolanding/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libhud-qt-raring-amd64-autolanding/1
    FAILURE: http://jenkins.qa.ubuntu.com/job/libhud-qt-raring-armhf-autolanding/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libhud-qt-raring-i386-autolanding/5

review: Needs Fixing (continuous-integration)

[Łukasz Zemczak (sil2100)]

Looking good here as well!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:45
http://jenkins.qa.ubuntu.com/job/libhud-qt-ci/9/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libhud-qt-quantal-armhf-ci/9/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libhud-qt-quantal-i386-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libhud-qt-raring-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libhud-qt-raring-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/libhud-qt-raring-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libhud-qt-raring-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libhud-qt-ci/9/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== added file 'common-vars.pri'
--- common-vars.pri	1970-01-01 00:00:00 +0000
+++ common-vars.pri	2013-04-23 13:50:31 +0000
@@ -0,0 +1,25 @@
+#-----------------------------------------------------------------------------
+# Common variables for all projects.
+#-----------------------------------------------------------------------------
+
+
+#-----------------------------------------------------------------------------
+# Project name (used e.g. in include file and doc install path).
+# remember to update debian/* files if you changes this
+#-----------------------------------------------------------------------------
+PROJECT_NAME = libhud-qt
+
+#-----------------------------------------------------------------------------
+# Project version
+# remember to update debian/* files if you changes this
+#-----------------------------------------------------------------------------
+PROJECT_VERSION = 0.1.0
+
+#-----------------------------------------------------------------------------
+# Library version
+#-----------------------------------------------------------------------------
+VERSION = 1.0.0
+API_VER = 1.0
+
+# End of File
+

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-12 14:32:20 +0000
+++ debian/changelog	2013-04-23 13:50:31 +0000
@@ -1,5 +1,6 @@
 libhud-qt (0.1.0-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Mathieu Trudel-Lapierre ]
   * debian/copyright: it's LGPL-3; also correct the text for the license.
   * debian/rules:
     - add DPKG_GENSYMBOLS_CHECK_ARGS = 4.
@@ -11,6 +12,15 @@
     - Don't build on powerpc; where qtdeclarative5 isn't available.
   * debian/compat: bump to compat level 9.
 
+  [ Ken VanDine ]
+  * rename packages for soname version
+  * rename qml binding package to qtdeclarative5-hud1.0 to follow naming
+    convention, and adding api version to the name
+  * debian/control
+    - Added Breaks/Conflicts/Replaces for soname transition
+    - bump standards version to latest 
+    - added Pre-Depends
+
  -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 25 Mar 2013 15:05:33 -0400
 
 libhud-qt (0.1.0~dev9) quantal; urgency=low

=== modified file 'debian/control'
--- debian/control	2013-04-12 14:32:20 +0000
+++ debian/control	2013-04-23 13:50:31 +0000
@@ -24,31 +24,33 @@
 Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libhud-qt/trunk
 Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/libhud-qt/trunk/files
 
-Package: libhud-qt
+Package: libhud-qt1
 Section: libs
 Architecture: amd64 armhf i386
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Replaces: libhud-qt
+Breaks: libhud-qt
+Conflicts: libhud-qt
 Description: HUD Qt API
  API to interact with Ubuntu HUD
 
-Package: libhud-qt-qml
+Package: qtdeclarative5-hud1.0
 Section: libs
 Architecture: amd64 armhf i386
-Depends:
- libhud-qt,
- ${misc:Depends},
- ${shlibs:Depends},
+Depends: libhud-qt1,
+         ${misc:Depends},
+         ${shlibs:Depends},
+Replaces: libhud-qt-qml
 Description: HUD QML Components
  API to interact with Ubuntu HUD
 
 Package: libhud-qt-doc
 Section: doc
 Architecture: all
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
 Description: HUD Qt API - documentation
  API to interact with Ubuntu HUD
  .

=== renamed file 'debian/libhud-qt.install' => 'debian/libhud-qt1.install'
--- debian/libhud-qt.install	2013-01-31 09:49:51 +0000
+++ debian/libhud-qt1.install	2013-04-23 13:50:31 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libhud-qt.so*
+usr/lib/*/libhud-qt.so.*

=== renamed file 'debian/libhud-qt-qml.install' => 'debian/qtdeclarative5-hud1.0.install'
--- debian/libhud-qt-qml.install	2013-02-11 22:53:45 +0000
+++ debian/qtdeclarative5-hud1.0.install	2013-04-23 13:50:31 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/qt5/qml/
+usr/lib/*/qt5/qml

=== modified file 'debian/rules'
--- debian/rules	2013-03-25 19:07:15 +0000
+++ debian/rules	2013-04-23 13:50:31 +0000
@@ -13,6 +13,7 @@
 
 override_dh_install:
 # execute dh_install and fail if something was not packaged
+	rm -f debian/tmp/usr/lib/*/libhud-qt.so
 	dh_install --fail-missing
 
 %:

=== modified file 'qml/qml.pro'
--- qml/qml.pro	2013-03-15 13:56:02 +0000
+++ qml/qml.pro	2013-04-23 13:50:31 +0000
@@ -1,3 +1,5 @@
+include( ../common-vars.pri )
+
 TEMPLATE = lib
 TARGET = hud-qml
 QT += quick
@@ -33,7 +35,7 @@
 
 qmldir.files = qmldir
 unix {
-    installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
+    installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /).$$API_VER
     qmldir.path = $$installPath
     target.path = $$installPath
     INSTALLS += target qmldir

=== modified file 'src/src.pro'
--- src/src.pro	2013-03-21 11:39:38 +0000
+++ src/src.pro	2013-04-23 13:50:31 +0000
@@ -1,10 +1,10 @@
+include( ../common-vars.pri )
+
 TEMPLATE = lib
 TARGET = hud-qt
 CONFIG += qt link_pkgconfig
 INSTALLS += target
 
-VERSION = 1.0.0
-
 QT += widgets
 
 PKGCONFIG += hud-1