On Thu, Aug 16, 2012 at 3:22 AM, Dan S <danstowell+de...@gmail.com> wrote: > 2012/8/15 Felipe Sateler <fsate...@debian.org>: >> On Mon, Aug 13, 2012 at 9:38 AM, >> <danstowell-gu...@users.alioth.debian.org> wrote: >>> The following commit has been merged in the master branch: >>> commit 3c1278c9f79054a1d80ec96fbcb6e44946a771cb >>> Author: Dan Stowell <danstow...@users.sourceforge.net> >>> Date: Mon Aug 13 14:14:53 2012 +0100 >>> >>> Convert upstream's post-hoc 3.5.4 tweak into a patch >> >> But the new upstream tarball has been imported! This means that there >> are non-debian/ changes between upstream and debian branch. >> >> I presume you did this because of some interaction between >> git-buildpackage and pristine-tar. Can you explain? > > Yes: I did it because debuild bailed out on detecting source changes > between 3.5.4~repack and 3.5.4~repack-1 (or suchlike). I'm sorry that > the git history is messy; upstream changed their mind about 3.5.4 > after I'd pushed the first 3.5.4 import, which meant there was nothing > I could do to write it out of history. It may have been a bad choice > to import the second tarball, but on the other hand that's the only > way to make the recorded md5sum match against what's on upstream's > servers. :/
I think the problem is that it was imported with the same name as the older one. If it was imported as ~repack2 instead of ~repack it would work, I think (via DEB_UPSTREAM_REPACKAGE_TAG). -- Saludos, Felipe Sateler _______________________________________________ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
