[pkg-fso-maint] On zhone package update

[Joachim Breitner]

Hi yoush,

sorry for the late answer, I was busy with other stuff.

Am Sonntag, den 04.01.2009, 23:55 +0300 schrieb Nikita V. Youshchenko:
> After updating pythin-e* packages, I've tried to update zhone package as 
> well, to make all things installable at a time.
> 
> I've cloned git://git.debian.org/git/pkg-fso/zhone.git, updated things and 
> tried to build, but got
> 
> nikita at blacky:~/openmoko/pkg-e/debian/zhone> git-buildpackage
> dh clean
>    dh_testdir
>    dh_auto_clean
> running clean
> 'build/lib.linux-x86_64-2.5' does not exist -- can't clean it
> 'build/bdist.linux-x86_64' does not exist -- can't clean it
> 'build/scripts-2.5' does not exist -- can't clean it
>    dh_clean
> fatal: ambiguous 
> argument 'refs/heads/pristine-tar:zhone_0-git20090104.orig.tar.gz.delta': 
> unknown revision or path not in the working tree.
> Use '--' to separate paths from revisions
> pristine-tar: git show 
> refs/heads/pristine-tar:zhone_0-git20090104.orig.tar.gz.delta failed
> /usr/bin/pristine-tar returned 128
> Couldn't run '/usr/bin/pristine-tar'
> 
> I guess new deltas are expected to be on pristine-tar branch, however I 
> could not find how to provide those.
> 
> Could you please help?

Skip this: :-)
−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−
Can you check the output of
$ git branch
and
$ git branch -r
?

I’m no git expert, but I have observed that git does not necessarily
make local branches for all remote branches. If so, try
$ git checkout origin/pristine-tar
$ git checkout -b pristine-tar
(and likewise for any other branch that you need locally.)
−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−−

On second thought, I understand your problem...

My workflow for the zhone repository is this:

If I want a new upstream revision, I build a clean tarball from the
upstream branch using "./setup.py sdist". This is renamed to the debian
scheme, and then extracted into the upstream-dist branch. (E.g. by rm
-rf’ing the content, extracting the tarball there and adding that
commit). I then mark the origin of that version by using "git merge -s
ours upstrea". This is tagged upstream/..., and is also the base for an
import of the tarball with pristine-tar. Then I switch to the Debian
branch, merge the upstream/... tag and continue with the Debian
packaging.

Greetings,
Joachim
-- 
Joachim "nomeata" Breitner
Debian Developer
  nomeata at debian.org | ICQ# 74513189 | GPG-Keyid: 4743206C
  JID: nomeata at joachim-breitner.de | http://people.debian.org/~nomeata
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Dies ist ein digital signierter Nachrichtenteil
Url : http://lists.alioth.debian.org/pipermail/pkg-fso-maint/attachments/20090106/ef86a291/attachment.pgp