From a349d8f9c4c5213c1e24a0c31f4ff4dbfda6c69c Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Sat, 17 Jan 2009 12:48:19 +0000 Subject: [PATCH] Resolve further Lintian warnings Organization: Straylight/Edgeware From: Richard Kettlewell --- debian/control | 2 +- debian/rules | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index c68691e..f171349 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,7 @@ Package: disorder-server Architecture: any Section: sound Priority: extra -Depends: disorder,httpd-cgi,sox,debconf,${shlibs:Depends},mail-transport-agent +Depends: disorder,httpd-cgi,sox,debconf,${shlibs:Depends},exim4|mail-transport-agent,adduser Suggests: disorder-playrtp,disobedience Description: Play random or selected digital audio files continuously DisOrder is a software jukebox. It can play OGG, MP3, WAV and FLAC files, diff --git a/debian/rules b/debian/rules index 236546b..470f08b 100755 --- a/debian/rules +++ b/debian/rules @@ -134,12 +134,18 @@ pkg-disorder-server: build $(INSTALL_DATA) debian/changelog \ debian/disorder-server/usr/share/doc/disorder-server/changelog.Debian gzip -9 debian/disorder-server/usr/share/doc/disorder-server/changelog.Debian - @for f in preinst postinst prerm postrm conffiles templates config; do\ + @for f in preinst postinst prerm postrm config; do\ if test -e debian/$$f.disorder-server; then\ echo $(INSTALL_SCRIPT) debian/$$f.disorder-server debian/disorder-server/DEBIAN/$$f; \ $(INSTALL_SCRIPT) debian/$$f.disorder-server debian/disorder-server/DEBIAN/$$f; \ fi;\ done + @for f in conffiles templates; do\ + if test -e debian/$$f.disorder-server; then\ + echo $(INSTALL_DATA) debian/$$f.disorder-server debian/disorder-server/DEBIAN/$$f; \ + $(INSTALL_DATA) debian/$$f.disorder-server debian/disorder-server/DEBIAN/$$f; \ + fi;\ + done $(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C images $(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C server $(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C templates @@ -151,6 +157,18 @@ pkg-disorder-server: build rm -rf debian/disorder-server/usr/share/man/man3 rm -f debian/disorder-server/usr/share/man/man5/disorder_config.5 rm -f debian/disorder-server/usr/share/man/man5/disorder_protocol.5 + find debian/disorder-server -name '*.la' -print0 | xargs -r0 rm -f + find debian/disorder-server -name '*.so.0' -print0 | xargs -r0 rm -f + @for f in debian/disorder-server/usr/lib/disorder/*.so.0.0.0; do \ + echo mv $$f $${f/.0.0.0};\ + mv $$f $${f/.0.0.0};\ + done + @for f in debian/disorder-server/usr/lib/ao/plugins*/*.so.0.0.0; do \ + echo mv $$f $${f/.0.0.0};\ + mv $$f $${f/.0.0.0};\ + done + find debian/disorder-server -name '*.so' -print0 | xargs -r0 strip --strip-unneeded + find debian/disorder-server -name '*.so' -print0 | xargs -r0 chmod -x $(MKDIR) debian/disorder-server/etc/disorder $(MKDIR) debian/disorder-server/etc/init.d $(MKDIR) debian/disorder-server${cgiexecdir} @@ -169,7 +187,7 @@ pkg-disorder-server: build dpkg-shlibdeps -Tdebian/substvars.disorder-server \ debian/disorder-server${cgiexecdir}/disorder \ debian/disorder-server/usr/sbin/* \ - debian/disorder-server/usr/lib/disorder/*.so* + debian/disorder-server/usr/lib/disorder/*.so rm -rf debian/disorder-server/usr/share/doc/disorder-server ln -s disorder debian/disorder-server/usr/share/doc/disorder-server dpkg-gencontrol -isp -pdisorder-server -Pdebian/disorder-server -Tdebian/substvars.disorder-server -- [mdw]