[Pkg-corba-devel] pkg-corba repository layout

[Thomas Girard]

Hello Floris, Martin,

>> I'm wondering what layout you're planning on using in the subversion
>> repository.  Obviously the trunk/<package> layout, but I mean the
>> handling of upstream tarballs.
>>
>> In my checkout I've set the 'mergeWithUpstream' property on the debian
>> directory and put the tarballs into trunk/tarballs, which then builds
>> using svn-buildpackage (only it doesn't since the patches do not get
>> applied).  But is that the plan?  Or do you want to check in the
>> unpacked sources as well?  Also, if not, what's the plan with the
>> patches; dpatch?

I've read svn-buildpackage documentation and played with it and it looks 
like a very nice tool. Thanks for making me look into this.

With some changes (uncommited so far), I 've been able to rebuild 
omniorb4 4.0.6-2.3 packages.

Here's what I did:
  1. create a tarballs/ directory on the website[1]
  2 .set the `mergeWithUpstream' property to `1', as you suggested
  3. set `svn-bp:origUrl'[2] to the upstream tarball on our website[3]
  4. drop debian/patches and add the patched version of upstream sources
     (e.g. configure, configure.ac, doc and tex files) in the working
     copy, just like `svn-inject -o' would do
  5. rebuild the packages using the following command:
     $ svn-buildpackage --svn-override=origDir='..' -rfakeroot
     (I actually had to add --svn-ignore because of the uncommited
      changes)

I like this work flow because:
  * it makes existing 4.0.6-2.3 packages easy to rebuild
  * it does not version all upstream source file in SVN -- that
    would waste space on alioth
  * thanks to the `origUrl' property, svn-buildpackage can download the
    upstream tarball if it can't find it locally
  * it does not force us to use quilt or dpatch; we can stick to the
    `mergeWithUpstream' approach. If we later feel the need for something
    else then we will change

What do you think about it? If you're fine, I will commit my changes, 
and recreate a 4.0.6-2.3 tag.

Cheers,

Thomas

[1] http://pkg-corba.alioth.debian.org/tarballs
[2] http://wiki.debian.org/Games/Development/BuildProcess
[3] http://pkg-corba.alioth.debian.org/tarballs/omniorb4_4.0.6.orig.tar.gz