Resolve a bunch of Lintian warnings

diff --git a/debian/postrm.disobedience b/debian/postrm.disobedience
new file mode 100755 (executable)
index 0000000..85f80a4
--- /dev/null
+++ b/debian/postrm.disobedience
@@ -0,0 +1,28 @@
+#! /bin/sh
+#
+# This file is part of DisOrder
+# Copyright (C) 2007 Richard Kettlewell
+#
+# 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 3 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, see <http://www.gnu.org/licenses/>.
+#
+
+set -e
+
+case "$1" in
+remove )
+  if type update-menus >/dev/null 2>&1; then
+    update-menus
+  fi
+  ;;
+esac

diff --git a/debian/rules b/debian/rules
index 86d835a413b69f0903bb029063ff4f0740705ce8..236546be429c4a1cfd60e1ae28cb57b6f7fc9e0e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -81,7 +81,13 @@ pkg-disorder: build
        $(INSTALL_DATA) debian/changelog \
                debian/disorder/usr/share/doc/disorder/changelog.Debian
        gzip -9 debian/disorder/usr/share/doc/disorder/changelog.Debian
-       @for f in preinst postinst prerm postrm conffiles templates config; do\
+       @for f in conffiles templates; do\
+         if test -e debian/$$f.disorder; then\
+           echo $(INSTALL_DATA) debian/$$f.disorder debian/disorder/DEBIAN/$$f; \
+           $(INSTALL_DATA) debian/$$f.disorder debian/disorder/DEBIAN/$$f; \
+         fi;\
+       done
+       @for f in preinst postinst prerm postrm config; do\
          if test -e debian/$$f.disorder; then\
            echo $(INSTALL_SCRIPT) debian/$$f.disorder debian/disorder/DEBIAN/$$f; \
            $(INSTALL_SCRIPT) debian/$$f.disorder debian/disorder/DEBIAN/$$f; \
@@ -159,6 +165,7 @@ pkg-disorder-server: build
                debian/disorder-server/etc/disorder/options.user
        $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) cgi/disorder \
                $(shell pwd)/debian/disorder-server${cgiexecdir}/disorder
+       gzip -9f debian/disorder-server/usr/share/man/man*/*
        dpkg-shlibdeps -Tdebian/substvars.disorder-server \
                debian/disorder-server${cgiexecdir}/disorder \
                debian/disorder-server/usr/sbin/* \
@@ -231,6 +238,7 @@ pkg-disobedience: build
                        debian/disobedience/usr/share/pixmaps
        $(INSTALL_DATA) debian/usr.share.menu.disobedience \
                debian/disobedience/usr/share/menu/disobedience
+       gzip -9f debian/disobedience/usr/share/man/man*/*
        dpkg-shlibdeps -Tdebian/substvars.disobedience \
                debian/disobedience/usr/bin/*
        rm -rf debian/disobedience/usr/share/doc/disobedience

diff --git a/debian/templates.disorder-server b/debian/templates.disorder-server
index f62e4043c5481a9629c713e96fff890d2acd31f7..a0888bdbfb71a187a50d517b2da9c1c32d34a547 100644 (file)
--- a/debian/templates.disorder-server
+++ b/debian/templates.disorder-server
@@ -1,20 +1,20 @@
 Template: disorder/roots
 Type: string
 Default:
-Description: Audio directories
+Description: Audio directories:
  Enter the list of directories that contain audio files (e.g. MP3 or OGG
  files) separated by spaces.
 
 Template: disorder/encoding
 Type: string
-Description: Filesystem encoding
+Description: Filesystem encoding:
  Enter your filesystem's character encoding.  Check rather than
  guessing if you are not sure.
 
 Template: disorder/scratches
 Type: string
 Default: /usr/share/disorder/slap.ogg /usr/share/disorder/scratch.ogg
-Description: Scratch files
+Description: Scratch files:
  Enter a list of files to be played when a track is scratched, separated
  by spaces.  Leave this blank if you don't want any scratch sounds.
  All filenames should be absolute path names.
@@ -22,7 +22,7 @@ Description: Scratch files
 Template: disorder/port
 Type: string
 Default: none
-Description: Port number for clients to connect to
+Description: Port number for clients to connect to:
  Enter the port number that the server should listen on for clients.  This
  can be set to 'none' to permit only local clients or a port number for
  remote clients to connect to, e.g. using Disobedience.
@@ -31,7 +31,7 @@ Template: disorder/interface
 Type: select
 Choices: local, network
 Default: local
-Description: Interface to use to play sound
+Description: Interface to use to play sound:
  'local' means the default local sound device will be used.  Use this
  if you want to play through your sound card and don't want to play on any
  other computers.
@@ -42,20 +42,20 @@ Description: Interface to use to play sound
 
 Template: disorder/mcast_address
 Type: string
-Description: Destination address for network sound transmission
+Description: Destination address for network sound transmission:
  Sound data will be sent to this address using the RTP protocol.  Users
  would use (for instance) disorder-playrtp to play it.  Typically this
  would be a multicast address but this is not mandatory.
 
 Template: disorder/mcast_port
 Type: string
-Description: Destination port for network sound transmission
+Description: Destination port for network sound transmission:
  Sound data will be sent to this UDP port using the RTP protocol.
 
 Template: disorder/mail_sender
 Type: string
 Default: 
-Description: Sender address for email from web interface
+Description: Sender address for email from web interface:
  The web interface needs to know what email address it should send messages
  from.  It is possible that users will reply to this address if they are
  unsure what to do.

diff --git a/debian/usr.share.menu.disobedience b/debian/usr.share.menu.disobedience
index 1373b95d9cd528414f607ac11dc0f8ad306e80fd..d60b8c02bb83523e19c9618de3a8cfeb32d0dccd 100644 (file)
--- a/debian/usr.share.menu.disobedience
+++ b/debian/usr.share.menu.disobedience
@@ -1,6 +1,6 @@
 ?package(disobedience):\
        needs="x11" \
-       section="Apps/Sound" \
+       section="Applications/Sound" \
        title="Disobedience" \
         icon16x16="/usr/share/pixmaps/disobedience16x16.xpm" \
         icon32x32="/usr/share/pixmaps/disobedience32x32.xpm" \