Re: Bug#723175: [SoB osgearth] Vcs is not up to date
On 09/18/2013 03:11 PM, Andreas Tille wrote:
> Hi Bas,
>
> On Wed, Sep 18, 2013 at 01:45:00PM +0200, Sebastiaan Couwenberg wrote:
>> Thanks for looking into osgEarth so shortly before you VAC.
>
> Well, forcing people to wait is demotivating ... and I want to push a
> bit on the motivation side, right. ;-)
It is certainly motivating, I appreciate it a lot.
>
>> On 09/18/2013 01:25 PM, Andreas Tille wrote:
>>> on SoB Wiki page[1] you asked for sponsering your package. I checked
>>> out VCS via
>>>
>>> gbp-clone ssh://git.debian.org/git/pkg-grass/osgearth.git
>>>
>>> and found an old version there which is lagging behind mentors[2] please
>>> commit everything to VCS to make sure it is in sync with what you intend
>>> to upload. I'll generally rebuild a package from VCS via
>>> git-buildpackage.
>>
>> The changes for the package on mentors are in git, but in the jessie
>> branch not in master. This should work for the moment:
>>
>> gbp-clone --debian-branch=jessie
>> ssh://git.debian.org/git/pkg-grass/osgearth.git
>
> Ahhh, that was a bit hidden from the workflow I'm usually following
>
>> I'll merge the changes for jessie into master and push it to git.debian.org.
>
> Found it.
>
> .../osgearth (master) $ git-buildpackage
> gbp:info: Orig tarball 'osgearth_2.4.0+dfsg.orig.tar.gz' not found at '../tarballs/'
> gbp:warning: Pristine-tar branch "pristine-tar" not found
> pristine-tar: no pristine-tar branch found, use "pristine-tar commit" first
> gbp:error: Couldn't checkout "osgearth_2.4.0+dfsg.orig.tar.gz": /usr/bin/pristine-tar returned 1
>
> .../osgearth (master) $ git branch
> * master
> upstream
>
>
> Hmmm, it seems pristine-tar branch is missing. I'm used to import upstream
> tarball via
>
> git import-orig --pristine-tar
>
> which enables the byte-identical recreation of the upstream tarball. While
> I could download the tarball for sure would you consider also injecting this
> (or am I missing something again?)
I don't use pristine-tar, I just commit the uscan downloaded upstream
tarball to the upstream branch and merge that into the release specific
branch and/or master to work on the debian packaging for the new
upstream release.
I build the packages with git-buildpackage specifying the upstream tree
and debian branch. For example:
git-buildpackage --git-upstream-tree="upstream"
--git-debian-branch="jessie" --git-pbuilder --git-dist=sid -sa >
/var/tmp/osgearth-2.4.pbuilder 2>&1 &
Using pristine-tar instead of commiting the whole upstream tarballs is
probably better.
It's probably a good idea to adopt the Debian Perl Group Git Guide and
modify it for Debian GIS. That workflow looks much better than what I've
come up with, and more like what you were expecting.
So far we only document how to setup a Git repo for Debian GIS on the
wiki. We can use the git guide to document the next steps.
>
> Kind regards
>
> Andreas.
Kind Regards,
Bas
--
GnuPG: 0xE88D4AF1 (new) / 0x77A975AD (old)
Reply to: