Package: uqm Followup-For: Bug #640881 Tags: patch Hello,
The attached patches update uqm to version 0.7. I tested it on amd64 and everything works fine for me. I'm no UQM expert though and just a casual player. The uqm patchset applies on top the uqm source package after the new version's dfsg-free tarball is used. I didn't send this commit as patch as it's quite big and can easily be downloaded from the UQM website. It also updates the package to use dh short rules and compat 9 and 3.0 quilt as package format and added a few patches to fix some issues I noticed. This also fixes two bugs reported in Debian's bug tracker. The patch debian/patches/memset-fix-transposed-parameters.patch should be sent to upstream. I'm not sure about the commit "debian/uqm.6: Add and install.". I took the man-page from the old tarball assuming you wrote it because it's no longer present in the current uqm tarball. If that isn't correct it might be necessary to drop the commit if the license isn't clear. The uqm-content patch also applies on top of the repackaged version of the upstream media downloads; again not included to save space. Due to upstream changes it's necessary to modify the installation destination of 3do parts of the media (see my patch). Tell me if you want me to upload the repacked orig tarballs somewhere. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9
From a970c0d1fb85fb63cc492439afea3750a561dc22 Mon Sep 17 00:00:00 2001 Message-Id: <a970c0d1fb85fb63cc492439afea3750a561dc22.1370733172.git.si...@ruderich.org> From: Simon Ruderich <[email protected]> Date: Sat, 8 Jun 2013 19:15:34 +0200 Subject: [PATCH 1/4] debian: Update for new release. --- debian/changelog | 13 ++++ debian/compat | 2 +- debian/config.state | 9 +-- debian/control | 2 +- debian/docs | 5 ++ debian/install | 2 + .../patches/build-with-default-optimization.patch | 15 +++++ .../patches/memset-fix-transposed-parameters.patch | 33 ++++++++++ debian/patches/respect-destdir.patch | 31 +++++++++ debian/patches/series | 3 + debian/rules | 69 ++++++-------------- debian/source/format | 1 + 12 files changed, 129 insertions(+), 56 deletions(-) create mode 100644 debian/docs create mode 100644 debian/install create mode 100644 debian/patches/build-with-default-optimization.patch create mode 100644 debian/patches/memset-fix-transposed-parameters.patch create mode 100644 debian/patches/respect-destdir.patch create mode 100644 debian/patches/series create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog index 077c139..a6e75e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +uqm (0.7.0.dfsg-1) UNRELEASED; urgency=low + + * New upstream release 0.7.0, closes: #640881. + * Use short dh rules, update compat to 9. + * Switch to 3.0 quilt package format. + * Install uqm.xpm in the correct location, closes: #680262, #682225. + * Add patches: + - build-with-default-optimization.patch + - memset-fix-transposed-parameters.patch + - respect-destdir.patch + + -- Simon Ruderich <[email protected]> Sat, 08 Jun 2013 16:50:58 +0200 + uqm (0.6.2.dfsg-9) unstable; urgency=low * Added .desktop file, closes: #452650, diff --git a/debian/compat b/debian/compat index b8626c4..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +9 diff --git a/debian/config.state b/debian/config.state index 11482cf..e8d47a5 100644 --- a/debian/config.state +++ b/debian/config.state @@ -7,7 +7,8 @@ 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' +CHOICE_threadlib_VALUE='sdl' +INPUT_install_prefix_VALUE='/usr' +INPUT_install_bindir_VALUE='$prefix/games' +INPUT_install_libdir_VALUE='$prefix/lib/games' +INPUT_install_sharedir_VALUE='$prefix/share/games' diff --git a/debian/control b/debian/control index bd61ad5..fe6b88e 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ 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 +Build-Depends: debhelper (>= 9), 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 diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..55933c1 --- /dev/null +++ b/debian/docs @@ -0,0 +1,5 @@ +AUTHORS +README +BUGS +WhatsNew +Contributing diff --git a/debian/install b/debian/install new file mode 100644 index 0000000..0e1d1cb --- /dev/null +++ b/debian/install @@ -0,0 +1,2 @@ +debian/uqm.xpm usr/share/icons/32x32/apps +debian/uqm.desktop usr/share/applications diff --git a/debian/patches/build-with-default-optimization.patch b/debian/patches/build-with-default-optimization.patch new file mode 100644 index 0000000..60dd906 --- /dev/null +++ b/debian/patches/build-with-default-optimization.patch @@ -0,0 +1,15 @@ +Description: Build with Debian's default optimization flags. +Author: Simon Ruderich <[email protected]> +Last-Update: 2013-06-08 + +--- uqm-0.7.0.dfsg.orig/build/unix/build.config ++++ uqm-0.7.0.dfsg/build/unix/build.config +@@ -117,7 +117,7 @@ uqm_prepare_config() + CFLAGS="$CFLAGS -O3 -DNDEBUG" + ;; + *) +- CFLAGS="$CFLAGS -O3 -DNDEBUG" ++ CFLAGS="$CFLAGS -DNDEBUG" + ;; + esac + DEBUG=0 diff --git a/debian/patches/memset-fix-transposed-parameters.patch b/debian/patches/memset-fix-transposed-parameters.patch new file mode 100644 index 0000000..b7ecf89 --- /dev/null +++ b/debian/patches/memset-fix-transposed-parameters.patch @@ -0,0 +1,33 @@ +Description: Fix transposed parameters to memset(). +Author: Simon Ruderich <[email protected]> +Last-Update: 2013-06-08 + +--- uqm-0.7.0.dfsg.orig/src/libs/sound/decoders/aiffaud.c ++++ uqm-0.7.0.dfsg/src/libs/sound/decoders/aiffaud.c +@@ -307,7 +307,7 @@ aifa_readCommonChunk (TFB_AiffSoundDecod + { + int bytes; + +- memset(fmt, sizeof(*fmt), 0); ++ memset(fmt, 0, sizeof(*fmt)); + if (size < AIFF_COMM_SIZE) + { + aifa->last_error = aifae_BadFile; +@@ -369,7 +369,7 @@ aifa_Open (THIS_PTR, uio_DirHandle *dir, + aifa->max_pcm = 0; + aifa->data_ofs = 0; + memset(&aifa->fmtHdr, 0, sizeof(aifa->fmtHdr)); +- memset(aifa->prev_val, sizeof(aifa->prev_val), 0); ++ memset(aifa->prev_val, 0, sizeof(aifa->prev_val)); + + // read wave header + if (!aifa_readFileHeader (aifa, &fileHdr)) +@@ -635,7 +635,7 @@ aifa_Seek (THIS_PTR, uint32 pcm_pos) + + // reset previous values for SDX2 on seek ops + // the delta will recover faster with reset +- memset(aifa->prev_val, sizeof(aifa->prev_val), 0); ++ memset(aifa->prev_val, 0, sizeof(aifa->prev_val)); + + return pcm_pos; + } diff --git a/debian/patches/respect-destdir.patch b/debian/patches/respect-destdir.patch new file mode 100644 index 0000000..f0073bb --- /dev/null +++ b/debian/patches/respect-destdir.patch @@ -0,0 +1,31 @@ +Description: Respect DESTDIR when installing. +Author: Simon Ruderich <[email protected]> +Forwarded: no +Last-Update: 2013-06-08 + +--- uqm-0.7.0.dfsg.orig/build/unix/build_functions ++++ uqm-0.7.0.dfsg/build/unix/build_functions +@@ -264,6 +264,7 @@ generic_install() { + echo "Installing system-dependent data..." >&2 + eval LIBS="\${${BUILD_PROJECT}_INSTALL_LIBS}" + eval LIBDIR="\${${BUILD_PROJECT}_INSTALL_LIBDIR%/}/" ++ LIBDIR="$DESTDIR$LIBDIR" + mkdirhier "$LIBDIR" 0755 + for LIB in $LIBS; do + eval SRC="\${${BUILD_PROJECT}_INSTALL_LIB_${LIB}_SRC%/}" +@@ -277,6 +278,7 @@ generic_install() { + echo "Installing system-independent data..." >&2 + eval SHARED="\${${BUILD_PROJECT}_INSTALL_SHARED}" + eval SHAREDIR="\${${BUILD_PROJECT}_INSTALL_SHAREDIR%/}/" ++ SHAREDIR="$DESTDIR$SHAREDIR" + mkdirhier "$SHAREDIR" 0755 + for SHARE in $SHARED; do + eval SRC="\${${BUILD_PROJECT}_INSTALL_SHARED_${SHARE}_SRC%/}" +@@ -290,6 +292,7 @@ generic_install() { + echo "Installing binaries..." >&2 + eval BINS="\${${BUILD_PROJECT}_INSTALL_BINS}" + eval BINDIR="\${${BUILD_PROJECT}_INSTALL_BINDIR%/}/" ++ BINDIR="$DESTDIR$BINDIR" + mkdirhier "$BINDIR" 0755 + for BIN in $BINS; do + eval SRC="\${${BUILD_PROJECT}_INSTALL_BIN_${BIN}_SRC%/}" diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..64a7884 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +respect-destdir.patch +build-with-default-optimization.patch +memset-fix-transposed-parameters.patch diff --git a/debian/rules b/debian/rules index 212efc0..1383813 100755 --- a/debian/rules +++ b/debian/rules @@ -1,58 +1,27 @@ #!/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 +export MAKE_VERBOSE=1 -build-stamp: configure-stamp - dh_testdir - cd sc2 && ./build.sh uqm - touch build-stamp +# Build system doesn't respect CPPFLAGS. +export DEB_CFLAGS_MAINT_APPEND := $(shell dpkg-buildflags --get CPPFLAGS) -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 +%: + dh $@ -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/ +override_dh_auto_configure: configure-stamp +configure-stamp: + cp debian/config.state ${CURDIR} + ./build.sh uqm reprocess_config + touch configure-stamp -binary-indep: build install +override_dh_auto_build: build-stamp +build-stamp: configure-stamp + ./build.sh uqm -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 +override_dh_auto_install: + DESTDIR=${CURDIR}/debian/uqm ./build.sh uqm install -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +override_dh_auto_clean: + ./build.sh uqm clean + rm -rf obj + dh_clean config.state uqm uqm-wrapper configure-stamp build-stamp diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- 1.7.10.4
From cf2af3a5218750e8538bcef78a95e6d602c1a718 Mon Sep 17 00:00:00 2001 Message-Id: <cf2af3a5218750e8538bcef78a95e6d602c1a718.1370733172.git.si...@ruderich.org> In-Reply-To: <a970c0d1fb85fb63cc492439afea3750a561dc22.1370733172.git.si...@ruderich.org> References: <a970c0d1fb85fb63cc492439afea3750a561dc22.1370733172.git.si...@ruderich.org> From: Simon Ruderich <[email protected]> Date: Sat, 8 Jun 2013 19:15:56 +0200 Subject: [PATCH 2/4] debian/uqm.6: Add and install. --- debian/manpages | 1 + debian/uqm.6 | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+) create mode 100644 debian/manpages create mode 100644 debian/uqm.6 diff --git a/debian/manpages b/debian/manpages new file mode 100644 index 0000000..2b36c55 --- /dev/null +++ b/debian/manpages @@ -0,0 +1 @@ +debian/uqm.6 diff --git a/debian/uqm.6 b/debian/uqm.6 new file mode 100644 index 0000000..86c368d --- /dev/null +++ b/debian/uqm.6 @@ -0,0 +1,133 @@ +.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. -- 1.7.10.4
From 628f551c6179436c11d29747ea669df66d0079e5 Mon Sep 17 00:00:00 2001 Message-Id: <628f551c6179436c11d29747ea669df66d0079e5.1370733172.git.si...@ruderich.org> In-Reply-To: <a970c0d1fb85fb63cc492439afea3750a561dc22.1370733172.git.si...@ruderich.org> References: <a970c0d1fb85fb63cc492439afea3750a561dc22.1370733172.git.si...@ruderich.org> From: Simon Ruderich <[email protected]> Date: Sat, 8 Jun 2013 20:50:11 +0200 Subject: [PATCH 3/4] debian/control: Bump versions of uqm-* dependency packages. --- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index fe6b88e..ba85935 100644 --- a/debian/control +++ b/debian/control @@ -10,10 +10,10 @@ VCS-Git: git://git.debian.org/collab-maint/uqm.git Package: uqm Architecture: any -Depends: ${shlibs:Depends}, uqm-content (>= 0.6.0) +Depends: ${shlibs:Depends}, uqm-content (>= 0.7.0) Replaces: uqm-content -Recommends: uqm-music (>= 0.4) -Suggests: uqm-voice (>= 0.4) +Recommends: uqm-music (>= 0.7) +Suggests: uqm-voice (>= 0.7) 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 -- 1.7.10.4
From 174d15a3a98b3a495acd1131e0f9270d510de933 Mon Sep 17 00:00:00 2001 Message-Id: <174d15a3a98b3a495acd1131e0f9270d510de933.1370733172.git.si...@ruderich.org> In-Reply-To: <a970c0d1fb85fb63cc492439afea3750a561dc22.1370733172.git.si...@ruderich.org> References: <a970c0d1fb85fb63cc492439afea3750a561dc22.1370733172.git.si...@ruderich.org> From: Simon Ruderich <[email protected]> Date: Sat, 8 Jun 2013 21:00:38 +0200 Subject: [PATCH 4/4] debian/control: Remove outdated paragraph. uqm-music and uqm-voice are in non-free. --- debian/control | 3 --- 1 file changed, 3 deletions(-) diff --git a/debian/control b/debian/control index ba85935..086ae6f 100644 --- a/debian/control +++ b/debian/control @@ -23,6 +23,3 @@ Description: The Ur-Quan Masters - An inter-galatic adventure game 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. -- 1.7.10.4
From 7b63068e9893d76364d46f388e8478f04818685e Mon Sep 17 00:00:00 2001 Message-Id: <7b63068e9893d76364d46f388e8478f04818685e.1370733227.git.si...@ruderich.org> From: Simon Ruderich <[email protected]> Date: Sat, 8 Jun 2013 22:57:01 +0200 Subject: [PATCH] debian: Update for new release. --- debian/changelog | 8 ++++++++ debian/control | 6 +++--- debian/rules | 10 +++++----- debian/source/format | 1 + 4 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog index 4946fdd..6d52da7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +uqm-content (0.7.0+deb1-1) UNRELEASED; urgency=low + + * New upstream release. + * Switch to 3.0 quilt package format. + * 3do data is now stored in content/addons. + + -- Simon Ruderich <[email protected]> Sat, 08 Jun 2013 21:17:01 +0200 + uqm-content (0.6.0+deb1-6) unstable; urgency=low * GIT-repo has been created in git.debian.org. diff --git a/debian/control b/debian/control index 412c5fb..e1acb75 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ VCS-Git: git://git.debian.org/collab-maint/uqm-content.git Package: uqm-content Architecture: all -Depends: uqm (>= 0.6.0) +Depends: uqm (>= 0.7.0) Conflicts: uqm (<< 0.4), uqm-voice (<< 0.3), uqm-music (<< 0.3) Description: The Ur-Quan Masters - Game data files You return to Earth with a vessel built from technology discovered from an @@ -23,7 +23,7 @@ Description: The Ur-Quan Masters - Game data files Package: uqm-music Architecture: all -Depends: uqm (>= 0.6.0) +Depends: uqm (>= 0.7.0) Description: The Ur-Quan Masters - Game music files 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 @@ -36,7 +36,7 @@ Description: The Ur-Quan Masters - Game music files Package: uqm-voice Architecture: all -Depends: uqm (>= 0.6.0) +Depends: uqm (>= 0.7.0) Description: The Ur-Quan Masters - Voice files 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 diff --git a/debian/rules b/debian/rules index 0f62322..720dc60 100755 --- a/debian/rules +++ b/debian/rules @@ -2,9 +2,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk -UQM_MUSIC = uqm-0.6.0-3domusic.uqm -UQM_CONTENT = uqm-0.6.0-content.uqm -UQM_VOICE = uqm-0.6.0-voice.uqm +UQM_MUSIC = uqm-0.7.0-3domusic.uqm +UQM_CONTENT = uqm-0.7.0-content.uqm +UQM_VOICE = uqm-0.7.0-voice.uqm clean:: @@ -23,13 +23,13 @@ stamps/unpack-content-stamp: stamps/unpack-dir-stamp touch $@ stamps/unpack-voice-stamp: stamps/unpack-dir-stamp - echo 'unpack/uqm-voice/* /usr/share/games/uqm/content/' >\ + echo 'unpack/uqm-voice/* /usr/share/games/uqm/content/addons/' >\ debian/uqm-voice.install unzip -q $(UQM_VOICE) -d unpack/uqm-voice touch $@ stamps/unpack-music-stamp: stamps/unpack-dir-stamp - echo 'unpack/uqm-music/* /usr/share/games/uqm/content/' >\ + echo 'unpack/uqm-music/* /usr/share/games/uqm/content/addons/' >\ debian/uqm-music.install unzip -q $(UQM_MUSIC) -d unpack/uqm-music touch $@ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- 1.7.10.4
signature.asc
Description: Digital signature
