r7699 - in packages/trunk/rott/debian: . patches
Fabian Greffrath
fabian-guest at alioth.debian.org
Fri Jul 11 13:34:51 UTC 2008
Author: fabian-guest
Date: 2008-07-11 13:34:51 +0000 (Fri, 11 Jul 2008)
New Revision: 7699
Added:
packages/trunk/rott/debian/patches/rott-1.1-disable-audiolib.patch
packages/trunk/rott/debian/patches/rott-1.1-registered-version.patch
Removed:
packages/trunk/rott/debian/patches/rott-1.0-registered.patch
Modified:
packages/trunk/rott/debian/README.Debian
packages/trunk/rott/debian/changelog
packages/trunk/rott/debian/control
packages/trunk/rott/debian/copyright
packages/trunk/rott/debian/patches/series
Log:
* debian/copyright:
+ Converted into proposed machine-readable format.
+ Added further copyright holders.
+ Sourceless binary files have been removed upstream.
* debian/control:
+ Re-added rott-dbg package.
+ Promoted freepats and timidity to Recommends.
* debian/manpage/, debian/patches/, debian/pixmap/:
+ Removed previous patchset, all applied upstream.
* debian/patches/rott-1.1-disable-audiolib.patch:
+ Reverting parts of upstream r218 to disable audiolib,
for testing purposes, disabled in debian/patches/series.
* debian/patches/rott-1.1-registered-version.patch:
+ Updated from the previous rott-1.0-registered.patch,
disabled in debian/patches/series.
* debian/README.Debian, debian/patches/series:
+ Changed to reflect new patch names.
* debian/README.Debian, debian/rules:
Removed get-orig-source rule.
Modified: packages/trunk/rott/debian/README.Debian
===================================================================
--- packages/trunk/rott/debian/README.Debian 2008-07-10 23:05:52 UTC (rev 7698)
+++ packages/trunk/rott/debian/README.Debian 2008-07-11 13:34:51 UTC (rev 7699)
@@ -2,7 +2,7 @@
----------------------------
* The source code is setup to use shareware binaries. If you want to use
- the registered version of ROTT, apply rott-1.0-registered.patch and
+ the registered version of ROTT, apply rott-1.1-registered-version.patch and
compile as normal.
- -- Fabian Greffrath <fabian at debian-unofficial.org> Sun, 22 Jun 2008 14:00:00 +0100
+ -- Fabian Greffrath <fabian at debian-unofficial.org> Fri, 11 Jul 2008 14:00:00 +0100
Modified: packages/trunk/rott/debian/changelog
===================================================================
--- packages/trunk/rott/debian/changelog 2008-07-10 23:05:52 UTC (rev 7698)
+++ packages/trunk/rott/debian/changelog 2008-07-11 13:34:51 UTC (rev 7699)
@@ -1,22 +1,31 @@
rott (1.1-1) unstable; urgency=low
* New upstream release.
+ * debian/copyright:
+ + Converted into proposed machine-readable format.
+ + Added further copyright holders.
+ + Sourceless binary files have been removed upstream.
* debian/control:
- + Removed rott-dbg package for this upload.
+ + Re-added rott-dbg package.
+ + Promoted freepats and timidity to Recommends.
* debian/manpage/, debian/patches/, debian/pixmap/:
- + Removed, all applied upstream.
- + Kept debian/patches/rott-1.0-registered.patch, though.
+ + Removed previous patchset, all applied upstream.
+ * debian/patches/rott-1.1-disable-audiolib.patch:
+ + Reverting parts of upstream r218 to disable audiolib,
+ for testing purposes, disabled in debian/patches/series.
+ * debian/patches/rott-1.1-registered-version.patch:
+ + Updated from the previous rott-1.0-registered.patch,
+ disabled in debian/patches/series.
+ * debian/README.Debian, debian/patches/series:
+ + Changed to reflect new patch names.
* debian/README.Debian, debian/rules:
+ Removed get-orig-source rule.
- * debian/copyright:
- + Sourceless binary files have been removed upstream.
- + Added further copyright holders.
* debian/rott.docs, debian/rott.install, debian/rott.manpages:
+ Adopted to new source directory structure.
* debian/rules:
+ Set DEB_BUILDDIR := rott.
- -- Fabian Greffrath <fabian at debian-unofficial.org> Sun, 22 Jun 2008 14:00:00 +0100
+ -- Fabian Greffrath <fabian at debian-unofficial.org> Fri, 11 Jul 2008 14:00:00 +0100
rott (1.0+dfsg-3) UNRELEASED; urgency=low
Modified: packages/trunk/rott/debian/control
===================================================================
--- packages/trunk/rott/debian/control 2008-07-10 23:05:52 UTC (rev 7698)
+++ packages/trunk/rott/debian/control 2008-07-11 13:34:51 UTC (rev 7699)
@@ -13,7 +13,7 @@
Section: contrib/games
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, wget, unzip
-Suggests: freepats, timidity
+Recommends: freepats, timidity
Description: Rise of the Triad -- The HUNT Begins
Rise of the Triad is a high quality, fast scrolling first-person perspective
3D action game. It includes a lot of destructive enemies, an arsenal of
@@ -24,3 +24,16 @@
.
This package contains no data files but can install the shareware data files
from the Internet.
+
+Package: rott-dbg
+Section: contrib/devel
+Priority: extra
+Architecture: any
+Depends: rott (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: Rise of the Triad -- The HUNT Begins (debug)
+ Rise of the Triad is a high quality, fast scrolling first-person perspective
+ 3D action game. It includes a lot of destructive enemies, an arsenal of
+ weapons from simple pistols to missile launchers, life-preserving armor, traps
+ and ambushes galore.
+ .
+ This package contains the debug symbols.
Modified: packages/trunk/rott/debian/copyright
===================================================================
--- packages/trunk/rott/debian/copyright 2008-07-10 23:05:52 UTC (rev 7698)
+++ packages/trunk/rott/debian/copyright 2008-07-11 13:34:51 UTC (rev 7699)
@@ -1,48 +1,249 @@
-This package was debianized by Fabian Greffrath <fabian at debian-unofficial.org> on
-Mon, 1 May 2006 00:00:00 +0100.
+Author: Apogee Software, Ltd.
+Download: http://icculus.org/rott/
-It was downloaded from <http://icculus.org/rott/>.
+Files: *
+Copyright: © 1994-1995, Apogee Software, Ltd.
+License: GPL-2+
+ 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
-Copyright Holders:
+Files:
+ rott/fx_man.h
+ rott/music.h
+ rott/sndcards.h
+ rott/task_man.h
+ rott/audiolib/adlibfx.c
+ rott/audiolib/adlibfx.h
+ rott/audiolib/al_midi.c
+ rott/audiolib/awe32.c
+ rott/audiolib/awe32.h
+ rott/audiolib/blaster.c
+ rott/audiolib/blaster.h
+ rott/audiolib/_blaster.h
+ rott/audiolib/dma.c
+ rott/audiolib/dma.h
+ rott/audiolib/dpmi.c
+ rott/audiolib/dpmi.h
+ rott/audiolib/fx_man.c
+ rott/audiolib/fx_man.h
+ rott/audiolib/gus.c
+ rott/audiolib/gusmidi.c
+ rott/audiolib/guswave.c
+ rott/audiolib/guswave.h
+ rott/audiolib/_guswave.h
+ rott/audiolib/interrup.h
+ rott/audiolib/irq.c
+ rott/audiolib/irq.h
+ rott/audiolib/ll_man.c
+ rott/audiolib/ll_man.h
+ rott/audiolib/midi.c
+ rott/audiolib/midi.h
+ rott/audiolib/_midi.h
+ rott/audiolib/mpu401.c
+ rott/audiolib/_multivc.h
+ rott/audiolib/multivoc.c
+ rott/audiolib/multivoc.h
+ rott/audiolib/music.c
+ rott/audiolib/music.h
+ rott/audiolib/nodpmi.c
+ rott/audiolib/pas16.c
+ rott/audiolib/pas16.h
+ rott/audiolib/_pas16.h
+ rott/audiolib/pitch.c
+ rott/audiolib/pitch.h
+ rott/audiolib/sndcards.h
+ rott/audiolib/sndscape.c
+ rott/audiolib/sndscape.h
+ rott/audiolib/_sndscap.h
+ rott/audiolib/sndsrc.c
+ rott/audiolib/sndsrc.h
+ rott/audiolib/standard.h
+ rott/audiolib/task_man.c
+ rott/audiolib/task_man.h
+ rott/audiolib/user.c
+ rott/audiolib/user.h
+Copyright:
+ © 1994-1995, Apogee Software, Ltd.
+ © 1993-1994, James R. Dose
+License: GPL-2+
+ 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
- Apogee Software, Ltd. (* except rott/byteordr.c, rott/byteordr.h, rott/winrott.c, rott/WinRott.h)
- James R. Dose (rott/fx_man.h, rott/music.h, rott/sndcards.h, rott/task_man.h, rott/audiolib/*)
- John R. Hall (rott/byteordr.c, rott/byteordr.h)
- Jim Kent (rott/fli_def.h, rott/fli_main.c, rott/fli_main.h, rott/fli_type.h, rott/fli_util.c, rott/fli_util.h)
- Spacetec IMC Corporation (rott/rt_spbal.c, rott/sbconfig.c)
- Creative Technology Ltd. (rott/audiolib/ctaweapi.h)
- FORTE (rott/audiolib/newgf1.h)
+Files:
+ rott/byteordr.c
+ rott/byteordr.h
+Copyright: © 2002, John R. Hall
+License: GPL-2+
+ 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
-License:
+Files:
+ rott/fli_def.h
+ rott/fli_main.c
+ rott/fli_main.h
+ rott/fli_type.h
+ rott/fli_util.c
+ rott/fli_util.h
+Copyright:
+ © 1994-1995, Apogee Software, Ltd.
+ © 1992, Jim Kent
+License: GPL-2+
+ 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
- Copyright © 1992, Jim Kent
- Copyright © 1994, James R. Dose
- Copyright © 1994-1995, Apogee Software, Ltd.
- Copyright © 1995, Spacetec IMC Corporation
- Copyright © 2002, John R. Hall
- Copyright © 1992-1994, Creative Technology Ltd.
- Copyright © 1991-1992, FORTE
+Files:
+ rott/rt_spbal.c
+ rott/sbconfig.c
+Copyright:
+ © 1994-1995, Apogee Software, Ltd.
+ © 1995, Spacetec IMC Corporation
+License: GPL-2+
+ 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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
+Files: rott/audiolib/ctaweapi.h
+Copyright:
+ © 1994-1995, Apogee Software, Ltd.
+ © 1992-1994, Creative Technology Ltd.
+License: GPL-2+
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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
+Files: rott/audiolib/newgf1.h
+Copyright:
+ © 1994-1995, Apogee Software, Ltd.
+ © 1991-1992, FORTE
+License: GPL-2+
+ 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
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
-On Debian systems, the complete text of the GNU General Public License
-can be found in the `/usr/share/common-licenses/GPL' file.
+Files: debian/*
+Copyright: © 2006-2008, Fabian Greffrath <fabian at debian-unofficial.org>
+License: GPL-2+
+ The Debian packaging is licensed under the GPL.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
-After installation the licensing terms of the shareware data can be found in
-`/usr/share/doc/rott/vendor.doc'.
+Files: debian/po/de.po
+Copyright:
+ © 2006-2008, Fabian Greffrath <fabian at debian-unofficial.org>
+ © 2007, Helge Kreutzmann <debian at helgefjell.de>
+License: GPL-2+
+ The Debian packaging is licensed under the GPL.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
-The Debian packaging is © 2006-2008, Fabian Greffrath <fabian at debian-unofficial.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+Files: debian/po/pt_BR.po
+Copyright: © 2007, Eder L. Marques <frolic at debian-ce.org>
+License: GPL-2+
+ The Debian packaging is licensed under the GPL.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
Deleted: packages/trunk/rott/debian/patches/rott-1.0-registered.patch
===================================================================
--- packages/trunk/rott/debian/patches/rott-1.0-registered.patch 2008-07-10 23:05:52 UTC (rev 7698)
+++ packages/trunk/rott/debian/patches/rott-1.0-registered.patch 2008-07-11 13:34:51 UTC (rev 7699)
@@ -1,13 +0,0 @@
---- rott-1.0/rott/develop.h~ 2007-05-11 10:24:32.000000000 +0200
-+++ rott-1.0/rott/develop.h 2007-05-11 10:24:32.000000000 +0200
-@@ -41,8 +41,8 @@
-
- #define BNACRASHPREVENT 1 //bna added
- // Make sure only one of the following are on at one time
--#define SHAREWARE 1
--#define SUPERROTT 0
-+#define SHAREWARE 0
-+#define SUPERROTT 1
- #define SITELICENSE 0
-
- // cute little dopefish thing, only works with special patch?
Added: packages/trunk/rott/debian/patches/rott-1.1-disable-audiolib.patch
===================================================================
--- packages/trunk/rott/debian/patches/rott-1.1-disable-audiolib.patch (rev 0)
+++ packages/trunk/rott/debian/patches/rott-1.1-disable-audiolib.patch 2008-07-11 13:34:51 UTC (rev 7699)
@@ -0,0 +1,54 @@
+--- rott-1.1.orig/rott/Makefile
++++ rott-1.1/rott/Makefile
+@@ -69,6 +69,7 @@
+ cin_util.o \
+ dosutil.o \
+ engine.o \
++ fx_man.o \
+ isr.o \
+ modexlib.o \
+ rt_actor.o \
+@@ -109,8 +110,6 @@
+ watcom.o \
+ z_zone.o \
+ byteordr.o \
+- dukemusc.o \
+- audiolib/audiolib.a \
+ winrott.o
+ $(CC) $^ $(LDLIBS) -o $@
+
+--- rott-1.1.orig/rott/rt_sound.c
++++ rott-1.1/rott/rt_sound.c
+@@ -395,6 +395,7 @@
+
+ snd=W_CacheLumpNum(SoundNumber(sndnum),PU_STATIC, CvtNull, 1);
+
++#ifdef DOS
+ if ( *snd == 'C' )
+ {
+ voice = FX_PlayVOC3D( snd, pitch, angle, distance,
+@@ -405,6 +406,24 @@
+ voice = FX_PlayWAV3D( snd, pitch, angle, distance,
+ sounds[sndnum].priority, (unsigned long) sndnum );
+ }
++#else
++/*
++ Oh boy. The library used to implement these functions may need a
++ file size. So, let's just hack these in!
++ */
++ if ( *snd == 'C' )
++ {
++ voice = FX_PlayVOC3D_ROTT( snd, W_LumpLength(SoundNumber(sndnum)),
++ pitch, angle, distance,
++ sounds[sndnum].priority, (unsigned long) sndnum );
++ }
++ else
++ {
++ voice = FX_PlayWAV3D_ROTT( snd, W_LumpLength(SoundNumber(sndnum)),
++ pitch, angle, distance,
++ sounds[sndnum].priority, (unsigned long) sndnum );
++ }
++#endif
+
+ if ( voice < FX_Ok )
+ {
Added: packages/trunk/rott/debian/patches/rott-1.1-registered-version.patch
===================================================================
--- packages/trunk/rott/debian/patches/rott-1.1-registered-version.patch (rev 0)
+++ packages/trunk/rott/debian/patches/rott-1.1-registered-version.patch 2008-07-11 13:34:51 UTC (rev 7699)
@@ -0,0 +1,13 @@
+--- rott-1.1.orig/rott/develop.h
++++ rott-1.1/rott/develop.h
+@@ -41,8 +41,8 @@
+
+ #define BNACRASHPREVENT 1 //bna added
+ // Make sure only one of the following are on at one time
+-#define SHAREWARE 1
+-#define SUPERROTT 0
++#define SHAREWARE 0
++#define SUPERROTT 1
+ #define SITELICENSE 0
+
+ // cute little dopefish thing, only works with special patch?
Modified: packages/trunk/rott/debian/patches/series
===================================================================
--- packages/trunk/rott/debian/patches/series 2008-07-10 23:05:52 UTC (rev 7698)
+++ packages/trunk/rott/debian/patches/series 2008-07-11 13:34:51 UTC (rev 7699)
@@ -1 +1,2 @@
-#rott-1.0-registered.patch
+#rott-1.1-disable-audiolib.patch
+#rott-1.1-registered-version.patch
More information about the Pkg-games-commits
mailing list