Merge simple-scan 2.31.1-1 (main) from Debian unstable (main)

[Alessio Treglia]

Please merge simple-scan 2.31.1-1 (main) from Debian unstable (main)

Attaching a patch.

[Alessio Treglia (quadrispro)]

Buildlog:

http://debomatic.debian.net/maverick/pool/simple-scan_2.31.1-1ubuntu1/simple-scan_2.31.1-1ubuntu1.buildlog

[Alessio Treglia (quadrispro)]

No need to change maintainer, he already has a @ubuntu.com mail address.

And please, don't change the Vcs-* fields as they come from debian.

[Daniel Hahler (blueyed)]

Alessio, I guess you're referring to another bug?

Your patch appears to be OK / not affected by your last comment after all, marking Triaged.

[Benjamin Drung (bdrung)]

uploaded, thanks

[Robert Ancell (robert-ancell)]

Alessio, if the version has ubuntuN in it then it should be stored in bzr and have the Vcs- fields changed. I've updated the bzr branch with the latest changes.

[Alessio Treglia (quadrispro)]

Ok, I'll update the branch next time.

[Alessio Treglia (quadrispro)]

Robert, I've been thinking about #6 and I fail to see the reason for doing that.

Why should we maintain two repositories? The package comes from Debian and, as well as you can see, the packaging is stored here:
http://git.debian.org/?p=collab-maint/simple-scan.git

As developer for both Debian and Ubuntu, I work to minimize the delta and maintaining two repositories for the packaging is IMHO a good example of how to duplicate efforts.

[Benjamin Drung (bdrung)]

If the Ubuntu version is kept in the same vcs, we shouldn't change it. If the Ubuntu version is not kept there, you won't get the Ubuntu changes by pulling from the vcs. Therefore it would be nice to have the Vcs- fields changed. Then you can see that the package is maintained in Debian in the specified vcs, but you can't pull the Ubuntu changes from there. IIRC we have no common rule for the Vcs- fields in Ubuntu.

[Robert Ancell (robert-ancell)]

The version in git is not exactly the Ubuntu version (but very close, i.e. the only difference currently would be in debian/control and debian/patches/series?). If you use debcheckout, you wont get the same information as you would from apt-get source and that is confusing.

So, it would make sense to have a branch with the small Ubuntu changes, and merge that each time you update the Debian version.

If the information is in Debian git it makes it harder for Ubuntu contributors to update the package. (i.e. what happens if you go on holiday for a month). So it really is preferable to have the Ubuntu changes in bzr.

(Note this problem goes away as soon as we make a distribution common liblaunchpad-integration, then we can just run the vanilla Debian version)