Re: repo setup for git-buildpackage

2008-07-24 Thread Stefano Zacchiroli
On Thu, Jul 24, 2008 at 06:14:57PM -0400, Eric Cooper wrote: > Now, can someone explain the benefit to using pristine-tar in this > situation? The repo has the upstream source, and git-buildpackage can > build the orig.tar.gz from it, so where does pristine-tar come in? It depends on your release

Re: repo setup for git-buildpackage

2008-07-24 Thread Eric Cooper
On Fri, Jul 25, 2008 at 12:37:55AM +0200, Stéphane Glondu wrote: > The proper course of action would be to remove approx.git from /git/..., > and in a freshly cloned repo, do a "new-d-o-m-git-repo approx". OK, I've now done this. The new-d-o-m-git-repo script didn't quite work because the cloned

Re: repo setup for git-buildpackage

2008-07-24 Thread Stéphane Glondu
Eric Cooper wrote: >> So I did this using my tool, and I got this: [...] > > I forgot to mention, your tool did a much better job than git-svn -- > does it make sense to make it more widely available, or offer it as an > improvement to the git-svn maintainers? My tool is very specific to our setu

Re: repo setup for git-buildpackage

2008-07-24 Thread Stéphane Glondu
Eric Cooper wrote: > Thank you very much, Stéphane. That looks much better than my > attempt, so I've copied it to the official (pkg-ocaml-maint/packages) > location and will push further development there. Feel free to remove > your test/ copy. What do you mean by "copy"? Did you use the new-d-

Re: repo setup for git-buildpackage

2008-07-24 Thread Eric Cooper
On Thu, Jul 24, 2008 at 12:34:00PM +0200, Stéphane Glondu wrote: > So I did this using my tool, and I got this: [...] I forgot to mention, your tool did a much better job than git-svn -- does it make sense to make it more widely available, or offer it as an improvement to the git-svn maintainers?

Re: repo setup for git-buildpackage

2008-07-24 Thread Eric Cooper
On Thu, Jul 24, 2008 at 12:34:00PM +0200, Stéphane Glondu wrote: > So I did this using my tool, and I got this: > > http://git.debian.org/?p=users/glondu-guest/test/approx.git > > Please check it out (and have a look with gitk). Basically, there is an > "upstream" branch with all changes to any

Re: repo setup for git-buildpackage

2008-07-24 Thread Stéphane Glondu
Stéphane Glondu a écrit : > [...] IIUC, you want to > de-debian-nativify it, and in the process, you want to remove all > history concerning debian/? How do you plan to keep a meaningful history > of debian packaging? It doesn't sound easy to me to plug the debian/ > history into the upstream histo

Re: repo setup for git-buildpackage

2008-07-23 Thread Eric Cooper
On Wed, Jul 23, 2008 at 10:11:37PM +0200, Stéphane Glondu wrote: > IIUC, you want to de-debian-nativify it, and in the process, you > want to remove all history concerning debian/? How do you plan to > keep a meaningful history of debian packaging? It doesn't sound easy > to me to plug the debian/

Re: repo setup for git-buildpackage

2008-07-23 Thread Stéphane Glondu
Eric Cooper wrote: > But when I try to run git-buildpackage, it doesn't check out the > upstream (master) source; it just runs "debuild" in a directory with > only debian/ in it, which of course fails. What am I missing? git-buildpackage expects a branch with upstream and debian/ merged. It uses

repo setup for git-buildpackage

2008-07-23 Thread Eric Cooper
I've moved approx from svn to git, but am having trouble now that I've taken the next step of splitting the debian part from the "upstream" part. I have removed all the debian/ stuff from the "master" branch (and set upstream-branch = "master" in gbp.conf). And I have removed everything *but* deb