On Wed, Apr 14, 2010 at 10:25, Jonas Smedegaard <d...@jones.dk> wrote: > On Wed, Apr 14, 2010 at 09:52:45AM -0400, Felipe Sateler wrote: >> >> On Wed, Apr 14, 2010 at 08:55, <j...@users.alioth.debian.org> wrote: >>> >>> The following commit has been merged in the master branch: >>> commit d2d008625f9317b785c10369198e3077c746a877 >>> Merge: 2b6c348fcce2e49afa5774c2af5daae6e54cf14c >>> a017161f6dabbd4e13f03e9c9bc2b16bf02f3a55 >>> Author: Jonas Smedegaard <d...@jones.dk> >>> Date: Wed Apr 14 14:22:12 2010 +0200 >>> >>> Merge commit 'upstream/5.12.1.dfsg' >> >> Why did you re-merge from upstream? > > It was missing in the pristine-tar branch - probably you missing to push it. > I then tried get-orit-source'ing it and discovered bugs in recent CDBS > causing that to fail - and I made the (bogus, I realize now!) assumption > that you would not have been able to do it either so you'd simply not > updated fully to newest upstream tarball. > > So all in all: Sorry for the mess - please drop your latest commit to > pristine-tar branch and pull mine instead.
Hmm OK, next time please ask before doing these things. BTW, the upload went as a source 1 package for some reason, causing FTBFS on all archs. -- Saludos, Felipe Sateler _______________________________________________ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-multimedia-maintainers