[Pkg-bazaar-maint] reconciling Ubuntu and debian package versions

[Robert Collins]

On Mon, 2007-06-25 at 16:31 +0200, Reinhard Tartler wrote:
> 
> > * Robert Collins [Mon, 25 Jun 2007 18:40:13 +1000]:
> >> Ubuntu has python2.5 as the default and is not shipping 2.4
> >> on the CD - but I see no reason not to change the version of python used
> >> in debian to 2.5 also
> 
> Adeodato Simó <dato at net.com.org.es> writes:
> > I don't think there's a need to do so. The source package can be
> > identical for both distributions, and each will pick its default python
> > versions to put in the Depends line at build time.
> 
> The problem is that the bzr package in ubuntu must not depend on
> python-celementtree, which seems to be required for python2.4
> installations, which is still the default in debian.
> 
> I don't have a good suggestion how to solve this, honestly :(

Its more than this though..

Currently we build-depend on 
Build-Depends: debhelper (>= 5.0.38), cdbs (>= 0.4.43), quilt, python
(>= 2.4), python-central (>= 0.5.6)
Build-Depends-Indep: python-docutils (>= 0.4-2), python-celementtree (>=
1.0.5-7), python-medusa, python-paramiko

Thats not going to work on Ubuntu properly for several reasons - the
already discussed dependency on celementree which is in universe, and
the non-deterministic dependency on python2.4

To have a single package we need to:
 - depend on python 2.5 specifically. This is important because
otherwise whatever is grabbed by the buildd chroot is what will be used,
and Ubuntu iso's do not have python2.4 on them - we had to change the
package recently in Ubuntu to do this. Unless there is a good reason
*not* to within debian I think its fine to do this. bzr is an
application, *not* a library. (bzrlib is a library though, so when
python2.4 is installed it is appropriate to symlink into the 2.4 module
tree for bzrlib).
 - We should shrink the build-depends
 - The runtime Depends need to be fixed as previously discussed -
python2.5 | python-celementree

I think the below should do this giving a package that is fine for both
Debian and Ubuntu. 

-Rob

=== modified file 'control'
--- control     2007-06-12 16:11:26 +0000
+++ control     2007-07-11 06:57:35 +0000
@@ -2,16 +2,16 @@
 Section: devel
 Priority: optional
 Maintainer: Debian Bazaar Maintainers
<pkg-bazaar-maint at lists.alioth.debian.org>
-Uploaders: Rob Weir <rweir at ertius.org>, Jeff Bailey
<jbailey at raspberryginger.com>, Andres Salomon <dilinger at debian.org>,
Adeodato Simó <dato at net.com.org.es>, Wouter van Heyst
<larstiq at larstiq.dyndns.org>, Reinhard Tartler <siretart at tauware.de>
-Build-Depends: debhelper (>= 5.0.38), cdbs (>= 0.4.43), quilt, python
(>= 2.4), python-central (>= 0.5.6)
-Build-Depends-Indep: python-docutils (>= 0.4-2), python-celementtree
(>= 1.0.5-7), python-medusa, python-paramiko
+Uploaders: Rob Weir <rweir at ertius.org>, Jeff Bailey
<jbailey at raspberryginger.com>, Andres Salomon <dilinger at debian.org>,
Adeodato Simó <dato at net.com.org.es>, Wouter van Heyst
<larstiq at larstiq.dyndns.org>, Reinhard Tartler <siretart at tauware.de>,
Robert Collins <robertc at robertcollins.net>
+Build-Depends: debhelper (>= 5.0.38), cdbs (>= 0.4.43), quilt,
python2.5 | python-celementtree (>= 1.0.5-7), python-central (>= 0.5.6)
+Build-Depends-Indep: python-docutils (>= 0.4-2)
 Standards-Version: 3.7.2
 XS-Python-Version: >= 2.4
 XS-VCS-Bzr: http://bzr.debian.org/pkg-bazaar/bzr/unstable
 
 Package: bzr
 Architecture: all
-Depends: ${python:Depends}, python-celementtree (>= 1.0.5-7)
+Depends: ${python:Depends}, python (>= 2.5) | python-celementtree (>=
1.0.5-7)
 Recommends: python-paramiko, python-pycurl
 Suggests: libxml2-utils
 Conflicts: bzr-doc

=== modified file 'rules'
--- rules       2007-06-12 16:11:26 +0000
+++ rules       2007-07-11 06:53:49 +0000
@@ -4,7 +4,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_PYTHON_INSTALL_ARGS_ALL += --install-data=/usr/share
 
@@ -26,8 +25,3 @@
 debian/stamp-doc:
        make docs
        touch $@
-
-install/bzr::
-       # we can't delete the tests/ subdirectory due to an upstream
-       # bug; #368760.
-       #rm -rf $(DEB_DESTDIR)/usr/lib/python
$(DEB_PYTHON_COMPILE_VERSION)/site-packages/bzrlib/tests


-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : http://lists.alioth.debian.org/pipermail/pkg-bazaar-maint/attachments/20070711/f6490d92/attachment.pgp