Merge lp:~sil2100/ubuntu-ui-extras/rename_source_name into lp:~ubuntu-sdk-team/ubuntu-ui-extras/trunk

Proposed by Łukasz Zemczak
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 53
Merged at revision: 48
Proposed branch: lp:~sil2100/ubuntu-ui-extras/rename_source_name
Merge into: lp:~ubuntu-sdk-team/ubuntu-ui-extras/trunk
Diff against target: 50 lines (+7/-6)
3 files modified
debian/changelog (+1/-1)
debian/control (+4/-5)
debian/copyright (+2/-0)
To merge this branch: bzr merge lp:~sil2100/ubuntu-ui-extras/rename_source_name
Reviewer Review Type Date Requested Status
Sebastien Bacher (community) Approve
PS Jenkins bot continuous-integration Approve
Timo Jyrinki Needs Fixing
Review via email: mp+181213@code.launchpad.net

Commit message

Rename the source package name to ubuntu-ui-extras, change the binary package name to the new standard: qtdeclarative5-ubuntu-ui-extras0.1 (version number attached)

Description of the change

Rename the source package name to ubuntu-ui-extras

Somehow missed this in my review ;/

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Needs fixing also in changelog.

review: Needs Fixing
49. By Łukasz Zemczak

Eeek, changelog

50. By Łukasz Zemczak

Add additional info to copyright

51. By Łukasz Zemczak

As requested by seb, change the name of the binary package to have the version in the name

52. By Łukasz Zemczak

Remove libnotify4 dep as we use shlibs anyway

Revision history for this message
Sebastien Bacher (seb128) wrote :

reviewing, that change seems fine but some comments on the packaging:
- the current name convention is qtdeclarative5-name<version>, please use that
- the Depends: on libnotify4 is buggy, shlibs take care of that, no need to hardcode the name
- would be nice to put something in the description about the reasons it can't be in the toolkit (is that license, quality, ...)

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
53. By Łukasz Zemczak

Tweak the description a bit

Revision history for this message
Sebastien Bacher (seb128) wrote :

looks good, thanks for the fixes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-08-20 15:24:49 +0000
+++ debian/changelog 2013-08-21 08:38:17 +0000
@@ -1,4 +1,4 @@
1qtdeclarative5-ubuntu-ui-extras-plugin (0.1-0ubuntu1) UNRELEASED; urgency=low1ubuntu-ui-extras (0.1-0ubuntu1) UNRELEASED; urgency=low
22
3 [ Ugo Riboni ]3 [ Ugo Riboni ]
4 * Initial Release4 * Initial Release
55
=== modified file 'debian/control'
--- debian/control 2013-08-20 20:12:24 +0000
+++ debian/control 2013-08-21 08:38:17 +0000
@@ -1,4 +1,4 @@
1Source: qtdeclarative5-ubuntu-ui-extras-plugin1Source: ubuntu-ui-extras
2Section: x112Section: x11
3Priority: optional3Priority: optional
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
@@ -27,7 +27,7 @@
27Vcs-Bzr: https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-extras/trunk27Vcs-Bzr: https://code.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-extras/trunk
28Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-extras/trunk/files28Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-extras/trunk/files
2929
30Package: qtdeclarative5-ubuntu-ui-extras-plugin30Package: qtdeclarative5-ubuntu-ui-extras0.1
31Architecture: any31Architecture: any
32Depends: ${misc:Depends},32Depends: ${misc:Depends},
33 ${shlibs:Depends},33 ${shlibs:Depends},
@@ -39,8 +39,7 @@
39 qtdeclarative5-friends-plugin,39 qtdeclarative5-friends-plugin,
40 qtdeclarative5-window-plugin,40 qtdeclarative5-window-plugin,
41 libaccounts-qt5-1,41 libaccounts-qt5-1,
42 libnotify4,
43Description: Ubuntu UI Extra Components42Description: Ubuntu UI Extra Components
44 A collection of UI components that for various reasons can't be included in43 A collection of UI components that for various reasons can't be included in
45 the main Ubuntu UI toolkit.44 the main Ubuntu UI toolkit - mostly because of the level of quality, lack of
4645 documentation and/or lack of automated tests.
4746
=== modified file 'debian/copyright'
--- debian/copyright 2013-06-05 16:18:44 +0000
+++ debian/copyright 2013-08-21 08:38:17 +0000
@@ -1,4 +1,6 @@
1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2Upstream-Name: ubuntu-ui-extras
3Source: https://launchpad.net/ubuntu-ui-extras
24
3Files: *5Files: *
4Copyright: 2013 Canonical Ltd.6Copyright: 2013 Canonical Ltd.

Subscribers

People subscribed via source and target branches