Re: dpkg-buildpackage OK, git-buildpackage not OK.
On 27-10-2009, Guillaume Yziquel <guillaume.yziquel@citycable.ch> wrote:
> Hi.
>
> I'm still on my OCaml-R packaging, pushing it slowly as my free times
> allows it.
>
> I've experienced a weird issue after a discussion with Mehdi Dogguy:
> I've added a debian/clean file to remove two files from the source,
> which are useless. Using dpkg-buildpackage works fine, and builds my two
> binary packages. Using git-buildpackage seems to fail because of some
> esoteric git/dh_clean issue.
>
> Here's the full output. Advice appreciated.
>
>> yziquel@seldon:~/sandbox/repo/debian/debian-ocaml/ocaml-r$ make git-buildpackage
>> git clone git://git.debian.org/pkg-ocaml-maint/packages/dh-ocaml.git
>> Initialized empty Git repository in /home/yziquel/sandbox/repo/debian/debian-ocaml/ocaml-r/dh-ocaml/.git/
>> remote: Counting objects: 953, done.
>> rm -f '/home/yziquel/sandbox/repo/debian/debian-ocaml/ocaml-r/ocaml-r/src/.depend'
[...]
>> You have uncommitted changes in your source tree:
>> # On branch master
>> # Changed but not updated:
>> # (use "git add/rm <file>..." to update what will be committed)
>> # (use "git checkout -- <file>..." to discard changes in working directory)
>> #
>> # deleted: src/r_devices.c
>> # deleted: src/rdevices.ml
>> #
>> no changes added to commit (use "git add" and/or "git commit -a")
>>
>> Use --git-ignore-new to ignore.
>> make: *** [git-buildpackage] Erreur 1
>
git-buildpackage do additional check to ensure that after a clean you
are back to pristine. It doesn't seems to be the case, because you have
deleted file.
You have different choices:
- really delete once and for all the files (either when importing from
upstream or by hand in one commit on branch master)
- save and restore files during the build
Regards,
Sylvain Le Gall
Reply to: