Author: vcheng Date: 2014-06-12 03:24:36 +0000 (Thu, 12 Jun 2014) New Revision: 15127
Added: packages/tags/0ad/0.0.16-3/ packages/tags/0ad/0.0.16-3/debian/changelog packages/tags/0ad/0.0.16-3/debian/control packages/tags/0ad/0.0.16-3/debian/patches/series packages/tags/0ad/0.0.16-3/debian/patches/support_miniupnpc_1.9.patch Removed: packages/tags/0ad/0.0.16-3/debian/changelog packages/tags/0ad/0.0.16-3/debian/control packages/tags/0ad/0.0.16-3/debian/patches/series Log: [svn-buildpackage] Tagging 0ad 0.0.16-3 Deleted: packages/tags/0ad/0.0.16-3/debian/changelog =================================================================== --- packages/trunk/0ad/debian/changelog 2014-05-19 02:40:21 UTC (rev 15112) +++ packages/tags/0ad/0.0.16-3/debian/changelog 2014-06-12 03:24:36 UTC (rev 15127) @@ -1,162 +0,0 @@ -0ad (0.0.16-2) unstable; urgency=medium - - * Remove armel from Architecture list in debian/control. - - -- Vincent Cheng <[email protected]> Sun, 18 May 2014 19:14:10 -0700 - -0ad (0.0.16-1) unstable; urgency=medium - - * New upstream release. - - Drop debian/patches/fix-kfreebsd-ftbfs.patch; applied upstream. - * Avoid repacking tarball by including missing jquery sources in Debian diff, - see debian/missing-sources/jquery-1.8.{0,3}.js. Alternative way of fixing - #735349. - - Update debian/copyright to include missing license entries for the - various javascript libraries contained in the source tarball. - - Revert changes made to debian/control in 0ad/0.0.15+dfsg-3, i.e.: - revert: debian/control: Hardcode versions of 0ad-data{,-common} to - depend on to workaround the fact that 0.0.15+dfsg is strictly - greater than 0.0.15. - * Build-dep on libgloox-dev (>= 1.0.9) to ensure that 0ad is built with - newer enough gloox to avoid lobby connectivity issues. - * Add new build-deps: libicu-dev, libmozjs-24-dev. - - -- Vincent Cheng <[email protected]> Sat, 17 May 2014 16:30:39 -0700 - -0ad (0.0.15+dfsg-3) unstable; urgency=medium - - * Repack tarball to remove minified javascript files without source in - source/tools/jsdebugger/. (Closes: #735349) - - debian/control: Hardcode versions of 0ad-data{,-common} to depend on to - workaround the fact that 0.0.15+dfsg is strictly greater than 0.0.15. - * Update debian/copyright to include text of IBM Common Public License. - * Update email address. - - -- Vincent Cheng <[email protected]> Tue, 18 Feb 2014 23:21:11 -0800 - -0ad (0.0.15-2) unstable; urgency=medium - - * Add debian/patches/fix-kfreebsd-ftbfs.patch to fix FTBFS on kfreebsd. - - -- Vincent Cheng <[email protected]> Fri, 27 Dec 2013 15:03:44 -0800 - -0ad (0.0.15-1) unstable; urgency=low - - * New upstream release. - - Remove fix-arm-ftbfs.patch, fixed upstream. - * Add build-dep on libgloox-dev and libminiupnpc-dev. - * Append '~' to libnvtt-dev build dependency to ease backporting. - * Prefer libwxgtk3.0-dev over libwxgtk2.8-dev as build-dep (keep latter as - alternate build-dep to ease backports). - * Update Standards version to 3.9.5, no changes required. - - -- Vincent Cheng <[email protected]> Wed, 25 Dec 2013 17:41:29 -0800 - -0ad (0.0.14-3) unstable; urgency=low - - * Add debian/patches/fix-arm-ftbfs.patch to fix FTBFS on armel and armhf. - - -- Vincent Cheng <[email protected]> Tue, 17 Sep 2013 01:08:10 -0700 - -0ad (0.0.14-2) unstable; urgency=low - - * Tighten build dependency on libnvtt-dev to >= 2.0.8-1+dfsg-4 to ensure - that amd64 builds of 0ad do not FTBFS on certain hardware. See #713966 - for details. - * Build 0ad for armel and armhf. - - -- Vincent Cheng <[email protected]> Fri, 06 Sep 2013 23:00:24 -0700 - -0ad (0.0.14-1) unstable; urgency=low - - * New upstream release. - - Remove fix-bindir.patch, boost-libnames.patch; applied/fixed upstream. - - Refresh remaining patches. - - -- Vincent Cheng <[email protected]> Thu, 05 Sep 2013 20:02:20 -0700 - -0ad (0.0.13-2) unstable; urgency=low - - * Add boost-libnames.patch to fix FTBFS with boost 1.53. (Closes: #709570) - - -- Vincent Cheng <[email protected]> Fri, 24 May 2013 01:47:14 -0700 - -0ad (0.0.13-1) unstable; urgency=low - - * New upstream release. - - Refresh patches. - * Add icon to Debian menu entry. (Closes: #703254) - - -- Vincent Cheng <[email protected]> Tue, 02 Apr 2013 19:40:54 -0700 - -0ad (0.0.12-1) unstable; urgency=low - - [ Vincent Cheng ] - * New upstream release. - - Remove debian/patches/fix-kfreebsd-ftbfs.patch; applied upstream. - - Refresh remaining patches. - * Add depends on 0ad-data-common. - * Add lintian overrides for: - - outdated-autotools-helper-file (caused by config.{guess,sub} in a - convenience copy of libenet, which we don't use). - - version-substvar-for-external-package (not a problem since 0ad and - 0ad-data uploaded at same time, and no other mechanism provided by - dpkg-gencontrol for packages that want to depend on versioned packages - built from a separate source package). - * Update Standards version to 3.9.4, no changes required. - * Enable verbose build. - - [ Ansgar Burchardt ] - * debian/control: Remove DM-Upload-Allowed. - - -- Vincent Cheng <[email protected]> Tue, 12 Feb 2013 19:24:59 -0800 - -0ad (0.0.11-1) unstable; urgency=low - - * New upstream release. (Alpha 11 Kronos) - - Upstream disabled FAM support as of svn r12550, so remove build-depends - on libgamin-dev, and remove depends on gamin | fam. (Closes: #679087) - - Refresh existing patches. - * Add fallback to launcher script when /usr/games is not in $PATH. - (Closes: #679033) - * Restrict list of architectures to i386, amd64, and kfreebsd-{i386,amd64}. - (Closes: #683282) - * Update debian/watch file. - * Add DMUA field in debian/control with agreement of sponsor. - - -- Vincent Cheng <[email protected]> Sat, 08 Sep 2012 02:43:25 -0700 - -0ad (0~r11863-2) unstable; urgency=low - - * Add stricter dependency on 0ad-data. (Closes: #673526) - - -- Vincent Cheng <[email protected]> Sun, 20 May 2012 01:48:59 -0700 - -0ad (0~r11863-1) unstable; urgency=low - - * New upstream release. - - Refresh patches. - * Add debian/patches/enable-hardening-relro.patch to build using the - "read-only relocation" link flag, as suggested by lintian. - * Add build-depends on libxcursor-dev. - - -- Vincent Cheng <[email protected]> Wed, 16 May 2012 23:50:12 -0700 - -0ad (0~r11339-2) unstable; urgency=low - - * Add debian/patches/fix-kfreebsd-ftbfs.patch to fix FTBFS on kfreebsd. - * Update debian/0ad.6. - * Add build-depends on dpkg-dev (>= 1.15.5) for xz compression support. - * Change build-depends on libjpeg8-dev to libjpeg-dev. - * Change build-depends on libpng12-dev to libpng-dev. (Closes: #668453) - * Add alternate build-depends on libcurl4-dev. - * Add alternate dependency on fam. (Closes: #668353) - * Override dh_auto_clean to clean source properly. (Closes: #668686) - - -- Vincent Cheng <[email protected]> Thu, 26 Apr 2012 19:12:26 -0700 - -0ad (0~r11339-1) unstable; urgency=low - - * Initial release (Closes: #594800) - - -- Vincent Cheng <[email protected]> Thu, 29 Mar 2012 16:13:33 -0700 Copied: packages/tags/0ad/0.0.16-3/debian/changelog (from rev 15126, packages/trunk/0ad/debian/changelog) =================================================================== --- packages/tags/0ad/0.0.16-3/debian/changelog (rev 0) +++ packages/tags/0ad/0.0.16-3/debian/changelog 2014-06-12 03:24:36 UTC (rev 15127) @@ -0,0 +1,170 @@ +0ad (0.0.16-3) unstable; urgency=medium + + * Add debian/patches/support_miniupnpc_1.9.patch to fix FTBFS when built + with miniupnpc >= 1.9. (Closes: #751224) + * Tighten build-dep on libminiupnpc-dev (>= 1.6). + + -- Vincent Cheng <[email protected]> Wed, 11 Jun 2014 19:46:46 -0700 + +0ad (0.0.16-2) unstable; urgency=medium + + * Remove armel from Architecture list in debian/control. + + -- Vincent Cheng <[email protected]> Sun, 18 May 2014 19:14:10 -0700 + +0ad (0.0.16-1) unstable; urgency=medium + + * New upstream release. + - Drop debian/patches/fix-kfreebsd-ftbfs.patch; applied upstream. + * Avoid repacking tarball by including missing jquery sources in Debian diff, + see debian/missing-sources/jquery-1.8.{0,3}.js. Alternative way of fixing + #735349. + - Update debian/copyright to include missing license entries for the + various javascript libraries contained in the source tarball. + - Revert changes made to debian/control in 0ad/0.0.15+dfsg-3, i.e.: + revert: debian/control: Hardcode versions of 0ad-data{,-common} to + depend on to workaround the fact that 0.0.15+dfsg is strictly + greater than 0.0.15. + * Build-dep on libgloox-dev (>= 1.0.9) to ensure that 0ad is built with + newer enough gloox to avoid lobby connectivity issues. + * Add new build-deps: libicu-dev, libmozjs-24-dev. + + -- Vincent Cheng <[email protected]> Sat, 17 May 2014 16:30:39 -0700 + +0ad (0.0.15+dfsg-3) unstable; urgency=medium + + * Repack tarball to remove minified javascript files without source in + source/tools/jsdebugger/. (Closes: #735349) + - debian/control: Hardcode versions of 0ad-data{,-common} to depend on to + workaround the fact that 0.0.15+dfsg is strictly greater than 0.0.15. + * Update debian/copyright to include text of IBM Common Public License. + * Update email address. + + -- Vincent Cheng <[email protected]> Tue, 18 Feb 2014 23:21:11 -0800 + +0ad (0.0.15-2) unstable; urgency=medium + + * Add debian/patches/fix-kfreebsd-ftbfs.patch to fix FTBFS on kfreebsd. + + -- Vincent Cheng <[email protected]> Fri, 27 Dec 2013 15:03:44 -0800 + +0ad (0.0.15-1) unstable; urgency=low + + * New upstream release. + - Remove fix-arm-ftbfs.patch, fixed upstream. + * Add build-dep on libgloox-dev and libminiupnpc-dev. + * Append '~' to libnvtt-dev build dependency to ease backporting. + * Prefer libwxgtk3.0-dev over libwxgtk2.8-dev as build-dep (keep latter as + alternate build-dep to ease backports). + * Update Standards version to 3.9.5, no changes required. + + -- Vincent Cheng <[email protected]> Wed, 25 Dec 2013 17:41:29 -0800 + +0ad (0.0.14-3) unstable; urgency=low + + * Add debian/patches/fix-arm-ftbfs.patch to fix FTBFS on armel and armhf. + + -- Vincent Cheng <[email protected]> Tue, 17 Sep 2013 01:08:10 -0700 + +0ad (0.0.14-2) unstable; urgency=low + + * Tighten build dependency on libnvtt-dev to >= 2.0.8-1+dfsg-4 to ensure + that amd64 builds of 0ad do not FTBFS on certain hardware. See #713966 + for details. + * Build 0ad for armel and armhf. + + -- Vincent Cheng <[email protected]> Fri, 06 Sep 2013 23:00:24 -0700 + +0ad (0.0.14-1) unstable; urgency=low + + * New upstream release. + - Remove fix-bindir.patch, boost-libnames.patch; applied/fixed upstream. + - Refresh remaining patches. + + -- Vincent Cheng <[email protected]> Thu, 05 Sep 2013 20:02:20 -0700 + +0ad (0.0.13-2) unstable; urgency=low + + * Add boost-libnames.patch to fix FTBFS with boost 1.53. (Closes: #709570) + + -- Vincent Cheng <[email protected]> Fri, 24 May 2013 01:47:14 -0700 + +0ad (0.0.13-1) unstable; urgency=low + + * New upstream release. + - Refresh patches. + * Add icon to Debian menu entry. (Closes: #703254) + + -- Vincent Cheng <[email protected]> Tue, 02 Apr 2013 19:40:54 -0700 + +0ad (0.0.12-1) unstable; urgency=low + + [ Vincent Cheng ] + * New upstream release. + - Remove debian/patches/fix-kfreebsd-ftbfs.patch; applied upstream. + - Refresh remaining patches. + * Add depends on 0ad-data-common. + * Add lintian overrides for: + - outdated-autotools-helper-file (caused by config.{guess,sub} in a + convenience copy of libenet, which we don't use). + - version-substvar-for-external-package (not a problem since 0ad and + 0ad-data uploaded at same time, and no other mechanism provided by + dpkg-gencontrol for packages that want to depend on versioned packages + built from a separate source package). + * Update Standards version to 3.9.4, no changes required. + * Enable verbose build. + + [ Ansgar Burchardt ] + * debian/control: Remove DM-Upload-Allowed. + + -- Vincent Cheng <[email protected]> Tue, 12 Feb 2013 19:24:59 -0800 + +0ad (0.0.11-1) unstable; urgency=low + + * New upstream release. (Alpha 11 Kronos) + - Upstream disabled FAM support as of svn r12550, so remove build-depends + on libgamin-dev, and remove depends on gamin | fam. (Closes: #679087) + - Refresh existing patches. + * Add fallback to launcher script when /usr/games is not in $PATH. + (Closes: #679033) + * Restrict list of architectures to i386, amd64, and kfreebsd-{i386,amd64}. + (Closes: #683282) + * Update debian/watch file. + * Add DMUA field in debian/control with agreement of sponsor. + + -- Vincent Cheng <[email protected]> Sat, 08 Sep 2012 02:43:25 -0700 + +0ad (0~r11863-2) unstable; urgency=low + + * Add stricter dependency on 0ad-data. (Closes: #673526) + + -- Vincent Cheng <[email protected]> Sun, 20 May 2012 01:48:59 -0700 + +0ad (0~r11863-1) unstable; urgency=low + + * New upstream release. + - Refresh patches. + * Add debian/patches/enable-hardening-relro.patch to build using the + "read-only relocation" link flag, as suggested by lintian. + * Add build-depends on libxcursor-dev. + + -- Vincent Cheng <[email protected]> Wed, 16 May 2012 23:50:12 -0700 + +0ad (0~r11339-2) unstable; urgency=low + + * Add debian/patches/fix-kfreebsd-ftbfs.patch to fix FTBFS on kfreebsd. + * Update debian/0ad.6. + * Add build-depends on dpkg-dev (>= 1.15.5) for xz compression support. + * Change build-depends on libjpeg8-dev to libjpeg-dev. + * Change build-depends on libpng12-dev to libpng-dev. (Closes: #668453) + * Add alternate build-depends on libcurl4-dev. + * Add alternate dependency on fam. (Closes: #668353) + * Override dh_auto_clean to clean source properly. (Closes: #668686) + + -- Vincent Cheng <[email protected]> Thu, 26 Apr 2012 19:12:26 -0700 + +0ad (0~r11339-1) unstable; urgency=low + + * Initial release (Closes: #594800) + + -- Vincent Cheng <[email protected]> Thu, 29 Mar 2012 16:13:33 -0700 Deleted: packages/tags/0ad/0.0.16-3/debian/control =================================================================== --- packages/trunk/0ad/debian/control 2014-05-19 02:40:21 UTC (rev 15112) +++ packages/tags/0ad/0.0.16-3/debian/control 2014-06-12 03:24:36 UTC (rev 15127) @@ -1,70 +0,0 @@ -Source: 0ad -Section: games -Priority: optional -Maintainer: Debian Games Team <[email protected]> -Uploaders: Vincent Cheng <[email protected]> -Build-Depends: - autoconf, - debhelper (>= 9), - dpkg-dev (>= 1.15.5), - libboost-dev, - libboost-filesystem-dev, - libboost-signals-dev, - libcurl4-gnutls-dev | libcurl4-dev, - libenet-dev (>= 1.3), - libgloox-dev (>= 1.0.9), - libicu-dev, - libjpeg-dev, - libminiupnpc-dev, - libmozjs-24-dev, - libnvtt-dev (>= 2.0.8-1+dfsg-4~), - libogg-dev, - libopenal-dev, - libpng-dev, - libsdl1.2-dev, - libvorbis-dev, - libwxgtk3.0-dev | libwxgtk2.8-dev, - libxcursor-dev, - libxml2-dev, - pkg-config, - zlib1g-dev -Standards-Version: 3.9.5 -Homepage: http://play0ad.com/ -Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/0ad/ -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/0ad/ - -Package: 0ad -Architecture: amd64 armhf i386 kfreebsd-amd64 kfreebsd-i386 -Pre-Depends: dpkg (>= 1.15.6~) -Depends: - 0ad-data (>= ${source:Upstream-Version}), - 0ad-data (<= ${source:Version}), - 0ad-data-common (>= ${source:Upstream-Version}), - 0ad-data-common (<= ${source:Version}), - ${misc:Depends}, - ${shlibs:Depends} -Description: Real-time strategy game of ancient warfare - 0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform - real-time strategy (RTS) game of ancient warfare. In short, it is a - historically-based war/economy game that allows players to relive or rewrite - the history of Western civilizations, focusing on the years between 500 B.C. - and 500 A.D. The project is highly ambitious, involving state-of-the-art 3D - graphics, detailed artwork, sound, and a flexible and powerful custom-built - game engine. - -Package: 0ad-dbg -Section: debug -Priority: extra -Architecture: amd64 armhf i386 kfreebsd-amd64 kfreebsd-i386 -Pre-Depends: dpkg (>= 1.15.6~) -Depends: 0ad (= ${binary:Version}), ${misc:Depends} -Description: Real-time strategy game of ancient warfare (debug) - 0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform - real-time strategy (RTS) game of ancient warfare. In short, it is a - historically-based war/economy game that allows players to relive or rewrite - the history of Western civilizations, focusing on the years between 500 B.C. - and 500 A.D. The project is highly ambitious, involving state-of-the-art 3D - graphics, detailed artwork, sound, and a flexible and powerful custom-built - game engine. - . - This package contains the debugging symbols. Copied: packages/tags/0ad/0.0.16-3/debian/control (from rev 15125, packages/trunk/0ad/debian/control) =================================================================== --- packages/tags/0ad/0.0.16-3/debian/control (rev 0) +++ packages/tags/0ad/0.0.16-3/debian/control 2014-06-12 03:24:36 UTC (rev 15127) @@ -0,0 +1,70 @@ +Source: 0ad +Section: games +Priority: optional +Maintainer: Debian Games Team <[email protected]> +Uploaders: Vincent Cheng <[email protected]> +Build-Depends: + autoconf, + debhelper (>= 9), + dpkg-dev (>= 1.15.5), + libboost-dev, + libboost-filesystem-dev, + libboost-signals-dev, + libcurl4-gnutls-dev | libcurl4-dev, + libenet-dev (>= 1.3), + libgloox-dev (>= 1.0.9), + libicu-dev, + libjpeg-dev, + libminiupnpc-dev (>= 1.6), + libmozjs-24-dev, + libnvtt-dev (>= 2.0.8-1+dfsg-4~), + libogg-dev, + libopenal-dev, + libpng-dev, + libsdl1.2-dev, + libvorbis-dev, + libwxgtk3.0-dev | libwxgtk2.8-dev, + libxcursor-dev, + libxml2-dev, + pkg-config, + zlib1g-dev +Standards-Version: 3.9.5 +Homepage: http://play0ad.com/ +Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/0ad/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/0ad/ + +Package: 0ad +Architecture: amd64 armhf i386 kfreebsd-amd64 kfreebsd-i386 +Pre-Depends: dpkg (>= 1.15.6~) +Depends: + 0ad-data (>= ${source:Upstream-Version}), + 0ad-data (<= ${source:Version}), + 0ad-data-common (>= ${source:Upstream-Version}), + 0ad-data-common (<= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Description: Real-time strategy game of ancient warfare + 0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform + real-time strategy (RTS) game of ancient warfare. In short, it is a + historically-based war/economy game that allows players to relive or rewrite + the history of Western civilizations, focusing on the years between 500 B.C. + and 500 A.D. The project is highly ambitious, involving state-of-the-art 3D + graphics, detailed artwork, sound, and a flexible and powerful custom-built + game engine. + +Package: 0ad-dbg +Section: debug +Priority: extra +Architecture: amd64 armhf i386 kfreebsd-amd64 kfreebsd-i386 +Pre-Depends: dpkg (>= 1.15.6~) +Depends: 0ad (= ${binary:Version}), ${misc:Depends} +Description: Real-time strategy game of ancient warfare (debug) + 0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform + real-time strategy (RTS) game of ancient warfare. In short, it is a + historically-based war/economy game that allows players to relive or rewrite + the history of Western civilizations, focusing on the years between 500 B.C. + and 500 A.D. The project is highly ambitious, involving state-of-the-art 3D + graphics, detailed artwork, sound, and a flexible and powerful custom-built + game engine. + . + This package contains the debugging symbols. Deleted: packages/tags/0ad/0.0.16-3/debian/patches/series =================================================================== --- packages/trunk/0ad/debian/patches/series 2014-05-19 02:40:21 UTC (rev 15112) +++ packages/tags/0ad/0.0.16-3/debian/patches/series 2014-06-12 03:24:36 UTC (rev 15127) @@ -1 +0,0 @@ -enable-hardening-relro.patch Copied: packages/tags/0ad/0.0.16-3/debian/patches/series (from rev 15126, packages/trunk/0ad/debian/patches/series) =================================================================== --- packages/tags/0ad/0.0.16-3/debian/patches/series (rev 0) +++ packages/tags/0ad/0.0.16-3/debian/patches/series 2014-06-12 03:24:36 UTC (rev 15127) @@ -0,0 +1,2 @@ +enable-hardening-relro.patch +support_miniupnpc_1.9.patch Copied: packages/tags/0ad/0.0.16-3/debian/patches/support_miniupnpc_1.9.patch (from rev 15126, packages/trunk/0ad/debian/patches/support_miniupnpc_1.9.patch) =================================================================== --- packages/tags/0ad/0.0.16-3/debian/patches/support_miniupnpc_1.9.patch (rev 0) +++ packages/tags/0ad/0.0.16-3/debian/patches/support_miniupnpc_1.9.patch 2014-06-12 03:24:36 UTC (rev 15127) @@ -0,0 +1,17 @@ +Description: Fix FTBFS with miniupnpc >= 1.9 +Origin: upstream, http://trac.wildfiregames.com/ticket/2552 +Bug-Debian: https://bugs.debian.org/751224 +Last-Update: 2014-06-11 + +--- a/source/network/NetServer.cpp ++++ b/source/network/NetServer.cpp +@@ -275,6 +275,9 @@ + ret = UPNP_GetSpecificPortMappingEntry(urls.controlURL, + data.first.servicetype, + psPort, protocall, ++#if MINIUPNPC_API_VERSION >= 10 ++ NULL/*remoteHost*/, ++#endif + intClient, intPort, NULL/*desc*/, + NULL/*enabled*/, duration); + _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

