Merge lp:~barry/software-center/lp1100408 into lp:software-center

Proposed by Barry Warsaw
Status: Merged
Approved by: Martin Albisetti
Approved revision: 3286
Merged at revision: 3285
Proposed branch: lp:~barry/software-center/lp1100408
Merge into: lp:software-center
Diff against target: 36 lines (+9/-2)
2 files modified
debian/changelog (+7/-0)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~barry/software-center/lp1100408
Reviewer Review Type Date Requested Status
dobey Approve
Review via email: mp+143591@code.launchpad.net

Commit message

Update Depends to use the new oneconf package organization. Specifically the Python 2 importable library is now in python-oneconf.

Description of the change

With the upload of oneconf 0.3, Software Center will need an updated Depends to pick up the Python 2 importable library.

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

On Wed, Jan 16, 2013 at 08:34:23PM -0000, Barry Warsaw wrote:
> Barry Warsaw has proposed merging lp:~barry/software-center/lp1100408 into lp:software-center.
>
> Requested reviews:
> software-store-developers (software-store-developers)
> Related bugs:
> Bug #1100408 in software-center (Ubuntu): "Update Depends for new oneconf packaging"
> https://bugs.launchpad.net/ubuntu/+source/software-center/+bug/1100408
>
> For more details, see:
> https://code.launchpad.net/~barry/software-center/lp1100408/+merge/143591
>
> With the upload of oneconf 0.3, Software Center will need an updated Depends to pick up the Python 2 importable library.

Thanks for your branch. This looks good.

I'm not sure though that the "oneconf" conflict is really needed
(technically its too strong as they are not really conflicting AIUI),
if the package is obsolete the automatic dependency handling of apt
should see it as a no-longer-needed dependency and auto-clean it
during the release-upgrade.

Cheers,
 Michael

> --
> https://code.launchpad.net/~barry/software-center/lp1100408/+merge/143591
> You are subscribed to branch lp:software-center.

> === modified file 'debian/control'
> --- debian/control 2012-12-19 09:39:37 +0000
> +++ debian/control 2013-01-16 20:33:18 +0000
> @@ -52,7 +52,7 @@
> python-xdg,
> ubuntu-sso-client,
> python-piston-mini-client (>= 0.1+bzr29),
> - oneconf (>= 0.2.6),
> + python-oneconf (>= 0.3),
> python-debtagshw,
> ubuntu-extras-keyring
> Recommends: lsb-release,
> @@ -61,7 +61,7 @@
> software-properties-gtk,
> sessioninstaller,
> xz-utils (>= 5.1.1alpha+20120614-1)
> -Conflicts: gnome-app-install (<< 1), oneconf (<< 0.2.6.1)
> +Conflicts: gnome-app-install (<< 1), oneconf (<< 0.3)
> Replaces: gnome-app-install
> Provides: gnome-app-install
> Description: Utility for browsing, installing, and removing software
>

Revision history for this message
Barry Warsaw (barry) wrote :

On Jan 17, 2013, at 06:58 AM, Michael Vogt wrote:

>I'm not sure though that the "oneconf" conflict is really needed
>(technically its too strong as they are not really conflicting AIUI),
>if the package is obsolete the automatic dependency handling of apt
>should see it as a no-longer-needed dependency and auto-clean it
>during the release-upgrade.

Let's just drop it then. It was mostly cut-n-paste anyway. ;)

Revision history for this message
Barry Warsaw (barry) wrote :

Branch updated:
- removed the Conflicts on oneconf
- Added a d/changelog entry

Looks like I don't have permission to merge this to trunk.

Revision history for this message
Michael Vogt (mvo) wrote :

On Thu, Jan 17, 2013 at 04:41:21PM -0000, Barry Warsaw wrote:
> Branch updated:
> - removed the Conflicts on oneconf
> - Added a d/changelog entry
>
> Looks like I don't have permission to merge this to trunk.

Yeah, this is now using a tarmac setup. Once it has a commit message
and is approved it should get auto-merged.

Cheers,
 Michael

Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0, Needs Fixing == 0, Needs Information == 0, Resubmit == 0, Pending == 0. Got: 1 Pending.

Revision history for this message
Barry Warsaw (barry) wrote :

On Jan 18, 2013, at 03:38 PM, Ubuntu One Auto Pilot wrote:

>Voting does not meet specified criteria. Required: Approve >= 1, Disapprove
>== 0, Needs Fixing == 0, Needs Information == 0, Resubmit == 0, Pending ==
>0. Got: 1 Pending.

mvo... help! :)

Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

There was a problem validating some authors of the branch. Authors must be either one of the listed Launchpad users, or a member of one of the listed teams on Launchpad.

Persons or Teams:

    contributor-agreement-canonical
    ubuntuone-hackers

Unaccepted Authors:

    Barry Warsaw <email address hidden>

Revision history for this message
Barry Warsaw (barry) wrote :

On Jan 18, 2013, at 06:12 PM, Ubuntu One Auto Pilot wrote:

>There was a problem validating some authors of the branch. Authors must be
>either one of the listed Launchpad users, or a member of one of the listed
>teams on Launchpad.
>
>Persons or Teams:
>
> contributor-agreement-canonical
> ubuntuone-hackers
>
>Unaccepted Authors:
>
> Barry Warsaw <email address hidden>

Oh FFS.

Revision history for this message
Martin Albisetti (beuno) wrote :

On Fri, Jan 18, 2013 at 3:22 PM, Barry Warsaw <email address hidden> wrote:
> Oh FFS.

Added you to the team.

--
Martin

Revision history for this message
Barry Warsaw (barry) wrote :

On Jan 18, 2013, at 06:26 PM, Martin Albisetti wrote:

>On Fri, Jan 18, 2013 at 3:22 PM, Barry Warsaw <email address hidden> wrote:
>> Oh FFS.
>
>Added you to the team.

You rock!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-12-18 10:23:55 +0000
3+++ debian/changelog 2013-01-17 16:40:25 +0000
4@@ -1,3 +1,10 @@
5+software-center (5.5.4) UNRELEASED; urgency=low
6+
7+ * lp:~barry/software-center/lp1100408:
8+ - debian/control: Update Depends for new oneconf packaging.
9+
10+ -- Barry Warsaw <barry@ubuntu.com> Thu, 17 Jan 2013 11:28:58 -0500
11+
12 software-center (5.5.3) raring; urgency=low
13
14 * lp:~mvo/software-center/pep8-e125:
15
16=== modified file 'debian/control'
17--- debian/control 2012-12-19 09:39:37 +0000
18+++ debian/control 2013-01-17 16:40:25 +0000
19@@ -52,7 +52,7 @@
20 python-xdg,
21 ubuntu-sso-client,
22 python-piston-mini-client (>= 0.1+bzr29),
23- oneconf (>= 0.2.6),
24+ python-oneconf (>= 0.3),
25 python-debtagshw,
26 ubuntu-extras-keyring
27 Recommends: lsb-release,
28@@ -61,7 +61,7 @@
29 software-properties-gtk,
30 sessioninstaller,
31 xz-utils (>= 5.1.1alpha+20120614-1)
32-Conflicts: gnome-app-install (<< 1), oneconf (<< 0.2.6.1)
33+Conflicts: gnome-app-install (<< 1)
34 Replaces: gnome-app-install
35 Provides: gnome-app-install
36 Description: Utility for browsing, installing, and removing software