On Mon, Jun 07, 2010 at 22:27:41 (CEST), Fabian Greffrath wrote:
> This evening I've spent more than one hour getting the newly released
> libebml 1.0 merged into our GIT repository - without success. F**king
> git-import-orig always complains about file conflicts in the debian/
> directory. How I *hate* debian/ directories in upstream tarballs and
> bz2-only upstream tarballs, too - libebml has both!
> So, please someone help me getting git-import-orig to do what I want it
> to do. I'd like to get this package in shape and targetted at
> experimental within the next days.
This conflicts happened because upstream now *removed* its debian/
directory. git notices this and tries to apply this change to
'master'. This is of course wrong and needs to be undone:
$ git merge upstream
$ git reset master debian/
this resets all files under the directory debian to the state that was
previously in master.
moreover, I've switched to package to source format 3.0 (quilt), so that
we can properly handle orig.tar.bz2 tarballs. Bug #566993 is a bit
annoying here, but can be avoided by mentioning that explicitly in
Reinhard Tartler, KeyID 945348A4
pkg-multimedia-maintainers mailing list