--- uqm-0.6.2.dfsg.orig/sc2/src/sc2code/libs/platform.h +++ uqm-0.6.2.dfsg/sc2/src/sc2code/libs/platform.h @@ -18,7 +18,7 @@ #define PLATFORM_H_ #if defined(USE_PLATFORM_ACCEL) -# if defined(__GNUC__) && (defined(i386) || defined(__x86_64__)) +# if defined(__GNUC__) && (defined(i386)) # define MMX_ASM # define GCC_ASM # elif (_MSC_VER >= 1100) && defined(_M_IX86) --- uqm-0.6.2.dfsg.orig/sc2/build.sh +++ uqm-0.6.2.dfsg/sc2/build.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Build helper # Copyright (c) 2002 Serge van den Boom # --- uqm-0.6.2.dfsg.orig/sc2/build.vars.in +++ uqm-0.6.2.dfsg/sc2/build.vars.in @@ -29,11 +29,11 @@ SED='@SED@' REZ='@REZ@' WINDRES='@WINDRES@' -uqm_CFLAGS='@CFLAGS@' +uqm_CFLAGS='@CFLAGS@ -g' uqm_LDFLAGS='@LDFLAGS@' -uqm_INSTALL_BINDIR='@INSTALL_BINDIR@' -uqm_INSTALL_LIBDIR='@INSTALL_LIBDIR@' -uqm_INSTALL_SHAREDIR='@INSTALL_SHAREDIR@' +uqm_INSTALL_BINDIR=$DESTDIR'@INSTALL_BINDIR@' +uqm_INSTALL_LIBDIR=$DESTDIR'@INSTALL_LIBDIR@' +uqm_INSTALL_SHAREDIR=$DESTDIR'@INSTALL_SHAREDIR@' # Exported variables are available from all the Makeinfo files # Non-exported files only where build.vars is explicitely included. --- uqm-0.6.2.dfsg.orig/debian/rules +++ uqm-0.6.2.dfsg/debian/rules @@ -0,0 +1,53 @@ +#!/usr/bin/make -f + +configure: configure-stamp +configure-stamp: + dh_testdir + cp debian/config.state sc2 + echo | (cd sc2 && ./build.sh uqm config) + touch configure-stamp + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + cd sc2 && ./build.sh uqm + touch build-stamp + +clean: + dh_testdir + dh_testroot + cd sc2 && ./build.sh uqm clean + rm -rf sc2/obj sc2/uqm + dh_clean sc2/config.status build-stamp configure-stamp sc2/build.vars \ + sc2/build/unix/uqm sc2/uqm-wrapper + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs usr/games usr/share/games + cd sc2 && DESTDIR=${CURDIR}/debian/uqm ./build.sh uqm install + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs sc2/ChangeLog + dh_installdocs sc2/AUTHORS sc2/README sc2/BUGS \ + sc2/WhatsNew sc2/Contributing + dh_installman uqm.6 + dh_installmenu + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- uqm-0.6.2.dfsg.orig/debian/menu +++ uqm-0.6.2.dfsg/debian/menu @@ -0,0 +1,2 @@ +?package(uqm):needs="x11" section="Games/Arcade" \ + title="Ur-Quan Masters" command="/usr/games/uqm" --- uqm-0.6.2.dfsg.orig/debian/README.Debian +++ uqm-0.6.2.dfsg/debian/README.Debian @@ -0,0 +1,31 @@ +To play the game you need at least the uqm and uqm-content packages. +Those packages are included in the Debian archive. + +You can optionally install the uqm-music package, which adds better quality +music, and the uqm-voice package, which adds full dialog support to the +game. Be warned that the uqm-voice package is over 100Mb! Since these +packages are large, and until Debian gets a 'data' section, they are +currently not available in the Debian archive. + +Instead, there is an apt repository at uqm.debian.net that has these +packages in it. It is maintained by the same person who maintains the uqm +packages in Debian. To use the apt repository, add this line to your +/etc/apt/sources.list: + + deb http://uqm.debian.net/ unstable/ + +A mirror is also available thanks to Tollef Fog Heen (updated daily): + + deb http://mirror.err.no/uqm/ unstable/ + +Replace the "unstable" with whatever version of Debian you are using, be it +"testing" or "stable" to get packages that match the uqm package in Debian. + +Add the repository's key to your apt keyring: + +wget -O - http://uqm.debian.net/key.gpg | sudo apt-key add - + +Then run apt-get update, and you may apt-get install uqm-music and +uqm-voice. + + -- Joey Hess --- uqm-0.6.2.dfsg.orig/debian/changelog +++ uqm-0.6.2.dfsg/debian/changelog @@ -0,0 +1,147 @@ +uqm (0.6.2.dfsg-1) unstable; urgency=low + + * Forgot to remove the CC licensed docs from 0.6.2. Repackage the upstream + tarball, and tack on a "dfsg" to the version so I won't forget this in the + future. + + -- Joey Hess Thu, 25 Jan 2007 20:25:27 -0500 + +uqm (0.6.2-1) unstable; urgency=low + + * New upstream release. + + -- Joey Hess Thu, 25 Jan 2007 04:47:05 -0500 + +uqm (0.6.1-2) unstable; urgency=low + + * Add -g to CFLAGS. + * Pull fix from svn for a crasher when saving a game. Closes: #406777 + + -- Joey Hess Sat, 13 Jan 2007 19:44:08 -0500 + +uqm (0.6.1-1) unstable; urgency=low + + * New upstream release. Closes: #404152 + - Featuring networked Super Melee! + - Now usable on 64 bit systems. Closes: #350129 + * Now needs a build dep on libmikmod2-dev. + * In this version, documentation, excluding documentation that is + "part of the code or otherwise clearly governed" by the license of the + code, is licensed under the Creative Commons Attribution 2.0 license. + Since that license is not DFSG free, this documentation has been stripped + from the source tarball. I'm considering the README, changelog, etc, to + be clearly part of the code, but docs in sc2/doc/devel and sc2/doc/users + (including the manual) are not, and thus appear to be licensed under the CC + license now, and are removed. + * Removed text in the man page that was originally copied from the manual. + Sigh. + * Updated the man page to document new options. + + -- Joey Hess Wed, 10 Jan 2007 02:33:57 -0500 + +uqm (0.5.0-3) unstable; urgency=low + + * Remove CVS directories in clean, they're in the upstream tarball + and leaked into the deb. Closes: #400614 + * Update FSF address in copyright file. + * Current policy. + + -- Joey Hess Mon, 27 Nov 2006 15:46:14 -0500 + +uqm (0.5.0-2) unstable; urgency=low + + * Patch from Andreas Jochens to fix amd64 FTBFS. Closes: #352588 + + -- Joey Hess Tue, 28 Feb 2006 11:55:00 -0800 + +uqm (0.5.0-1) unstable; urgency=low + + * New upstream release with many improvements and features. + * Depends on uqm-content version 0.5.0. + * uqm-voice is not changed at all from 0.4.0 and will not be updated. + * uqm-music has a minor change that is not worth changing the version in the + Recommends. + * Switch watch file to sf redirector. + * Build dep update. + * Policy update. + * Document new hq scaler and consetallation search key in man page + and make many other updates to the man page. + * Add info to README.Debian about where to get the uqm.debian.net repo key. + + -- Joey Hess Tue, 7 Feb 2006 12:40:38 -0500 + +uqm (0.4.0-1) unstable; urgency=low + + * New upstream release. Closes: #311408 + * Removed obsolete bits from README.Debian. + * Actually install the man page. + * Increase versioned relationships to 0.4.0 versions, although I think + old uqm-voice will work ok, so I've not added conflicts for old versions + of that, and the old uqm-music is certianly ok. + * Switch mirror url to preferred err.no. + + -- Joey Hess Wed, 1 Jun 2005 22:27:58 -0400 + +uqm (0.3-3) unstable; urgency=low + + * Patch from Andreas Jochens to fix static prototypes and other problems + so it will build with gcc 4.0. Closes: #298335 + * Document in README.Debian some unfinished things. + Closes: #204689, #204713, #231993 + + -- Joey Hess Sat, 9 Apr 2005 17:07:28 -0400 + +uqm (0.3-2) unstable; urgency=low + + * Add a man page, contributed by Jeronimo Pellegrini. Closes: #236612 + + -- Joey Hess Sun, 7 Mar 2004 08:10:44 -0900 + +uqm (0.3-1) unstable; urgency=low + + * New upstream release. Closes: #210476 + - Should work on powerpc. Closes: #205910 + - With a different, presumably better fix for bug #200975 + * Moved uqm binary out of /usr/share. + * Depends on new version of content package. + * Build-depends on libz-dev, so the binary can have support for .zip files. + I'm not using this for the content, but it may be useful for addons. + * Added a watch file. + + -- Joey Hess Fri, 12 Sep 2003 00:00:49 -0400 + +uqm (0.2-4) unstable; urgency=low + + * Switch mixSDL_Object over to a long int, which makes it big enough to + also contain a 64 bit pointer. This is probably not the best approach, + but it'll compile now on ia64. Closes: #200975 + + -- Joey Hess Sun, 20 Jul 2003 01:08:14 +0200 + +uqm (0.2-3) unstable; urgency=low + + * Added a menu file. + * Added Contributing and WhatsNew to binary package. + + -- Joey Hess Tue, 1 Jul 2003 22:41:32 -0400 + +uqm (0.2-2) unstable; urgency=low + + * Taking over the package to get it into Debian. + * Removed the uqm-all package. As it depends on packages that will not be + in the main Debian archive, it's not useful and indeed was blocking + uqm from being accepted. + * Added a pointer to README.Debian about the uqm.debian.net apt repository. + * Minor rules file changes. + * Update copyright, control files. + * Don't include empty NEWS file. + * Mention Star Control II in the package description, and also super melee. + * build/unix/build.sh has bashisms, so always run it using bash. + + -- Joey Hess Wed, 18 Jun 2003 20:08:35 -0400 + +uqm (0.2-1) unstable; urgency=low + + * Initial Release (closes: #171314). + + -- Wesley W. Terpstra (Debian) Sat, 5 Apr 2003 23:48:59 +0200 --- uqm-0.6.2.dfsg.orig/debian/compat +++ uqm-0.6.2.dfsg/debian/compat @@ -0,0 +1 @@ +4 --- uqm-0.6.2.dfsg.orig/debian/config.state +++ uqm-0.6.2.dfsg/debian/config.state @@ -0,0 +1,13 @@ +CHOICE_debug_VALUE='nodebug' +CHOICE_graphics_VALUE='opengl' +CHOICE_sound_VALUE='mixsdl' +CHOICE_mikmod_VALUE='external' +CHOICE_ovcodec_VALUE='standard' +CHOICE_netplay_VALUE='full' +CHOICE_joystick_VALUE='enabled' +CHOICE_ioformat_VALUE='stdio_zip' +CHOICE_accel_VALUE='asm' +INPUT_install_prefix_VALUE='/' +INPUT_install_bindir_VALUE='/usr/games' +INPUT_install_sharedir_VALUE='/usr/share/games' +INPUT_install_libdir_VALUE='/usr/lib/games' --- uqm-0.6.2.dfsg.orig/debian/control +++ uqm-0.6.2.dfsg/debian/control @@ -0,0 +1,25 @@ +Source: uqm +Section: contrib/games +Priority: optional +Maintainer: Joey Hess +Build-Depends: debhelper (>> 4.0.8), libogg-dev, libvorbis-dev, libsdl-image1.2-dev, libsdl1.2-dev, libglu1-xorg-dev, libz-dev, libmikmod2-dev +Standards-Version: 3.7.2 +XS-Vcs-Svn: svn://svn.kitenet.net/uqm/trunk/uqm + +Package: uqm +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, uqm-content (>= 0.6.0) +Recommends: uqm-music (>= 0.4) +Suggests: uqm-voice (>= 0.4) +Description: The Ur-Quan Masters - An inter-galatic adventure game + You return to Earth with a vessel built from technology discovered from an + ancient race called the Precursors only to find it enslaved. Gather allies + from a wide variety of races, engage in space combat with various foes, and + save the galaxy from the Ur-Quan! + . + The Ur-Quan Masters is derived from the classic game Star Control II. + It includes both the adventure game described above and a fast-paced + Super Melee. + . + See the README.Debian once you have installed this package for information + about where to get the uqm-music and uqm-voice packages. --- uqm-0.6.2.dfsg.orig/debian/copyright +++ uqm-0.6.2.dfsg/debian/copyright @@ -0,0 +1,34 @@ +This package was debianized by Wesley W. Terpstra +and is currently maintained by Joey Hess . + +It was downloaded from http://sc2.sourceforge.net/downloads.php + +Upstream Authors: + See /usr/share/doc/uqm/AUTHORS + There are far too many to list! + +Copyright: /usr/share/common-licenses/GPL + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +The copyright also states that: + + The documentation -- excluding documentation that is part of the + code or otherwise clearly governed by the preceding licenses -- + may be used freely under the terms of the Creative Commons + Attribution 2.0 license + +Said documentation has been removed from the Debian version of this package, +as the CC license is not DFSG free. --- uqm-0.6.2.dfsg.orig/debian/watch +++ uqm-0.6.2.dfsg/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://qa.debian.org/watch/sf.php/sc2/ uqm-(.*)-source.tgz --- uqm-0.6.2.dfsg.orig/debian/README.source +++ uqm-0.6.2.dfsg/debian/README.source @@ -0,0 +1,2 @@ +The original upstream source tarball has been repacked for Debian, removing +the sc2/doc directory, which contains non-free files. --- uqm-0.6.2.dfsg.orig/uqm.6 +++ uqm-0.6.2.dfsg/uqm.6 @@ -0,0 +1,133 @@ +.TH UR-QUAN\ MASTERS 6 2004-03-07 +.SH NAME +Ur-Quan Masters +.SH SYNOPSIS +.B uqm +.RB [ options ] +.SH DESCRIPTION +The Ur-Quan Masters is a 2D inter-galatic adventure game. +You return to Earth with a vessel built from technology discovered from an +ancient race called the Precursors only to find it enslaved. Gather allies +from a wide variety of races, engage in space combat with various foes, and +save the galaxy from the Ur-Quan! +.SH OPTIONS +Valid command line options: +.TP +.B \-h, \-\-help +Display a help message. +.TP +.B \-r, \-\-res \fIresolution\fR +Sets the screen resolution. Unless \-\-opengl is set, the only valid +values are 640x480 and 320x240. +.TP +.B \-f, \-\-fullscreen +Uses full screen mode. Pretty straightforward. Usually good to +combine with -r 320x240. +.TP +.B \-o, \-\-opengl +Use OpenGL drivers. This produces higher-quality graphics, and may be +faster as well -- but it also may not work on older cards. +.TP +.B \-c, \-\-scale=\fImode\fR +Graphics scaling mode (linear, biadapt, biadv, triscan, hq). Default is none. +Try these to get smoother graphics with cost on performance. +.TP +.B \-b, \-\-meleezoom=\fImode\fR +Melee scaling mode (step, aka pc, or smooth, aka 3do). Default is 3do. +Slower machine owners can set it to nearest to get better performance +in melee but degraded visual quality. +.TP +.B \-s, \-\-scanlines +Simulates interlaced displays. +.TP +.B \-p, \-\-fps +Print fps information in the status window. +.TP +.B \-g, \-\-gamma \fIvalue\fR +Sets gamma correction. 1.0 causes no change (unless your graphics card +is originally set to a different value). Higher than 1.0 makes the +image brighter, lower than 1.0 makes it darker. +.TP +.B \-C. \-\-configdir \fIdirectory\fR +Set the directory where the game will seek its configuration files. +.TP +.B \-n, \-\-contentdir \fIdirectory\fR +Set the directory where the game will seek its data. +.TP +.B \-M, \-\-musicvol \fIvolume\fR +Set music volume (0-100). +.TP +.B \-S, \-\-sfxvol \fIvolume\fR +Set sound effects volume (0-100). +.TP +.B \-T, \-\-speechvol \fIvolume\fR +Set speech volume (0-100). If set to 0, game runs in 'no speech' mode and +oscilloscope reacts to the music. +.TP +.B \-q, \-\-audioquality high | medium | low +Specifies how nice the audio sounds. Slower machines should lower +the audio quality. +.TP +.B \-u, \-\-nosubtitles +Disables subtitles. +.TP +.B \-l, \-\-logfile \fIfile\fR +Sends console output to a logfile. +.TP +.B \-\-addon \fIaddon\fR +Replace \fIaddon\fR by the name of an add-on to enable in the game. May be +specified multiple times. +.TP +.B \-\-sound openal | mixsdl | none +Specifies which driver/mixer to use. Default is mixsdl. +openal is only available when it has been compiled in. +It may produce higher-quality sound and will probably be faster, +but it is not very stable on linux platforms, and may not work +well with some sound cards. +Use "none" as a last resort if you cannot get other drivers to work, +or if you have no soundcard. +.TP +.B \-\-stereosfx +Enables positional sound effects in melee. Currently works only when +using openal. +.TP +.B \-\-nethostN \fIhostname\fR +Server to connect to for player N (1=bottom, 2=top) +.TP +.B \-\-netportN \fIport\fR +port to connect to/listen on for player N (1=bottom, 2=top) +The default port is 21837. +.TP +.B \-\-netdelay \fIframes\fR +Number of frames to buffer/delay network input for. +.TP +.B \-m, \-\-music 3do | pc +Controls use of the 3DO remixed soundtrack for songs that were in fact remixed. +3DO is the default. +.TP +.B \-i, \-\-intro 3do | pc +Controls the intro/ending version. 3DO is the default. +.TP +.B \-\-cscan pc | 3do +Use either PC (text) or 3DO (pictograms) style planet information when scanning. +The default is PC. +.TP +.B \-\-menu pc | 3do +Use either PC style (text and 'CREW'/'BATT') or 3DO (pictograms) in melee. +The default is PC. +.TP +.B \-\-font pc | 3do +Use either PC or 3DO style fonts and colors. The default is PC. +.TP +.B \-\-shield pc | 3do +Use either PC style (static) or 3DO style (throbbing) slave shield. The +default is PC. +.TP +.B \-\-scroll pc | 3do +Scroll voice-over/subtitles 1 page at a time (PC style) or smoothly (3DO +style) when using left/right arrow keys. The default is PC. +.SH AUTHOR +The Ur-Quan Masters was derived from code +written by Toys for Bob, Inc. for the 3DO version of 'Star Control II', with +their permission and encouragement. +See \fI/usr/share/doc/uqm/AUTHORS.gz\fR for a complete list of authors.