diff -Nru openarena-0.8.8/debian/changelog openarena-0.8.8/debian/changelog --- openarena-0.8.8/debian/changelog 2012-12-07 09:40:25.000000000 +0000 +++ openarena-0.8.8/debian/changelog 2013-05-12 10:36:45.000000000 +0000 @@ -1,22 +1,41 @@ -openarena (0.8.8-5+deb7u2) unstable; urgency=low +openarena (0.8.8-9) unstable; urgency=low + * Merge from experimental to unstable + * Add new watch file, using fakeupstream.cgi to work around the upstream + downloads page not being uscan'able (thanks to Bart Martens) + * debian/link-modules.sh: add symlinks so that on i386 and alpha, the game + code can be loaded by either old ioquake3 (which looks for i386.so, axp.so) + or new ioquake3 (which looks for x86.so, alpha.so) + + -- Simon McVittie Sun, 12 May 2013 11:36:14 +0100 + +openarena (0.8.8-8) experimental; urgency=low + + * Merge from 0.8.8-5+deb7u2 + - Switch /usr/share/doc/openarena-dbg from a symlink to openarena-server + to a real directory, fixing missing copyright file on upgrade + from wheezy or sid (Closes: #698463) and unwanted dependency on + openarena-server + + -- Simon McVittie Sat, 19 Jan 2013 13:53:05 +0000 + +openarena (0.8.8-7) experimental; urgency=low + + * Merge from 0.8.8-5+deb7u1 + - Add patch from upstream to fix a client-triggerable server crash. + Thanks to Poul Sander and Markus Koschany (Closes: #681812) * Request confirmation before enabling auto-downloading, which is a security risk (Closes: #686648) - * Switch /usr/share/doc/openarena-dbg from a symlink to openarena-server - to a real directory. Using the symlink requires it to depend on - openarena-server, which is undesirable, because since 0.8.8-1 that - package has contained an init script which is enabled by default. - * As a result, openarena-dbg no longer depends on openarena-server - (Closes: #695334) - -- Simon McVittie Fri, 07 Dec 2012 09:40:17 +0000 + -- Simon McVittie Fri, 14 Sep 2012 10:35:01 +0100 -openarena (0.8.8-5+deb7u1) unstable; urgency=low +openarena (0.8.8-6) experimental; urgency=low - * Add patch from upstream to fix a client-triggerable server crash. - Thanks to Poul Sander and Markus Koschany (Closes: #681812) + * Switch gbp.conf to experimental branch + * Compile on Hurd (patch and testing by Svante Signell, related to + #679330) - -- Simon McVittie Fri, 14 Sep 2012 07:52:53 +0100 + -- Simon McVittie Thu, 05 Jul 2012 08:57:58 +0100 openarena (0.8.8-5) unstable; urgency=low diff -Nru openarena-0.8.8/debian/control openarena-0.8.8/debian/control --- openarena-0.8.8/debian/control 2012-12-07 09:40:25.000000000 +0000 +++ openarena-0.8.8/debian/control 2013-05-12 10:36:45.000000000 +0000 @@ -16,7 +16,7 @@ Homepage: http://openarena.ws/ Package: openarena -Architecture: any +Architecture: linux-any kfreebsd-any hurd-any Depends: ${misc:Depends}, ${shlibs:Depends}, ioquake3 (>= 1.36+svn2224-3~), openarena-081-maps, @@ -38,7 +38,7 @@ This package installs the OpenArena client. Package: openarena-server -Architecture: any +Architecture: linux-any kfreebsd-any hurd-any Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, ioquake3-server (>= 1.36+svn2224-3~), @@ -61,7 +61,7 @@ Package: openarena-dbg Section: debug Priority: extra -Architecture: any +Architecture: linux-any kfreebsd-any hurd-any Depends: openarena (= ${binary:Version}) | openarena-server (= ${binary:Version}), ${misc:Depends} Recommends: ioquake3-dbg diff -Nru openarena-0.8.8/debian/link-modules.sh openarena-0.8.8/debian/link-modules.sh --- openarena-0.8.8/debian/link-modules.sh 1970-01-01 00:00:00.000000000 +0000 +++ openarena-0.8.8/debian/link-modules.sh 2013-05-12 10:36:45.000000000 +0000 @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +cd debian/tmp/usr/lib/openarena + +arch="$1" + +case "$arch" in + (x86) + compat=i386 + ;; + (i386) + compat=x86 + ;; + (alpha) + compat=axp + ;; + (axp) + compat=alpha + ;; +esac + +if test -n "$compat"; then + for module in baseoa/*${arch}.so baseoa/pak*/*${arch}.so missionpack/*${arch}.so; do + ln -s ${module##*/} ${module%${arch}.so}${compat}.so + done +fi diff -Nru openarena-0.8.8/debian/patches/openarena_hurd_support.patch openarena-0.8.8/debian/patches/openarena_hurd_support.patch --- openarena-0.8.8/debian/patches/openarena_hurd_support.patch 1970-01-01 00:00:00.000000000 +0000 +++ openarena-0.8.8/debian/patches/openarena_hurd_support.patch 2013-05-12 10:36:45.000000000 +0000 @@ -0,0 +1,26 @@ +From: Svante Signell +Subject: Add support for the GNU/Hurd architecture + +Origin: vendor, Debian +Bug-Debian: http://bugs.debian.org/679330 + +--- openarena-0.8.8/code/qcommon/q_platform.h 2012-06-29 16:56:11.000000000 +0200 ++++ openarena-0.8.8.new/code/qcommon/q_platform.h 2012-06-28 19:21:44.000000000 +0200 +@@ -147,7 +147,7 @@ + + //================================================================= LINUX === + +-#if defined(__linux__) || defined(__FreeBSD_kernel__) ++#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__GNU__) + + #include + +@@ -210,6 +210,8 @@ + #define OS_STRING "freebsd" + #elif defined(__OpenBSD__) + #define OS_STRING "openbsd" ++#elif defined(__GNU__) ++#define OS_STRING "GNU" + #elif defined(__NetBSD__) + #define OS_STRING "netbsd" + #endif diff -Nru openarena-0.8.8/debian/patches/series openarena-0.8.8/debian/patches/series --- openarena-0.8.8/debian/patches/series 2012-12-07 09:40:25.000000000 +0000 +++ openarena-0.8.8/debian/patches/series 2013-05-12 10:36:45.000000000 +0000 @@ -3,3 +3,4 @@ 0003-Request-confirmation-if-a-user-enables-auto-download.patch 0031-Fix-FTBFS-on-kFreeBSD.patch 0040-Add-OPENARENA_081_COMPATIBLE-define-for-network-comp.patch +openarena_hurd_support.patch diff -Nru openarena-0.8.8/debian/rules openarena-0.8.8/debian/rules --- openarena-0.8.8/debian/rules 2012-12-07 09:40:25.000000000 +0000 +++ openarena-0.8.8/debian/rules 2013-05-12 10:36:45.000000000 +0000 @@ -102,6 +102,7 @@ install -m644 build/release-$(Q3PLATFORM)-$(Q3ARCH)/missionpack/*.so\ debian/tmp/usr/lib/openarena-server/missionpack/ convert -scale 32x32 debian/openarena128.png debian/openarena32.xpm + sh debian/link-modules.sh $(Q3ARCH) override_dh_strip: dh_strip --dbg-package=openarena-dbg diff -Nru openarena-0.8.8/debian/watch openarena-0.8.8/debian/watch --- openarena-0.8.8/debian/watch 2012-12-07 09:40:25.000000000 +0000 +++ openarena-0.8.8/debian/watch 2013-05-12 10:36:45.000000000 +0000 @@ -1,3 +1,4 @@ -# Upstream releases are available from http://www.openarena.ws/download.php -# but that page isn't really susceptible to uscan, so this watch file -# does nothing. +version=3 +http://qa.debian.org/cgi-bin/fakeupstream.cgi?package=openarena .*=openarena-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)|unknown\.suffix) +# only useful for tracking the version, not for downloading the upstream tarball +# Bart Martens Sun, 20 Jan 2013 07:04:24 +0000