Quoting Adrian Knoth (2013-02-21 18:41:35) > Speaking of which: I've tried to build the current jackd2.git with > git-buildpackage, but it fails, since the patches seem to be applied > twice. > > Jonas: I'm currently travelling and don't have time to look into that > right now. If you have some minutes, could you check?
Problem is that the Debian branch (master) contains already applied patches, as can be seen with this command: git diff --stat master..upstream | grep -v debian/ The cause of the problem is your earlier merge: you really should've used "git pull --rebase"! It is technically ok to ship patches preapplied, but not _both_ preapplied and as patches. One or the other. - Jonas -- * Jonas Smedegaard - idealist & Internet-arkitekt * Tlf.: +45 40843136 Website: http://dr.jones.dk/ [x] quote me freely [ ] ask before reusing [ ] keep private
signature.asc
Description: signature
_______________________________________________ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
