Branches for Trusty

Author: Andrew Starr-Bochicchio
Revision Date: 2013-06-18 11:57:55 UTC

* Merge from Debian unstable. Remaining Ubuntu changes:
 - debian/patches:
  + 10-autoreconf-fi--2.65.patch: Drop, replaced by dh-autoreconf.
  + 20-lib--make-imglib.c-closedir.patch: Drop, merged upstream.
  + 30-spider.c-implicit-pointer-conversion.patch: Drop, merged upstream.
  + 40-include.patch: Drop, merged upstream.
  + 45-libpng15: Refresh.
  + 50-buildflags.patch: : Drop, merged upstream.
  + spider_license_fix.patch: fix filename in license of games/spider.c
   (LP: #978446).
 - debian/control: Build-depends on dh-autoreconf.
 - debian/rules: Use --with autoreconf.
* 55-more-buildflags.patch: Backport patch from Debian BTS adding png
  to AM_LDFLAGS to fix FTBFS.