From 1b32a437640ff143048efe567c9715b7f47a8000 Mon Sep 17 00:00:00 2001 From: Jeff Teunissen Date: Mon, 23 Jul 2001 07:21:44 +0000 Subject: [PATCH] Debian package updates. They won't work completely yet, but I think they need to be committed. --- debian/Makefile.am | 30 ++-- debian/control | 134 ++++++++++++------ debian/copyright | 4 +- debian/qf-client-x11.files | 1 - ...-client-3dfx.dirs => quakeforge-3dfx.dirs} | 0 ...-client-3dfx.docs => quakeforge-3dfx.docs} | 0 ...client-3dfx.suid => quakeforge-3dfx.files} | 1 + ...client-3dfx.files => quakeforge-3dfx.suid} | 0 ...ocumented => quakeforge-3dfx.undocumented} | 0 debian/quakeforge-alsa.files | 3 + debian/quakeforge-common.files | 25 ++++ debian/quakeforge-dev.dirs | 1 + debian/quakeforge-dev.files | 30 ++++ ...qf-client-glx.dirs => quakeforge-glx.dirs} | 0 ...qf-client-glx.docs => quakeforge-glx.docs} | 0 ...-client-glx.files => quakeforge-glx.files} | 1 + ...documented => quakeforge-glx.undocumented} | 0 debian/quakeforge-libs-gl.files | 4 + debian/quakeforge-libs-sw.files | 4 + debian/quakeforge-oss.files | 3 + ...qf-client-sdl.dirs => quakeforge-sdl.dirs} | 0 ...qf-client-sdl.docs => quakeforge-sdl.docs} | 0 ...-client-sdl.files => quakeforge-sdl.files} | 1 + ...documented => quakeforge-sdl.undocumented} | 0 ...{qf-server.dirs => quakeforge-server.dirs} | 0 ...client-sgl.docs => quakeforge-server.docs} | 0 ...f-server.files => quakeforge-server.files} | 0 ...umented => quakeforge-server.undocumented} | 0 ...qf-client-sgl.dirs => quakeforge-sgl.dirs} | 0 ...f-client-svga.docs => quakeforge-sgl.docs} | 0 ...-client-sgl.files => quakeforge-sgl.files} | 1 + ...documented => quakeforge-sgl.undocumented} | 0 ...-client-svga.dirs => quakeforge-svga.dirs} | 0 ...f-client-x11.docs => quakeforge-svga.docs} | 0 ...client-svga.suid => quakeforge-svga.files} | 1 + ...client-svga.files => quakeforge-svga.suid} | 0 ...ocumented => quakeforge-svga.undocumented} | 0 ...qf-client-x11.dirs => quakeforge-x11.dirs} | 0 .../{qf-server.docs => quakeforge-x11.docs} | 0 debian/quakeforge-x11.files | 2 + ...documented => quakeforge-x11.undocumented} | 0 debian/rules | 15 +- 42 files changed, 195 insertions(+), 66 deletions(-) delete mode 100644 debian/qf-client-x11.files rename debian/{qf-client-3dfx.dirs => quakeforge-3dfx.dirs} (100%) rename debian/{qf-client-3dfx.docs => quakeforge-3dfx.docs} (100%) rename debian/{qf-client-3dfx.suid => quakeforge-3dfx.files} (58%) rename debian/{qf-client-3dfx.files => quakeforge-3dfx.suid} (100%) rename debian/{qf-client-3dfx.undocumented => quakeforge-3dfx.undocumented} (100%) create mode 100644 debian/quakeforge-alsa.files create mode 100644 debian/quakeforge-dev.dirs create mode 100644 debian/quakeforge-dev.files rename debian/{qf-client-glx.dirs => quakeforge-glx.dirs} (100%) rename debian/{qf-client-glx.docs => quakeforge-glx.docs} (100%) rename debian/{qf-client-glx.files => quakeforge-glx.files} (58%) rename debian/{qf-client-glx.undocumented => quakeforge-glx.undocumented} (100%) create mode 100644 debian/quakeforge-libs-gl.files create mode 100644 debian/quakeforge-libs-sw.files create mode 100644 debian/quakeforge-oss.files rename debian/{qf-client-sdl.dirs => quakeforge-sdl.dirs} (100%) rename debian/{qf-client-sdl.docs => quakeforge-sdl.docs} (100%) rename debian/{qf-client-sdl.files => quakeforge-sdl.files} (58%) rename debian/{qf-client-sdl.undocumented => quakeforge-sdl.undocumented} (100%) rename debian/{qf-server.dirs => quakeforge-server.dirs} (100%) rename debian/{qf-client-sgl.docs => quakeforge-server.docs} (100%) rename debian/{qf-server.files => quakeforge-server.files} (100%) rename debian/{qf-server.undocumented => quakeforge-server.undocumented} (100%) rename debian/{qf-client-sgl.dirs => quakeforge-sgl.dirs} (100%) rename debian/{qf-client-svga.docs => quakeforge-sgl.docs} (100%) rename debian/{qf-client-sgl.files => quakeforge-sgl.files} (58%) rename debian/{qf-client-sgl.undocumented => quakeforge-sgl.undocumented} (100%) rename debian/{qf-client-svga.dirs => quakeforge-svga.dirs} (100%) rename debian/{qf-client-x11.docs => quakeforge-svga.docs} (100%) rename debian/{qf-client-svga.suid => quakeforge-svga.files} (58%) rename debian/{qf-client-svga.files => quakeforge-svga.suid} (100%) rename debian/{qf-client-svga.undocumented => quakeforge-svga.undocumented} (100%) rename debian/{qf-client-x11.dirs => quakeforge-x11.dirs} (100%) rename debian/{qf-server.docs => quakeforge-x11.docs} (100%) create mode 100644 debian/quakeforge-x11.files rename debian/{qf-client-x11.undocumented => quakeforge-x11.undocumented} (100%) diff --git a/debian/Makefile.am b/debian/Makefile.am index 45bfbd413..3c54ca77c 100644 --- a/debian/Makefile.am +++ b/debian/Makefile.am @@ -3,20 +3,22 @@ AUTOMAKE_OPTIONS= foreign EXTRA_DIST= changelog control copyright rules \ quakeforge.conf \ - qf-client-3dfx.dirs qf-client-3dfx.docs qf-client-3dfx.files \ - qf-client-3dfx.suid qf-client-3dfx.undocumented \ - qf-client-glx.dirs qf-client-glx.docs qf-client-glx.files \ - qf-client-glx.undocumented \ - qf-client-sdl.dirs qf-client-sdl.docs qf-client-sdl.files \ - qf-client-sdl.undocumented \ - qf-client-sgl.dirs qf-client-sgl.docs qf-client-sgl.files \ - qf-client-sgl.undocumented \ - qf-client-svga.dirs qf-client-svga.docs qf-client-svga.files \ - qf-client-svga.suid qf-client-svga.undocumented \ - qf-client-x11.dirs qf-client-x11.docs qf-client-x11.files \ - qf-client-x11.undocumented \ - qf-server.dirs qf-server.docs qf-server.files \ - qf-server.undocumented \ + quakeforge-3dfx.dirs quakeforge-3dfx.docs + quakeforge-3dfx.files quakeforge-3dfx.suid \ + quakeforge-3dfx.undocumented \ + quakeforge-glx.dirs quakeforge-glx.docs quakeforge-glx.files \ + quakeforge-glx.undocumented \ + quakeforge-sdl.dirs quakeforge-sdl.docs quakeforge-sdl.files \ + quakeforge-sdl.undocumented \ + quakeforge-sgl.dirs quakeforge-sgl.docs quakeforge-sgl.files \ + quakeforge-sgl.undocumented \ + quakeforge-svga.dirs quakeforge-svga.docs quakeforge-svga.files \ + quakeforge-svga.suid quakeforge-svga.undocumented \ + quakeforge-x11.dirs quakeforge-x11.docs quakeforge-x11.files \ + quakeforge-x11.undocumented \ quakeforge-common.conffiles quakeforge-common.docs \ quakeforge-common.files \ + quakeforge-dev.dirs quakeforge-dev.docs quakeforge-dev.files \ + quakeforge-server.dirs quakeforge-server.docs \ + quakeforge-server.files quakeforge-server.undocumented \ quakeforge.files diff --git a/debian/control b/debian/control index 53a076286..0929ce470 100644 --- a/debian/control +++ b/debian/control @@ -1,121 +1,173 @@ Source: quakeforge Section: contrib/games Priority: optional -Maintainer: Jeff Teunissen +Maintainer: Jeff Teunissen Standards-Version: 3.1.1 +Build-Depends: automake, autoconf, libtool, bison, flex, debhelper, libsdl1.2-dev, zlib1g-dev, libncurses5-dev, libglide2-dev, svgalibg1-dev Package: quakeforge Architecture: any -Depends: quake-game, quakeforge-common, qf-client -Suggests: qf-server -Description: First-person shooter Internet game - Fake package +Depends: quake-game, quakeforge-common, quakeforge-client +Suggests: quakeforge-server +Description: QuakeForge 3D game engine - Fake package QuakeForge is a source port of Quake and QuakeWorld, the successors to id Software's very popular DOOM series. Its primary development goal is to remain compatible with the original games released by id Software while adding portability and optional extensions to enhance gameplay. . - This package only exists to depend on a server and a client. + This package only exists to depend on a client and suggest a server. Package: quakeforge-common Architecture: any -Depends: quake-game -Description: First-person shooter Internet game - common files +Depends: ${shlibs:Depends}, quake-game +Description: QuakeForge 3D game engine - common files QuakeForge is a source port of Quake and QuakeWorld, the successors to id Software's very popular DOOM series. Its primary development goal is to remain compatible with the original games released by id Software while adding portability and optional extensions to enhance gameplay. . - This package contains files common to all QuakeForge packages. + This package contains files and shared libraries common to all QuakeForge + packages. -Package: qf-client-sdl +Package: quakeforge-sdl Architecture: i386 -Depends: ${shlibs:Depends}, libsdl1.1, quake-game +Conflicts: quake-sdl +Depends: ${shlibs:Depends}, quake-game +Provides: quakeforge-client Suggests: joystick -Provides: qf-client -Description: First-person shooter Internet game - SDL client +Description: QuakeForge 3D game engine - SDL client QuakeForge is a source port of Quake and QuakeWorld, the successors to id Software's very popular DOOM series. Its primary development goal is to remain compatible with the original games released by id Software while adding portability and optional extensions to enhance gameplay. . - This package contains the SDL version of the QuakeForge client. + This package contains the SDL versions of the QuakeWorld client and + standalone engine. -Package: qf-client-svga +Package: quakeforge-svga Architecture: i386 +Conflicts: quake-svga Depends: ${shlibs:Depends}, quake-game +Provides: quakeforge-client Suggests: joystick -Provides: qf-client -Description: First-person shooter Internet game - SVGAlib client +Description: QuakeForge 3D game engine - SVGAlib client QuakeForge is a source port of Quake and QuakeWorld, the successors to id Software's very popular DOOM series. Its primary development goal is to remain compatible with the original games released by id Software while adding portability and optional extensions to enhance gameplay. . - This package contains the SVGAlib version of the QuakeForge client. + This package contains the SVGAlib versions of the QuakeWorld client and + standalone engine. -Package: qf-client-x11 +Package: quakeforge-x11 Architecture: any +Conflicts: quake-x11 Depends: ${shlibs:Depends}, quake-game +Provides: quakeforge-client Suggests: joystick -Provides: qf-client -Description: First-person shooter Internet game - X11 client +Description: QuakeForge 3D game engine - X11 client QuakeForge is a source port of Quake and QuakeWorld, the successors to id Software's very popular DOOM series. Its primary development goal is to remain compatible with the original games released by id Software while adding portability and optional extensions to enhance gameplay. . - This package contains the X11 version of the QuakeForge client. + This package contains the X11 versions of the QuakeForge client and + standalone engine. -Package: qf-client-3dfx +Package: quakeforge-3dfx Architecture: any +Conflicts: libglide3, quake-3dfx Depends: ${shlibs:Depends}, libgl1, quake-game -Conflicts: libglide3 +Provides: quakeforge-client Suggests: joystick -Provides: qf-client -Description: First-person shooter Internet game - Voodoo 1/2 Client +Description: QuakeForge 3D game engine - Voodoo 1/2 Client QuakeForge is a source port of Quake and QuakeWorld, the successors to id Software's very popular DOOM series. Its primary development goal is to remain compatible with the original games released by id Software while adding portability and optional extensions to enhance gameplay. . - This package contains the Voodoo 1/2 version of the QuakeForge client. For - Voodoo 3 and higher, use the GLX client. + This package contains the Voodoo 1/2 versions of the QuakeForge client and + standalone engine. For Voodoo 3 and higher, please use qf-glx. -Package: qf-client-glx +Package: quakeforge-glx Architecture: any +Conflicts: quake-gl Depends: ${shlibs:Depends}, libgl1, quake-game +Provides: quakeforge-client Suggests: joystick -Provides: qf-client -Description: First-person shooter Internet game - GLX Client +Description: QuakeForge 3D game engine - GLX Client QuakeForge is a source port of Quake and QuakeWorld, the successors to id Software's very popular DOOM series. Its primary development goal is to remain compatible with the original games released by id Software while adding portability and optional extensions to enhance gameplay. . - This package contains the GLX version of the QuakeForge client. + This package contains the GLX versions of the QuakeForge client and + standalone engine. -Package: qf-client-sgl +Package: quakeforge-sgl Architecture: any -Depends: ${shlibs:Depends}, libsdl1.1 (>= 1.1.3), quake-game +Conflicts: quake-sdl +Depends: ${shlibs:Depends}, quake-game +Provides: quakeforge-client Suggests: joystick -Provides: qf-client -Description: First-person shooter Internet game - SDL-GL client +Description: QuakeForge 3D game engine - SDL-GL client QuakeForge is a source port of Quake and QuakeWorld, the successors to id Software's very popular DOOM series. Its primary development goal is to remain compatible with the original games released by id Software while adding portability and optional extensions to enhance gameplay. . - This package contains the SDL-GL version of the QuakeForge client. + This package contains the SDL-GL versions of the QuakeForge client and + standalone engine. -Package: qf-server +Package: quakeforge-server Architecture: any Depends: ${shlibs:Depends}, quake-game -Suggests: joystick -Provides: qf-client -Description: First-person shooter Internet game - Server +Description: QuakeForge 3D game engine - Server QuakeForge is a source port of Quake and QuakeWorld, the successors to id Software's very popular DOOM series. Its primary development goal is to remain compatible with the original games released by id Software while adding portability and optional extensions to enhance gameplay. . - This package contains the QuakeForge server. + This package contains the QuakeWorld-compatible dedicated server. + +Package: quakeforge-libs-sw +Architecture: any +Depends: ${shlibs:Depends} +Description: QuakeForge 3D game engine - Software renderer libraries + QuakeForge is a source port of Quake and QuakeWorld, the successors to id + Software's very popular DOOM series. Its primary development goal is to + remain compatible with the original games released by id Software while + adding portability and optional extensions to enhance gameplay. + . + This package contains the shared libraries needed to use the software + rendering targets. + +Package: quakeforge-libs-gl +Architecture: any +Depends: ${shlibs:Depends} +Description: QuakeForge 3D game engine - OpenGL renderer libraries + QuakeForge is a source port of Quake and QuakeWorld, the successors to id + Software's very popular DOOM series. Its primary development goal is to + remain compatible with the original games released by id Software while + adding portability and optional extensions to enhance gameplay. + . + This package contains the shared libraries needed to use the OpenGL + rendering targets. + +Package: quakeforge-oss +Architecture: any +Depends: ${shlibs:Depends} +Description: OSS sound plugin for QuakeForge + The OSS plugin for QuakeForge provides digital audio output (using OSS/Linux, + OSS/Free, or kernel sound) for QuakeForge targets that contain clients. + + NOTE: This plugin does not work on all systems, since it uses memory-mapped + I/O for the output device. If you have trouble, try the quakeforge-alsa + package. + +Package: quakeforge-alsa +Architecture: any +Depends: ${shlibs:Depends} +Description: ALSA 0.9 sound plugin for QuakeForge + The ALSA 0.9 plugin for QuakeForge provides digital audio output for QuakeForge + targets that contain clients. diff --git a/debian/copyright b/debian/copyright index bc3ab1364..99267b4c8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,10 +1,10 @@ This is a Debian prepackaged version of QuakeForge. This package was -compiled by Jeff Teunissen . +compiled by Jeff Teunissen . Original sources can be found at: http://www.quakeforge.net/files.php -Copyright (C) 1999,2000 contributors to the QuakeForge Project. +Copyright (C) 1999-2001 contributors to the QuakeForge Project. 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 diff --git a/debian/qf-client-x11.files b/debian/qf-client-x11.files deleted file mode 100644 index 5f0396aa3..000000000 --- a/debian/qf-client-x11.files +++ /dev/null @@ -1 +0,0 @@ -usr/games/qf-client-x11 diff --git a/debian/qf-client-3dfx.dirs b/debian/quakeforge-3dfx.dirs similarity index 100% rename from debian/qf-client-3dfx.dirs rename to debian/quakeforge-3dfx.dirs diff --git a/debian/qf-client-3dfx.docs b/debian/quakeforge-3dfx.docs similarity index 100% rename from debian/qf-client-3dfx.docs rename to debian/quakeforge-3dfx.docs diff --git a/debian/qf-client-3dfx.suid b/debian/quakeforge-3dfx.files similarity index 58% rename from debian/qf-client-3dfx.suid rename to debian/quakeforge-3dfx.files index 3e47729ff..cbb1972c8 100644 --- a/debian/qf-client-3dfx.suid +++ b/debian/quakeforge-3dfx.files @@ -1 +1,2 @@ usr/games/qf-client-3dfx +usr/games/nq-3dfx diff --git a/debian/qf-client-3dfx.files b/debian/quakeforge-3dfx.suid similarity index 100% rename from debian/qf-client-3dfx.files rename to debian/quakeforge-3dfx.suid diff --git a/debian/qf-client-3dfx.undocumented b/debian/quakeforge-3dfx.undocumented similarity index 100% rename from debian/qf-client-3dfx.undocumented rename to debian/quakeforge-3dfx.undocumented diff --git a/debian/quakeforge-alsa.files b/debian/quakeforge-alsa.files new file mode 100644 index 000000000..61cd057a5 --- /dev/null +++ b/debian/quakeforge-alsa.files @@ -0,0 +1,3 @@ +usr/lib/quakeforge/libsound_alsa0_9.so +usr/lib/quakeforge/libsound_alsa0_9.so.1 +usr/lib/quakeforge/libsound_alsa0_9.so.1.0.0 diff --git a/debian/quakeforge-common.files b/debian/quakeforge-common.files index b851f8de4..a00503ea7 100644 --- a/debian/quakeforge-common.files +++ b/debian/quakeforge-common.files @@ -1 +1,26 @@ etc/quakeforge.conf +usr/lib/libQFcd.so.1 +usr/lib/libQFcd.so.1.0.0 +usr/lib/libQFconsole.so.1 +usr/lib/libQFconsole.so.1.0.0 +usr/lib/libQFgamecode.so.1 +usr/lib/libQFgamecode.so.1.0.0 +usr/lib/libQFgib.so.1 +usr/lib/libQFgib.so.1.0.0 +usr/lib/libQFjs.so.1 +usr/lib/libQFjs.so.1.0.0 +usr/lib/libQFmodels.so.1 +usr/lib/libQFmodels.so.1.0.0 +usr/lib/libQFsound.so.1 +usr/lib/libQFsound.so.1.0.0 +usr/lib/libQFutil.so.1 +usr/lib/libQFutil.so.1.0.0 +usr/lib/quakeforge/libcd_null.so +usr/lib/quakeforge/libcd_null.so.1 +usr/lib/quakeforge/libcd_null.so.1.0.0 +usr/lib/quakeforge/libsound_disk.so +usr/lib/quakeforge/libsound_disk.so.1 +usr/lib/quakeforge/libsound_disk.so.1.0.0 +usr/lib/quakeforge/libsound_null.so +usr/lib/quakeforge/libsound_null.so.1 +usr/lib/quakeforge/libsound_null.so.1.0.0 diff --git a/debian/quakeforge-dev.dirs b/debian/quakeforge-dev.dirs new file mode 100644 index 000000000..68457717b --- /dev/null +++ b/debian/quakeforge-dev.dirs @@ -0,0 +1 @@ +usr/lib diff --git a/debian/quakeforge-dev.files b/debian/quakeforge-dev.files new file mode 100644 index 000000000..c41ff96b4 --- /dev/null +++ b/debian/quakeforge-dev.files @@ -0,0 +1,30 @@ +usr/lib/libQFcd.a +usr/lib/libQFcd.la +usr/lib/libQFcd.so +usr/lib/libQFconsole.a +usr/lib/libQFconsole.la +usr/lib/libQFconsole.so +usr/lib/libQFgamecode.a +usr/lib/libQFgamecode.la +usr/lib/libQFgamecode.so +usr/lib/libQFgib.a +usr/lib/libQFgib.la +usr/lib/libQFgib.so +usr/lib/libQFglx.a +usr/lib/libQFglx.la +usr/lib/libQFglx.so +usr/lib/libQFjs.a +usr/lib/libQFjs.la +usr/lib/libQFjs.so +usr/lib/libQFmodels.a +usr/lib/libQFmodels.la +usr/lib/libQFmodels.so +usr/lib/libQFsound.a +usr/lib/libQFsound.la +usr/lib/libQFsound.so +usr/lib/libQFutil.a +usr/lib/libQFutil.la +usr/lib/libQFutil.so +usr/lib/libQFx11.a +usr/lib/libQFx11.la +usr/lib/libQFx11.so diff --git a/debian/qf-client-glx.dirs b/debian/quakeforge-glx.dirs similarity index 100% rename from debian/qf-client-glx.dirs rename to debian/quakeforge-glx.dirs diff --git a/debian/qf-client-glx.docs b/debian/quakeforge-glx.docs similarity index 100% rename from debian/qf-client-glx.docs rename to debian/quakeforge-glx.docs diff --git a/debian/qf-client-glx.files b/debian/quakeforge-glx.files similarity index 58% rename from debian/qf-client-glx.files rename to debian/quakeforge-glx.files index 331e86dd7..f3c9ccd55 100644 --- a/debian/qf-client-glx.files +++ b/debian/quakeforge-glx.files @@ -1 +1,2 @@ usr/games/qf-client-glx +usr/games/nq-glx diff --git a/debian/qf-client-glx.undocumented b/debian/quakeforge-glx.undocumented similarity index 100% rename from debian/qf-client-glx.undocumented rename to debian/quakeforge-glx.undocumented diff --git a/debian/quakeforge-libs-gl.files b/debian/quakeforge-libs-gl.files new file mode 100644 index 000000000..508524830 --- /dev/null +++ b/debian/quakeforge-libs-gl.files @@ -0,0 +1,4 @@ +/usr/local/lib/libQFmodels_gl.so.1 +/usr/local/lib/libQFmodels_gl.so.1.0.0 +/usr/local/lib/libQFrenderer_gl.so.1 +/usr/local/lib/libQFrenderer_gl.so.1.0.0 diff --git a/debian/quakeforge-libs-sw.files b/debian/quakeforge-libs-sw.files new file mode 100644 index 000000000..59f3cc6c5 --- /dev/null +++ b/debian/quakeforge-libs-sw.files @@ -0,0 +1,4 @@ +/usr/local/lib/libQFmodels_sw.so.1 +/usr/local/lib/libQFmodels_sw.so.1.0.0 +/usr/local/lib/libQFrenderer_sw.so.1 +/usr/local/lib/libQFrenderer_sw.so.1.0.0 diff --git a/debian/quakeforge-oss.files b/debian/quakeforge-oss.files new file mode 100644 index 000000000..a001716bf --- /dev/null +++ b/debian/quakeforge-oss.files @@ -0,0 +1,3 @@ +usr/lib/quakeforge/libsound_oss.so +usr/lib/quakeforge/libsound_oss.so.1 +usr/lib/quakeforge/libsound_oss.so.1.0.0 diff --git a/debian/qf-client-sdl.dirs b/debian/quakeforge-sdl.dirs similarity index 100% rename from debian/qf-client-sdl.dirs rename to debian/quakeforge-sdl.dirs diff --git a/debian/qf-client-sdl.docs b/debian/quakeforge-sdl.docs similarity index 100% rename from debian/qf-client-sdl.docs rename to debian/quakeforge-sdl.docs diff --git a/debian/qf-client-sdl.files b/debian/quakeforge-sdl.files similarity index 58% rename from debian/qf-client-sdl.files rename to debian/quakeforge-sdl.files index 8bac07f30..e23659d7b 100644 --- a/debian/qf-client-sdl.files +++ b/debian/quakeforge-sdl.files @@ -1 +1,2 @@ usr/games/qf-client-sdl +usr/games/nq-sdl diff --git a/debian/qf-client-sdl.undocumented b/debian/quakeforge-sdl.undocumented similarity index 100% rename from debian/qf-client-sdl.undocumented rename to debian/quakeforge-sdl.undocumented diff --git a/debian/qf-server.dirs b/debian/quakeforge-server.dirs similarity index 100% rename from debian/qf-server.dirs rename to debian/quakeforge-server.dirs diff --git a/debian/qf-client-sgl.docs b/debian/quakeforge-server.docs similarity index 100% rename from debian/qf-client-sgl.docs rename to debian/quakeforge-server.docs diff --git a/debian/qf-server.files b/debian/quakeforge-server.files similarity index 100% rename from debian/qf-server.files rename to debian/quakeforge-server.files diff --git a/debian/qf-server.undocumented b/debian/quakeforge-server.undocumented similarity index 100% rename from debian/qf-server.undocumented rename to debian/quakeforge-server.undocumented diff --git a/debian/qf-client-sgl.dirs b/debian/quakeforge-sgl.dirs similarity index 100% rename from debian/qf-client-sgl.dirs rename to debian/quakeforge-sgl.dirs diff --git a/debian/qf-client-svga.docs b/debian/quakeforge-sgl.docs similarity index 100% rename from debian/qf-client-svga.docs rename to debian/quakeforge-sgl.docs diff --git a/debian/qf-client-sgl.files b/debian/quakeforge-sgl.files similarity index 58% rename from debian/qf-client-sgl.files rename to debian/quakeforge-sgl.files index 9530f1fee..50e41e5a4 100644 --- a/debian/qf-client-sgl.files +++ b/debian/quakeforge-sgl.files @@ -1 +1,2 @@ usr/games/qf-client-sgl +usr/games/nq-sgl diff --git a/debian/qf-client-sgl.undocumented b/debian/quakeforge-sgl.undocumented similarity index 100% rename from debian/qf-client-sgl.undocumented rename to debian/quakeforge-sgl.undocumented diff --git a/debian/qf-client-svga.dirs b/debian/quakeforge-svga.dirs similarity index 100% rename from debian/qf-client-svga.dirs rename to debian/quakeforge-svga.dirs diff --git a/debian/qf-client-x11.docs b/debian/quakeforge-svga.docs similarity index 100% rename from debian/qf-client-x11.docs rename to debian/quakeforge-svga.docs diff --git a/debian/qf-client-svga.suid b/debian/quakeforge-svga.files similarity index 58% rename from debian/qf-client-svga.suid rename to debian/quakeforge-svga.files index 9c2df8a2a..ce7ad1239 100644 --- a/debian/qf-client-svga.suid +++ b/debian/quakeforge-svga.files @@ -1 +1,2 @@ usr/games/qf-client-svga +usr/games/nq-svga diff --git a/debian/qf-client-svga.files b/debian/quakeforge-svga.suid similarity index 100% rename from debian/qf-client-svga.files rename to debian/quakeforge-svga.suid diff --git a/debian/qf-client-svga.undocumented b/debian/quakeforge-svga.undocumented similarity index 100% rename from debian/qf-client-svga.undocumented rename to debian/quakeforge-svga.undocumented diff --git a/debian/qf-client-x11.dirs b/debian/quakeforge-x11.dirs similarity index 100% rename from debian/qf-client-x11.dirs rename to debian/quakeforge-x11.dirs diff --git a/debian/qf-server.docs b/debian/quakeforge-x11.docs similarity index 100% rename from debian/qf-server.docs rename to debian/quakeforge-x11.docs diff --git a/debian/quakeforge-x11.files b/debian/quakeforge-x11.files new file mode 100644 index 000000000..e1f50b1e7 --- /dev/null +++ b/debian/quakeforge-x11.files @@ -0,0 +1,2 @@ +usr/games/qw-client-x11 +usr/games/nq-x11 diff --git a/debian/qf-client-x11.undocumented b/debian/quakeforge-x11.undocumented similarity index 100% rename from debian/qf-client-x11.undocumented rename to debian/quakeforge-x11.undocumented diff --git a/debian/rules b/debian/rules index 7a87d5688..47e43ecc6 100755 --- a/debian/rules +++ b/debian/rules @@ -19,8 +19,7 @@ configure: configure-stamp configure-stamp: dh_testdir # Add here commands to configure the package. -# [ -d CVS ] && tools/cvs2cl/cvs2cl.pl - ./bootstrap + [ -d CVS ] && ./bootstrap ./configure --prefix=/usr $(RETARGET) --bindir=/usr/games \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ @@ -33,8 +32,8 @@ build-stamp: dh_testdir # Add here commands to compile the package. + [ -d CVS ] && $(MAKE) changelog $(MAKE) - $(MAKE) changelog touch build-stamp @@ -56,7 +55,7 @@ install: build dh_installdirs # Add here commands to install the package into debian/tmp. - $(MAKE) prefix=$(tmp)/usr bindir=$(tmp)/usr/games install + $(MAKE) DESTDIR=$(tmp) install mkdir $(tmp)/etc cp debian/quakeforge.conf $(tmp)/etc @@ -79,15 +78,15 @@ binary-arch: build install dh_installexamples dh_installmenu dh_undocumented - dh_installchangelogs ChangeLog + dh_installchangelogs dh_strip dh_link dh_compress dh_fixperms + dh_makeshlibs # You may want to make some executables suid here. - chmod 4755 debian/qf-client-svga/usr/games/qf-client-svga - -chmod 4755 debian/qf-client-3dfx/usr/games/qf-client-3dfx - dh_suidregister + chmod 4755 debian/quakeforge-svga/usr/games/qw-client-svga debian/qf-svga/usr/games/nuq-svga + -chmod 4755 debian/quakeforge-3dfx/usr/games/qw-client-3dfx debian/qf-3dfx/usr/games/nuq-3dfx dh_installdeb dh_shlibdeps dh_gencontrol