This is an automated email from the git hooks/post-receive script. anbe pushed a commit to branch master in repository uqm.
commit ad7f31489630ac715078d58703a9a67a4b31275d Author: Andreas Beckmann <[email protected]> Date: Thu Apr 7 15:26:03 2016 +0200 Imported Upstream version 0.6.2.dfsg --- debian/README.source | 2 - debian/changelog | 210 ---------------------------------------- debian/compat | 1 - debian/config.state | 13 --- debian/control | 28 ------ debian/copyright | 21 ---- debian/menu | 4 - debian/rules | 58 ----------- debian/uqm.desktop | 23 ----- debian/uqm.xpm | 138 -------------------------- debian/watch | 2 - sc2/build.sh | 2 +- sc2/build.vars.in | 8 +- sc2/src/options.c | 6 +- sc2/src/sc2code/libs/platform.h | 2 +- uqm.6 | 133 ------------------------- 16 files changed, 7 insertions(+), 644 deletions(-) diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 5326dc9..0000000 --- a/debian/README.source +++ /dev/null @@ -1,2 +0,0 @@ -The original upstream source tarball has been repacked for Debian, removing -the sc2/doc directory, which contains non-free files. diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 077c139..0000000 --- a/debian/changelog +++ /dev/null @@ -1,210 +0,0 @@ -uqm (0.6.2.dfsg-9) unstable; urgency=low - - * Added .desktop file, closes: #452650, - thanks "Emmet Hikory" <[email protected]> - * GIT-repo has been created in git.debian.org. - * Added VCS-* records to debian/control. - * Added icon to debian's menu. - - -- Dmitry E. Oboukhov <[email protected]> Mon, 02 Feb 2009 12:38:13 +0300 - -uqm (0.6.2.dfsg-8) unstable; urgency=low - - * New maintainer, closes: #487476. - * Standards-Version bumped to 3.8.0. - * Obsolete package `libglu1-xorg-dev' has been removed from build-depends. - * README.Debian has been removed (uqm-music/voice uploaded to non-free). - - -- Dmitry E. Oboukhov <[email protected]> Mon, 23 Jun 2008 18:27:47 +0400 - -uqm (0.6.2.dfsg-7) unstable; urgency=low - - * Orphaned the package. - - -- Joey Hess <[email protected]> Sat, 21 Jun 2008 22:04:57 -0400 - -uqm (0.6.2.dfsg-6) unstable; urgency=low - - * Add Homepage field. - * Update copyright file to new format. - * Fix man page whatis entry. - - -- Joey Hess <[email protected]> Sat, 19 Apr 2008 16:54:22 -0400 - -uqm (0.6.2.dfsg-5) unstable; urgency=low - - * The patch applied in -3 was broken, since uio_MOUNT_TOP is not the inverse - of uio_MOUNT_BELOW. The correct thing to use is uio_MOUNT_ABOVE. This - fixes support for zipped addons. Closes: #437612 - - -- Joey Hess <[email protected]> Mon, 13 Aug 2007 14:09:09 -0400 - -uqm (0.6.2.dfsg-4) unstable; urgency=low - - * Update to new menu policy and de-hardcode path in menu file. - Closes: #432135 - - -- Joey Hess <[email protected]> Sun, 08 Jul 2007 16:36:56 -0400 - -uqm (0.6.2.dfsg-3) unstable; urgency=low - - * Since the debian packages ship content uncompressed from the zip files to - save 2x the space in the packages, support add-on zips by making files - from zips override unpacked files. The default behavior is the other way - around. Closes: #425524 Thanks, Emmet Hikory. - - -- Joey Hess <[email protected]> Tue, 22 May 2007 13:55:14 -0400 - -uqm (0.6.2.dfsg-2) unstable; urgency=low - - * Add replaces on uqm-content due to moved file. Closes: #415348 - - -- Joey Hess <[email protected]> Sun, 18 Mar 2007 15:32:52 -0400 - -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 <[email protected]> Thu, 25 Jan 2007 20:25:27 -0500 - -uqm (0.6.2-1) unstable; urgency=low - - * New upstream release. - - -- Joey Hess <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Wed, 18 Jun 2003 20:08:35 -0400 - -uqm (0.2-1) unstable; urgency=low - - * Initial Release (closes: #171314). - - -- Wesley W. Terpstra (Debian) <[email protected]> Sat, 5 Apr 2003 23:48:59 +0200 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index b8626c4..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/debian/config.state b/debian/config.state deleted file mode 100644 index 11482cf..0000000 --- a/debian/config.state +++ /dev/null @@ -1,13 +0,0 @@ -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' diff --git a/debian/control b/debian/control deleted file mode 100644 index bd61ad5..0000000 --- a/debian/control +++ /dev/null @@ -1,28 +0,0 @@ -Source: uqm -Section: contrib/games -Priority: optional -Maintainer: Dmitry E. Oboukhov <[email protected]> -Build-Depends: debhelper (>> 4.0.8), libogg-dev, libvorbis-dev, libsdl-image1.2-dev, libsdl1.2-dev, libz-dev, libmikmod2-dev -Standards-Version: 3.8.0 -Homepage: http://sc2.sourceforge.net/ -VCS-Browser: http://git.debian.org/?p=collab-maint/uqm.git;a=summary -VCS-Git: git://git.debian.org/collab-maint/uqm.git - -Package: uqm -Architecture: any -Depends: ${shlibs:Depends}, uqm-content (>= 0.6.0) -Replaces: uqm-content -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. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 543f674..0000000 --- a/debian/copyright +++ /dev/null @@ -1,21 +0,0 @@ -This package was debianized by Wesley W. Terpstra <[email protected]> -and is currently maintained by Joey Hess <[email protected]>. - -It was downloaded from http://sc2.sourceforge.net/downloads.php - -Files: * -Copyright: (C) 1992, 2002 Toys for Bob, Inc. -License: GPL-2+ - The full text of the GPL is distributed in /usr/share/common-licenses/GPL-2 - on Debian systems. - -Files: sc2/doc/* -Copyright: -License: other - 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 Attribution 2.0 license is not DFSG free. diff --git a/debian/menu b/debian/menu deleted file mode 100644 index 6b0a707..0000000 --- a/debian/menu +++ /dev/null @@ -1,4 +0,0 @@ -?package(uqm):needs="x11" section="Games/Action" \ - title="Ur-Quan Masters" \ - command="uqm" \ - icon="/usr/share/games/uqm.xpm" diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 212efc0..0000000 --- a/debian/rules +++ /dev/null @@ -1,58 +0,0 @@ -#!/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 - install -m 0644 debian/uqm.xpm ${CURDIR}/debian/uqm/usr/share/games - install -m 0755 -d ${CURDIR}/debian/uqm/usr/share/applications/ - install -m 0644 debian/uqm.desktop \ - ${CURDIR}/debian/uqm/usr/share/applications/ - -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_desktop - 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 diff --git a/debian/uqm.desktop b/debian/uqm.desktop deleted file mode 100644 index 5db4cae..0000000 --- a/debian/uqm.desktop +++ /dev/null @@ -1,23 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=The Ur-Quan Masters -Name[de]=Der Ur-Quan Dominanz -Name[en]=The Ur-Quan Masters -Name[es]=Los Amos Ur-Quan -Name[fi]=Ur-Quan Mastersiin -Name[fr]=Les Seigneurs Ur-Quan -Name[it]=I Dominatori Ur-Quan -Name[ru]=Ур-Кванские Хозяева -Comment=An interstellar adventure game -Comment[de]=Ein interstellar Abenteuerspiel -Comment[en]=An interstellar adventure game -Comment[es]=Una aventura interestelar -Comment[fr]=Une aventure interstellaire -Exec=uqm -Icon=uqm -StartupNotify=true -Terminal=false -Type=Application -Categories=Game;ArcadeGame; -GenericName[en_US]= diff --git a/debian/uqm.xpm b/debian/uqm.xpm deleted file mode 100644 index fb472c6..0000000 --- a/debian/uqm.xpm +++ /dev/null @@ -1,138 +0,0 @@ -/* XPM */ -static char *ur-quan-icon-std-3[] = { -/* columns rows colors chars-per-pixel */ -"32 32 100 2", -" c black", -". c #0D350C", -"X c #0B390B", -"o c #142F12", -"O c #1E2713", -"+ c #2F1D16", -"@ c #3E1B0F", -"# c #3D1A10", -"$ c #2B251D", -"% c #342111", -"& c #2C2D24", -"* c #2F3026", -"= c #32342B", -"- c #373732", -"; c #3B3D39", -": c #064A06", -"> c #044E04", -", c #084108", -"< c #035802", -"1 c #036202", -"2 c #036D02", -"3 c #027802", -"4 c #3D413C", -"5 c #3E433E", -"6 c #414540", -"7 c #434843", -"8 c #484D47", -"9 c #4F544E", -"0 c #595C55", -"q c #605C5A", -"w c #695A5E", -"e c #7F5567", -"r c #038303", -"t c #018A01", -"y c #029100", -"u c #019800", -"i c #009B00", -"p c #009E00", -"a c #00A200", -"s c #00A800", -"d c #00AE00", -"f c #01B200", -"g c #01B700", -"h c #01BB00", -"j c #00BE00", -"k c #33B70D", -"l c #00C300", -"z c #00C600", -"x c #01C701", -"c c #00CA00", -"v c #00D000", -"b c #00D400", -"n c #00D800", -"m c #00DE00", -"M c #1FCB10", -"N c #18D40F", -"B c #00E100", -"V c #00E500", -"C c #00EC00", -"Z c #0EE30B", -"A c #01F101", -"S c #03F102", -"D c #01F401", -"F c #29C010", -"G c #40B110", -"H c #4FB114", -"J c #5CAA0D", -"K c #5AAE13", -"L c #61A90D", -"P c #CB4002", -"I c #CE4102", -"U c #CC4902", -"Y c #DA4703", -"T c #DC4C03", -"R c #DC4F04", -"E c #DE5306", -"W c #DE6D02", -"Q c #E15C0A", -"! c #E47D01", -"~ c #E6793C", -"^ c #A5BA7F", -"/ c #B8E332", -"( c #BDE438", -") c #EC9101", -"_ c #EC9C01", -"` c #E7A601", -"' c #EBB601", -"] c #ECBC02", -"[ c #CFD41A", -"{ c #DFC809", -"} c #C7E742", -"| c #D4E84C", -" . c #D7E755", -".. c #D5E55B", -"X. c #9BAC93", -"o. c #99AB98", -"O. c #9EB589", -"+. c #D1D0D5", -"@. c #D3D1D7", -"#. c None", -/* pixels */ -"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.", -"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.", -"#.#.#.#.#.#.#.#.#.#.#.# + #.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.", -"#.#.#.#.#.#.#.#.#.; * Q Y = #.#.o > < < < < < > < % = #.#.#.#.#.", -"#.#.#.#.#.#.#.#.6 = 9 ~ ' Y + X u a L L L L L d d U P 6 #.#.#.#.", -"#.#.#.#.#.#.#.5 . 2 q o.O.Q % , y p J ) ) ` { [ h a L P #.#.#.#.", -"#.#.#.#.#.#.& : 2 p M [email protected] = . 2 p a d d d K .} F x W @ 5 #.#.", -"#.#.#.#.#.o > 3 u c V l 5 4 #.o 1 u d v c c x ( ..| N j y o #.#.", -"#.#.#.#.* > 3 u l B h > - #.#.o 2 p s b n n n c ( ..| M p o #.#.", -"#.#.#.- , r p c n s : 5 #.#.5 : u p d b v c v b c / ./ u O #.#.", -"#.#.#.o 3 f n N 8 o 6 #.#.7 3 a p a j n v x x l c x K ( p O #.#.", -"#.#.5 < a n N w q ; & #.#.> a u a h b m c l x j c l H ( a O #.#.", -"#.#.& t v n t w w 9 & $ > u p s j v n x j j x l c x H ( a O #.#.", -"#.#.1 n n 3 O $ 5 0 5 y a p d c v c j h x b V C C C Z / p O #.#.", -"#.#.2 m y $ #.#.* 5 y k p d c b k M x l b V D D D D D D y $ #.#.", -"#.#.< r O #.#.#.= 3 a 9 0 k k H X.M c b C D V u y g j s , 8 #.#.", -"#.#.o = #.#.#.& t a a j J ) ) J x c n A D A > O $ O . $ #.#.#.#.", -"#.#.#.#.#.#.& < u a f x J _ _ ) x v C D C > 7 #.#.- @ % #.#.#.#.", -"#.#.#.X 1 > < < t f c x J ) ) J b C D V , 7 #.#.; # Y P $ #.#.#.", -"#.#.#.# J d s p y h m X.H k k H O.Z d o #.#.#.& & 0 e _ P # #.#.", -"#.#.#.# U G a h x y v M x v B D k N 4 $ #.#.= > 3 8 X.O.Y @ #.#.", -"#.#.#.O P ] F c c d t v m n D D Z q q 5 $ & X 3 p l O.+.; ; #.#.", -"#.#.#.#.@ Y ] L x c h y h Z D t O 8 w 8 ; o 3 s v m k 5 #.#.#.#.", -"#.#.#.#.#.@ ! ] L x b m t k r - #.- 8 0 7 2 a b B h > #.#.#.#.#.", -"#.#.#.#.#.7 @ ) ] Z B A b . 6 #.#.#.O 9 3 p c B f : #.#.#.#.#.#.", -"#.#.#.#.#.#.8 @ Y ` k Z N & #.#.#.& < r a c n u , #.#.#.#.#.#.#.", -"#.#.#.#.#.#.#.#.+ P R K N * #.#.. < t h m m u O #.#.#.#.#.#.#.#.", -"#.#.#.#.#.#.#.#.#.+ @ @ r = #.. 1 t f j d 2 o #.#.#.#.#.#.#.#.#.", -"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.. : 1 : X * = #.#.#.#.#.#.#.#.#.#.", -"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.", -"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.", -"#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#.#." -}; diff --git a/debian/watch b/debian/watch deleted file mode 100644 index fb4676b..0000000 --- a/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=2 -opts="dversionmangle=s/.dfsg//" http://qa.debian.org/watch/sf.php/sc2/ uqm-(.*)-source.tgz diff --git a/sc2/build.sh b/sc2/build.sh index e450d6f..51d2f1c 100755 --- a/sc2/build.sh +++ b/sc2/build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Build helper # Copyright (c) 2002 Serge van den Boom # diff --git a/sc2/build.vars.in b/sc2/build.vars.in index 316edbd..c0c9d32 100644 --- a/sc2/build.vars.in +++ b/sc2/build.vars.in @@ -29,11 +29,11 @@ ECHON='@ECHON@' SED='@SED@' REZ='@REZ@' WINDRES='@WINDRES@' -uqm_CFLAGS='@CFLAGS@ -g' +uqm_CFLAGS='@CFLAGS@' uqm_LDFLAGS='@LDFLAGS@' -uqm_INSTALL_BINDIR=$DESTDIR'@INSTALL_BINDIR@' -uqm_INSTALL_LIBDIR=$DESTDIR'@INSTALL_LIBDIR@' -uqm_INSTALL_SHAREDIR=$DESTDIR'@INSTALL_SHAREDIR@' +uqm_INSTALL_BINDIR='@INSTALL_BINDIR@' +uqm_INSTALL_LIBDIR='@INSTALL_LIBDIR@' +uqm_INSTALL_SHAREDIR='@INSTALL_SHAREDIR@' # Exported variables are available from all the Makeinfo files # Non-exported files only where build.vars is explicitely included. diff --git a/sc2/src/options.c b/sc2/src/options.c index 71716fe..8891856 100644 --- a/sc2/src/options.c +++ b/sc2/src/options.c @@ -393,11 +393,7 @@ mountDirZips (uio_MountHandle *contentHandle, uio_DirHandle *dirHandle) { if (uio_mountDir (repository, "/", uio_FSTYPE_ZIP, dirHandle, dirList->names[i], "/", autoMount, - /* since the debian package ships - * unpacked files, let zip files - * override them, instead of the - * other way around */ - uio_MOUNT_ABOVE | uio_MOUNT_RDONLY, + uio_MOUNT_BELOW | uio_MOUNT_RDONLY, contentHandle) == NULL) { log_add (log_Error, "Warning: Could not mount '%s': %s.", diff --git a/sc2/src/sc2code/libs/platform.h b/sc2/src/sc2code/libs/platform.h index 72c0151..8ab6919 100644 --- a/sc2/src/sc2code/libs/platform.h +++ b/sc2/src/sc2code/libs/platform.h @@ -18,7 +18,7 @@ #define PLATFORM_H_ #if defined(USE_PLATFORM_ACCEL) -# if defined(__GNUC__) && (defined(i386)) +# if defined(__GNUC__) && (defined(i386) || defined(__x86_64__)) # define MMX_ASM # define GCC_ASM # elif (_MSC_VER >= 1100) && defined(_M_IX86) diff --git a/uqm.6 b/uqm.6 deleted file mode 100644 index 86c368d..0000000 --- a/uqm.6 +++ /dev/null @@ -1,133 +0,0 @@ -.TH UR-QUAN\ MASTERS 6 2004-03-07 -.SH NAME -uqm \- 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. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/uqm.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
