Merge lp:~vorlon/software-center/vcs-bzr-fix into lp:software-center

[Steve Langasek]

I had a much harder time than I ought to have finding the right branch of software-center to check the python-central migration status, because the vcs-bzr field in the package points to the wrong branch. Here's a trivial fix for that. :)

[Gary Lasker (gary-lasker)]

Hey Steve, thanks for your branch! Now, it may well be that I am misunderstanding something, but afaik we already currently point to the correct branch in our vcs-bzr field, that is, we point to https://code.launchpad.net/~software-store-developers/software-center/trunk which is the current development trunk for Oneiric.

The branch https://code.launchpad.net/~software-store-developers/software-center/4.0 is our maintenance branch for Natty SRUs, and we currently point to that branch in the vcs-bzr field for our Natty releases.

So, I *think* we are already doing things correctly? Please let me know if I am missing something. :)

Thanks,
Gary

review: Needs Information

[Steve Langasek (vorlon)]

On Fri, Jun 24, 2011 at 11:11:19PM -0000, Gary Lasker wrote:
> Review: Needs Information

> Hey Steve, thanks for your branch! Now, it may well be that I am
> misunderstanding something, but afaik we already currently point to the
> correct branch in our vcs-bzr field, that is, we point to
> https://code.launchpad.net/~software-store-developers/software-center/trunk
> which is the current development trunk for Oneiric.

This merge proposal was submitted against that exact branch, was it not?
The top of debian/changelog shows the yet-unreleased 4.1.7. So
lp:software-center, which appears to point at
<https://code.launchpad.net/~software-store-developers/software-center/trunk>,
definitely has a Vcs-Bzr field pointing at the 4.0 branch...

Cheers,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
<email address hidden> <email address hidden>

[Gary Lasker (gary-lasker)]

Ahh yes indeed, Steve, yes indeed. I figured I was missing something. Looks like a bit of unintended leakage from a merge from the 4.0 branch a few weeks back. My apologies for the trouble, and thanks again!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-22 18:00:43 +0000
+++ debian/changelog	2011-06-23 21:39:28 +0000
@@ -18,6 +18,9 @@
   * merge lp:~evfool/software-center/smallfixes, many thanks to
     Robert Roth (LP: #796640) 
 
+  [ Steve Langasek ]
+  * debian/control: point Vcs-Bzr field at the right branch.
+
  -- Gary Lasker <[e-mail]>  Wed, 22 Jun 2011 13:59:20 -0400
 
 software-center (4.1.6) oneiric; urgency=low

=== modified file 'debian/control'
--- debian/control	2011-06-10 10:46:09 +0000
+++ debian/control	2011-06-23 21:39:28 +0000
@@ -13,7 +13,7 @@
                python-setuptools,
                python-scour
 Standards-Version: 3.8.4
-Vcs-Bzr: https://code.launchpad.net/~software-store-developers/software-center/4.0
+Vcs-Bzr: https://code.launchpad.net/~software-store-developers/software-center/trunk
 Homepage: https://launchpad.net/software-center
 
 Package: software-center