[Merge] lp:~bzoltan/ubuntu-ui-toolkit/sync_landing_0731 into lp:ubuntu-ui-toolkit/gles

[Ricardo Salveti]

Review: Needs Fixing



Diff comments:

> === modified file 'debian/changelog'
> --- debian/changelog	2014-07-28 15:55:03 +0000
> +++ debian/changelog	2014-07-31 15:06:30 +0000
> @@ -1,3 +1,9 @@
> +ubuntu-ui-toolkit-gles (0.1.51+14.10.20140731.1-0ubuntu1) UNRELEASED; urgency=medium
> +
> +  * Sync package with ubuntu-ui-toolkit - 0.1.51+14.10.20140731.1-0ubuntu1
> +
> + -- Zoltán Balogh <zoltan at bakter.hu>  Thu, 31 Jul 2014 17:49:15 +0300
> +
>  ubuntu-ui-toolkit-gles (0.1.50+14.10.20140724.2-0ubuntu1) utopic; urgency=medium
>  
>    * Sync package with ubuntu-ui-toolkit - 0.1.50+14.10.20140724.2-0ubuntu1
> 
> === modified file 'debian/control'
> --- debian/control	2014-07-28 15:55:03 +0000
> +++ debian/control	2014-07-31 15:06:30 +0000
> @@ -29,6 +29,7 @@
>                 qtdeclarative5-doc-html,
>                 qtwebkit5-doc-html,
>                 qtsvg5-doc-html,
> +               libqt5svg5,
>                 qtscript5-doc-html,
>                 qtmultimedia5-doc-html,
>                 unity-action-doc,
> @@ -44,6 +45,7 @@
>                 locales,
>                 suru-icon-theme,
>  Standards-Version: 3.9.4
> +X-Auto-Uploader: no-rewrite-version
>  Homepage: https://launchpad.net/ubuntu-ui-toolkit
>  
>  Package: qtdeclarative5-ubuntu-ui-toolkit-plugin-gles
> @@ -61,7 +63,7 @@
>           qtdeclarative5-unity-action-plugin (>= 1.1.0),
>           suru-icon-theme,
>           ttf-ubuntu-font-family,
> -         ubuntu-ui-toolkit-theme,
> +         ubuntu-ui-toolkit-theme (= ${binary:Version}),

Remove the version specific in here because that package is provided by a different src package (can easily cause issues).

>           ${misc:Depends},
>           ${shlibs:Depends},
>  Description: Qt Components for Ubuntu - QML plugin - OpenGLES
> 
> === modified file 'debian/watch'
> --- debian/watch	2014-07-15 17:00:58 +0000
> +++ debian/watch	2014-07-31 15:06:30 +0000
> @@ -1,3 +1,3 @@
>  version=3
>  opts=dversionmangle=s/\-gles// \
> -http://archive.ubuntu.com/ubuntu/pool/main/u/ubuntu-ui-toolkit/ubuntu-ui-toolkit_([^-]*)\.orig.tar.gz
> +http://ppa.launchpad.net/ci-train-ppa-service/landing-020/ubuntu/pool/main/u/ubuntu-ui-toolkit/ubuntu-ui-toolkit_([^-]*)\.orig.tar.gz
> 


-- 
https://code.launchpad.net/~bzoltan/ubuntu-ui-toolkit/sync_landing_0731/+merge/229064
Your team Ubuntu Phablet Team is subscribed to branch lp:ubuntu-ui-toolkit/gles.