Merge with pkg-icecast-devel

[Alessio Treglia]

On Tue, Oct 19, 2010 at 8:08 PM, Jonas Smedegaard <dr at jones.dk> wrote:
> After the "initial upstream branch" commit close to the end, but before
> force-merging with master, please try apply all but newest upstream tarballs
> fetched using debsnap with "git-import-orig --no-merge".
>
> I say "try" because I've never done so myself and am uncertain if it works,
> but if it does, we then are easier able to correlate not only our debian
> subdir but also upstream changes.
>

Done: http://git.debian.org/?p=pkg-multimedia/ezstream.git
Let me know what you think.

-- 
Alessio Treglia <alessio at debian.org>
Debian & Ubuntu Developer | Homepage: http://www.alessiotreglia.com
0FEC 59A5 E18E E04F 6D40 593B 45D4 8C7C DCFC 3FD0