From 7161000e10cb8a787c41e36c560f1de10a5a516a Mon Sep 17 00:00:00 2001 From: Jeff Teunissen Date: Sat, 25 Dec 2010 02:32:44 -0500 Subject: [PATCH] Stop running ldconfig so damn much. Also, more nuked files -- and see, I remembered there's a makefile in this dir... :) --- debian/Makefile.am | 34 ++++++++++++++------------ debian/quakeforge-alsa.postinst | 1 - debian/quakeforge-alsa.prerm | 1 - debian/quakeforge-common.postinst | 5 ---- debian/quakeforge-glx.undocumented | 2 -- debian/quakeforge-libs-gl.postinst | 9 ------- debian/quakeforge-libs-sw.postinst | 9 ------- debian/quakeforge-oss.postinst | 1 - debian/quakeforge-oss.prerm | 1 - debian/quakeforge-sdl.undocumented | 2 -- debian/quakeforge-servers.undocumented | 3 --- debian/quakeforge-sgl.undocumented | 2 -- debian/quakeforge-stub.postinst | 1 - debian/quakeforge-svga.suid | 1 - debian/quakeforge-svga.undocumented | 2 -- debian/quakeforge-x11.undocumented | 2 -- 16 files changed, 19 insertions(+), 57 deletions(-) delete mode 100644 debian/quakeforge-glx.undocumented delete mode 100644 debian/quakeforge-libs-gl.postinst delete mode 100644 debian/quakeforge-libs-sw.postinst delete mode 100644 debian/quakeforge-sdl.undocumented delete mode 100644 debian/quakeforge-servers.undocumented delete mode 100644 debian/quakeforge-sgl.undocumented delete mode 100644 debian/quakeforge-svga.suid delete mode 100644 debian/quakeforge-svga.undocumented delete mode 100644 debian/quakeforge-x11.undocumented diff --git a/debian/Makefile.am b/debian/Makefile.am index e88d8da0e..a2868e31c 100644 --- a/debian/Makefile.am +++ b/debian/Makefile.am @@ -1,19 +1,23 @@ ## Process this file with automake to produce Makefile.in AUTOMAKE_OPTIONS= foreign -EXTRA_DIST= Makefile.am Makefile.in changelog control copyright \ - qfcc.install quakeforge-alsa.install quakeforge-alsa.postinst \ - quakeforge-alsa.prerm quakeforge-common.install \ - quakeforge-common.postinst quakeforge-dev.install \ - quakeforge-glx.install quakeforge-glx.undocumented \ - quakeforge-jack.install quakeforge-libs-gl.install \ - quakeforge-libs-gl.postinst quakeforge-libs-sw.install \ - quakeforge-libs-sw.postinst quakeforge-maptools.install \ +# find -type f | sed -e 's:^\./::g' | grep -v Makefile | sort >> Makefile.am + +EXTRA_DIST= \ + changelog control copyright quakeforge.conf rules source/format \ + qfcc.install \ + quakeforge-alsa.install quakeforge-alsa.postinst quakeforge-alsa.prerm \ + quakeforge-common.install quakeforge-common.postinst \ + quakeforge-dev.install \ + quakeforge-glx.install \ + quakeforge-jack.install \ + quakeforge-libs-gl.install \ + quakeforge-libs-sw.install \ + quakeforge-maptools.install \ quakeforge-oss.install quakeforge-oss.postinst quakeforge-oss.prerm \ - quakeforge-sdl.install quakeforge-sdl.undocumented \ - quakeforge-servers.install quakeforge-servers.undocumented \ - quakeforge-sgl.install quakeforge-sgl.undocumented \ - quakeforge-stub.postinst quakeforge-svga.suid \ - quakeforge-svga.undocumented quakeforge-utils.install \ - quakeforge-x11.install quakeforge-x11.undocumented quakeforge.conf \ - rules source/format + quakeforge-sdl.install \ + quakeforge-servers.install \ + quakeforge-sgl.install \ + quakeforge-stub.postinst \ + quakeforge-utils.install \ + quakeforge-x11.install diff --git a/debian/quakeforge-alsa.postinst b/debian/quakeforge-alsa.postinst index 4ac853ba6..bd57d427d 100644 --- a/debian/quakeforge-alsa.postinst +++ b/debian/quakeforge-alsa.postinst @@ -3,5 +3,4 @@ update-alternatives --install /usr/lib/quakeforge/plugins/snd_output_default.so quakeforge-audio-default /usr/lib/quakeforge/plugins/snd_output_alsa.so 100 #DEBHELPER# - exit 0 diff --git a/debian/quakeforge-alsa.prerm b/debian/quakeforge-alsa.prerm index 67787f0c3..d3ba12e38 100644 --- a/debian/quakeforge-alsa.prerm +++ b/debian/quakeforge-alsa.prerm @@ -3,5 +3,4 @@ update-alternatives --remove quakeforge-audio-default /usr/lib/quakeforge/plugins/snd_output_alsa.so #DEBHELPER# - exit 0 diff --git a/debian/quakeforge-common.postinst b/debian/quakeforge-common.postinst index 04e77a8b9..6b9a30f55 100644 --- a/debian/quakeforge-common.postinst +++ b/debian/quakeforge-common.postinst @@ -3,10 +3,5 @@ update-alternatives --install /usr/lib/quakeforge/plugins/snd_output_default.so quakeforge-audio-default /usr/lib/quakeforge/plugins/snd_output_disk.so 10 update-alternatives --install /usr/lib/quakeforge/plugins/snd_output_default.so quakeforge-audio-default /usr/lib/quakeforge/plugins/snd_output_oss.so 20 -if [ "$1" = "configure" ]; then - ldconfig -fi - #DEBHELPER# - exit 0 diff --git a/debian/quakeforge-glx.undocumented b/debian/quakeforge-glx.undocumented deleted file mode 100644 index d4677ae66..000000000 --- a/debian/quakeforge-glx.undocumented +++ /dev/null @@ -1,2 +0,0 @@ -qw-client-glx.6 -nq-glx.6 diff --git a/debian/quakeforge-libs-gl.postinst b/debian/quakeforge-libs-gl.postinst deleted file mode 100644 index df802ec95..000000000 --- a/debian/quakeforge-libs-gl.postinst +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -e - -if [ "$1" = "configure" ]; then - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/quakeforge-libs-sw.postinst b/debian/quakeforge-libs-sw.postinst deleted file mode 100644 index df802ec95..000000000 --- a/debian/quakeforge-libs-sw.postinst +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -e - -if [ "$1" = "configure" ]; then - ldconfig -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/quakeforge-oss.postinst b/debian/quakeforge-oss.postinst index bd126ca00..d0348bc5d 100644 --- a/debian/quakeforge-oss.postinst +++ b/debian/quakeforge-oss.postinst @@ -3,5 +3,4 @@ update-alternatives --install /usr/lib/quakeforge/plugins/snd_output_default.so quakeforge-audio-default /usr/lib/quakeforge/plugins/snd_output_oss.so 90 #DEBHELPER# - exit 0 diff --git a/debian/quakeforge-oss.prerm b/debian/quakeforge-oss.prerm index d0c9f0fba..5194144b1 100644 --- a/debian/quakeforge-oss.prerm +++ b/debian/quakeforge-oss.prerm @@ -3,5 +3,4 @@ update-alternatives --remove quakeforge-audio-default /usr/lib/quakeforge/plugins/snd_output_oss.so #DEBHELPER# - exit 0 diff --git a/debian/quakeforge-sdl.undocumented b/debian/quakeforge-sdl.undocumented deleted file mode 100644 index 5b424795e..000000000 --- a/debian/quakeforge-sdl.undocumented +++ /dev/null @@ -1,2 +0,0 @@ -qw-client-sdl.6 -nq-sdl.6 diff --git a/debian/quakeforge-servers.undocumented b/debian/quakeforge-servers.undocumented deleted file mode 100644 index 0e5c41ffa..000000000 --- a/debian/quakeforge-servers.undocumented +++ /dev/null @@ -1,3 +0,0 @@ -nq-server.6 -qw-master.6 -qw-server.6 diff --git a/debian/quakeforge-sgl.undocumented b/debian/quakeforge-sgl.undocumented deleted file mode 100644 index 2688717a9..000000000 --- a/debian/quakeforge-sgl.undocumented +++ /dev/null @@ -1,2 +0,0 @@ -qw-client-sgl.6 -nq-sgl.6 diff --git a/debian/quakeforge-stub.postinst b/debian/quakeforge-stub.postinst index 0dda67a69..412500489 100644 --- a/debian/quakeforge-stub.postinst +++ b/debian/quakeforge-stub.postinst @@ -7,5 +7,4 @@ if test ! -f /usr/share/games/quake/id1/pak0.pak; then fi #DEBHELPER# - exit 0 diff --git a/debian/quakeforge-svga.suid b/debian/quakeforge-svga.suid deleted file mode 100644 index 9c2df8a2a..000000000 --- a/debian/quakeforge-svga.suid +++ /dev/null @@ -1 +0,0 @@ -usr/games/qf-client-svga diff --git a/debian/quakeforge-svga.undocumented b/debian/quakeforge-svga.undocumented deleted file mode 100644 index f442a6a23..000000000 --- a/debian/quakeforge-svga.undocumented +++ /dev/null @@ -1,2 +0,0 @@ -qw-client-svga.6 -nq-svga.6 diff --git a/debian/quakeforge-x11.undocumented b/debian/quakeforge-x11.undocumented deleted file mode 100644 index c8add93d7..000000000 --- a/debian/quakeforge-x11.undocumented +++ /dev/null @@ -1,2 +0,0 @@ -qw-client-x11.6 -nq-x11.6