Author: pabs Date: 2014-10-25 01:15:25 +0000 (Sat, 25 Oct 2014) New Revision: 15305
Modified: packages/trunk/warzone2100/debian/changelog packages/trunk/warzone2100/debian/patches/fix-yacc.diff packages/trunk/warzone2100/debian/patches/revert-372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f.patch Log: Add some DEP-3 headers to the patches Modified: packages/trunk/warzone2100/debian/changelog =================================================================== --- packages/trunk/warzone2100/debian/changelog 2014-10-25 01:09:08 UTC (rev 15304) +++ packages/trunk/warzone2100/debian/changelog 2014-10-25 01:15:25 UTC (rev 15305) @@ -5,6 +5,7 @@ * Bump Standards-Version, no changes needed * Ancient dpkg-dev dep is satisfied in all Debian/Ubuntu releases, drop it * Delete more generated files so that they get rebuilt + * Add some DEP-3 headers to the patches [ Clint Adams ] * Build-depend on automake1.11. Modified: packages/trunk/warzone2100/debian/patches/fix-yacc.diff =================================================================== --- packages/trunk/warzone2100/debian/patches/fix-yacc.diff 2014-10-25 01:09:08 UTC (rev 15304) +++ packages/trunk/warzone2100/debian/patches/fix-yacc.diff 2014-10-25 01:15:25 UTC (rev 15305) @@ -1,3 +1,6 @@ +Description: fix yacc +Author: Clint Adams <[email protected]> +Forwarded: no --- a/lib/framework/strres_parser.ypp +++ b/lib/framework/strres_parser.ypp @@ -32,19 +32,18 @@ Modified: packages/trunk/warzone2100/debian/patches/revert-372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f.patch =================================================================== --- packages/trunk/warzone2100/debian/patches/revert-372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f.patch 2014-10-25 01:09:08 UTC (rev 15304) +++ packages/trunk/warzone2100/debian/patches/revert-372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f.patch 2014-10-25 01:15:25 UTC (rev 15305) @@ -1,3 +1,6 @@ +Description: revert upstream patch that causes a GPL violation in Debian +Origin: reversion of https://github.com/Warzone2100/warzone2100/commit/372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f.patch +Bug: http://developer.wz2100.net/ticket/4151 --- a/autogen.sh +++ b/autogen.sh @@ -148,6 +148,11 @@ _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
