[Debian-med-packaging] [probabel] 05/05: Added TeXlive fonts package needed for building the manual to d/control.

[Andreas Tille]

On Mon, Apr 07, 2014 at 09:21:49AM +0200, L.C. Karssen wrote:
> > I did the same and it worked.  
> 
> Strange... In my case there was a conflict with two Makefile.in files.
> Since we use dh_autoreconf I could simple remove those two files from
> git as they will be regenerated anyway. Would that be an acceptable
> solution?

I'm using pbuilder exclusively which means the package is builded in a
chroot and not inside the repository - so this problem did not occured
to me.

May be simply

   debian/rules clean

would have solved this ... at least it should since a clean should
restore the original.  If it does not you should fix the clean target.
Usually dh_autoreconf cares for situations like this - may be you had
interrupted a build process at some point in time?

I guess your suggestion would not have worked, but a `git stash` or
`git reset --hard` shoudl have helped.
 
> > The fact that you can not add the same
> > tag in the upstream branch is no problem here.  At least it worked
> > perfectly at my side (and thus I pushed). 
> 
> Thanks!

You are welcome.

> >  For the future please always
> > remember to use --pristine-tar.  I'd recommend to copy the advise given
> > in Debian Med policy strictly (which I'm personally doing as well - or
> > rather I have put this commandline into an own local script since
> > otherwise I would forget as well).
> 
> I'm a bit confused now about the exact commands to use. Should it be:
> 
>  git import-orig --pristine-tar <path to tar.gz file>
> 
> or
> 
>  gbp import-orig --pristine-tar <path to tar.gz file>
> 
> or yet another command?

  http://debian-med.alioth.debian.org/docs/policy.html#git-tips

says explicitly

  git import-orig --pristine-tar /path/to/package_version.orig.tar.gz

and this is what I'm using.  It seems gbp also knows this option and I
guess that it does basically the same.  I'm no Git expert and was simply
following the policy document which has proven to be successful in the
past.

> > I have no idea - at my side it just worked.
> 
> OK. I guess we'll see what happens on the next upstream release.

+1
 
> Thanks for your time!

You are welcome 

      Andreas.

-- 
http://fam-tille.de