miscellaneous debianization fixes

diff --git a/debian/autorules.m4 b/debian/autorules.m4
index 16bb4311bd4d8e7ac65454a42cd61e008d26dc6f..6b98a5c3fc92364201a5c2911a8d68555d8c34f2 100644 (file)
--- a/debian/autorules.m4
+++ b/debian/autorules.m4
@@ -23,6 +23,23 @@
 INSTALL=install
 CONFIGURE=--prefix=/usr
 
+INSTALL_DATA=$(INSTALL) -p -o root -g root -m 644
+INSTALL_PROGRAM=$(INSTALL) -p -o root -g root -m 755
+INSTALL_SCRIPT=$(INSTALL) -p -o root -g root -m 755
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS=-O0 -g
+else
+CFLAGS=-O2 -g
+endif
+export CFLAGS
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+INSTALL_PROGRAM += -s
+endif
+export INSTALL_DATA
+export INSTALL_SCRIPT
+export INSTALL_PROGRAM
+
 m4_divert(-1)m4_dnl
 
 m4_changequote([,])

diff --git a/debian/changelog b/debian/changelog
index 9b68471ed949d4df352ec84d75062410febfd5f3..726e77eea77437d0877ea06730c1ae5693a31a27 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+disorder (1.5.99+dev5) unstable; urgency=low
+
+  * Newer Disobedience
+
+ -- Richard Kettlewell <rjk@greenend.org.uk>  Tue, 30 Oct 2007 18:32:25 +0000
+
 disorder (1.5.99+dev4) unstable; urgency=low
 
   * New version for newer Disobedience, playrtp

diff --git a/debian/control b/debian/control
index 98b7a233854179509a841025ecd86f6ea40bf46d..0ef3d879342a36727ac1421a5814fd8c17be08d5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,24 @@
 Source: disorder
 Maintainer: Richard Kettlewell <richard+disorder@sfere.greenend.org.uk>
+Uploaders: Ian Jackson <ian@davenant.greenend.org.uk>
 Priority: optional
-Standards-Version: 3.0.1.0
+Standards-Version: 3.7.2.2
 Build-Depends: libgc6-dev | libgc-dev, libgcrypt-dev, libdb4.3-dev, libpcre3-dev, libvorbis-dev, libmad0-dev, libasound2-dev, libao-dev, python, libflac-dev, libgtk2.0-dev
 
 Package: disorder
 Architecture: any
 Section: sound
 Priority: extra
-Depends: httpd,pwgen,sox,debconf,${shlibs:Depends}
+Depends: httpd-cgi,pwgen,sox,debconf,${shlibs:Depends}
 Suggests: disorder-playrtp,disobedience
 Description: Play random or selected digital audio files continuously
- Controlled from the command line or via a web-based interface.
+ DisOrder is a software jukebox.  It can play OGG, MP3, WAV and FLAC files,
+ and other formats with suitable configuration.  It is capable of playing
+ either via a locally attached sound device or over the network using
+ an RTP stream.  It can be managed via a web interface or the graphical
+ client Disobedience.
+ .
+ This package contains the server and the web interface.
 
 Package: disorder-playrtp
 Architecture: any
@@ -19,8 +26,13 @@ Section: sound
 Priority: extra
 Depends: ${shlibs:Depends}
 Description: Network play client for DisOrder
-  Plays RTP streams issued by DisOrder.  This is only useful if you
-  have an install of the disorder package somewhere.
+ DisOrder is a software jukebox.  It can play OGG, MP3, WAV and FLAC files,
+ and other formats with suitable configuration.  It is capable of playing
+ either via a locally attached sound device or over the network using
+ an RTP stream.
+ .
+ This package contains the RTP player.  It can play audio streams generated
+ by the server, received over a LAN.
 
 Package: disobedience
 Architecture: any
@@ -29,6 +41,10 @@ Priority: extra
 Depends: ${shlibs:Depends}
 Suggests: disorder-playrtp
 Description: Controller GUI for DisOrder
-  Allows DisOrder users to remotely control what is played, etc.
-  This is only useful if you have an install of the disorder package
-  somewhere.
+ DisOrder is a software jukebox.  It can play OGG, MP3, WAV and FLAC files,
+ and other formats with suitable configuration.  It is capable of playing
+ either via a locally attached sound device or over the network using
+ an RTP stream.
+ .
+ This package contains the graphical client for controlling the
+ DisOrder software jukebox over a network.

diff --git a/debian/copyright b/debian/copyright
index 185918c80095556170fcdafd43240aa5e148d032..3a4abe5da09be4d1f1e7dd53c1e4ddda688fbf34 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,9 @@
 Package home page:
   http://www.greenend.org.uk/rjk/disorder/
 
+Packaged by:
+  Richard Kettlewell <rjk@greenend.org.uk>
+
 DisOrder - select and play digital audio files
 Copyright (C) 2003, 2004, 2005, 2006, 2007 Richard Kettlewell
 Portions extracted from MPG321, http://mpg321.sourceforge.net/
@@ -22,3 +25,6 @@ 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+On Debian systems, look in /usr/share/common-licenses/GPL for a copy
+of the GPL.

diff --git a/debian/postinst.disorder b/debian/postinst.disorder
index ae5e11d4e710f7ee28ec1118e1e8c8cc3ef89905..53402b55815cc448ae7d4ccadd508c8d4a74dca7 100755 (executable)
--- a/debian/postinst.disorder
+++ b/debian/postinst.disorder
@@ -1,7 +1,7 @@
 #! /bin/sh
 #
 # This file is part of DisOrder
-# Copyright (C) 2004 Richard Kettlewell
+# Copyright (C) 2004, 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
@@ -44,15 +44,16 @@ configure )
     add_jukebox_user
   fi
   if test ! -f /etc/disorder/config.private; then
-    # pwgen in debian stable has insane exit status
-    set +e
     rootpw=`pwgen 16 1`
     webpw=`pwgen 16 1`
-    set -e
     if test -z "$rootpw" || test -z "$webpw"; then
+      # We used to ignore the exit status of pwgen due to a bug in an old
+      # version of Debian.  That bug seems to be gone, but this check is
+      # harmless and could catch future bugs.
       echo "$0: pwgen failed" 1>&2
       exit 1
     fi
+    # We set the umask so that private files aren't transiently world-readable
     u=`umask`
     umask 077
 
@@ -82,11 +83,7 @@ configure )
   chown jukebox:jukebox /var/lib/disorder
   configure_init_d
   restart_server
-  if test ! -e /etc/disorder/http.users; then
-    touch /etc/disorder/http.users
-  fi
   db_stop
-  ldconfig -n /usr/lib
   ;;
 abort-upgrade )
   /etc/init.d/disorder restart

diff --git a/debian/postrm.disorder b/debian/postrm.disorder
index 614376ccc7e8bbba11ffc6f932eecf2a723c134e..c2084d699380d3c2e1b75fc400230bad2a2ca506 100755 (executable)
--- a/debian/postrm.disorder
+++ b/debian/postrm.disorder
@@ -1,7 +1,7 @@
 #! /bin/sh
 #
 # This file is part of DisOrder
-# Copyright (C) 2004 Richard Kettlewell
+# Copyright (C) 2004, 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
@@ -21,9 +21,6 @@
 set -e
 
 case "$1" in
-remove )
-  ldconfig -n /usr/lib
-  ;;
 purge )
   if [ -e /usr/share/debconf/confmodule ]; then
     . /usr/share/debconf/confmodule

diff --git a/debian/rules.m4 b/debian/rules.m4
index 2be1ffd9f02bde4e589e857a62f1d5feea54c446..7c505080a8958fe90112fc5173084b1a96db457b 100644 (file)
--- a/debian/rules.m4
+++ b/debian/rules.m4
@@ -33,70 +33,61 @@ archpkg([disorder], [       m4_dnl
        mkdir -m 755 -p debian/disorder/etc/init.d
        mkdir -m 755 -p debian/disorder/usr/lib/cgi-bin/disorder
        mkdir -m 755 -p debian/disorder/var/lib/disorder
-       mkdir -m 755 -p debian/disorder/usr/share/doc/disorder/ChangeLog.d
-       $(INSTALL) -m 755 examples/disorder.init \
+       $(INSTALL_SCRIPT) examples/disorder.init \
                debian/disorder/etc/init.d/disorder
-       $(INSTALL) -m 644 debian/etc.disorder.config \
+       $(INSTALL_DATA) debian/etc.disorder.config \
                debian/disorder/etc/disorder/config
-       $(INSTALL) -m 644 debian/etc.disorder.options \
+       $(INSTALL_DATA) debian/etc.disorder.options \
                debian/disorder/etc/disorder/options
-       $(LIBTOOL) --mode=install $(INSTALL) -m 755 server/disorder.cgi \
+       $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) server/disorder.cgi \
                $(shell pwd)/debian/disorder/usr/lib/cgi-bin/disorder/disorder
        dpkg-shlibdeps -Tdebian/substvars.disorder \
                debian/disorder/usr/bin/* \
                debian/disorder/usr/lib/cgi-bin/disorder/* \
                debian/disorder/usr/sbin/* \
                debian/disorder/usr/lib/disorder/*.so*
-       $(INSTALL) -m 644 debian/htaccess \
+       $(INSTALL_DATA) debian/htaccess \
                debian/disorder/usr/lib/cgi-bin/disorder/.htaccess
-       $(INSTALL) -m 644 CHANGES README debian/README.Debian \
+       $(INSTALL_DATA) CHANGES README debian/README.Debian \
                BUGS README.* \
                debian/disorder/usr/share/doc/disorder/.
-       $(INSTALL) -m 644 ChangeLog.d/*--* \
-               debian/disorder/usr/share/doc/disorder/ChangeLog.d
-       $(INSTALL) -m 644 COPYING debian/disorder/usr/share/doc/disorder/GPL
-       gzip -9f debian/disorder/usr/share/doc/disorder/ChangeLog.d/*--* \
+       bzr log > debian/disorder/usr/share/doc/disorder/changelog
+       gzip -9f debian/disorder/usr/share/doc/disorder/changelog \
                 debian/disorder/usr/share/doc/disorder/CHANGES \
                 debian/disorder/usr/share/doc/disorder/README \
                 debian/disorder/usr/share/doc/disorder/README.* \
                 debian/disorder/usr/share/doc/disorder/BUGS \
-                debian/disorder/usr/share/doc/disorder/GPL \
                 debian/disorder/usr/share/man/man*/*
 ])
 
 archpkg([disorder-playrtp], [  m4_dnl
        mkdir -p debian/disorder-playrtp/usr/bin
        mkdir -p debian/disorder-playrtp/usr/share/man/man1
-       $(INSTALL) -m 755 clients/disorder-playrtp \
+       $(INSTALL_PROGRAM) clients/disorder-playrtp \
                debian/disorder-playrtp/usr/bin/disorder-playrtp
-       $(INSTALL) -m 755 doc/disorder-playrtp.1 \
+       $(INSTALL_DATA) doc/disorder-playrtp.1 \
                debian/disorder-playrtp/usr/share/man/man1/disorder-playrtp.1
        dpkg-shlibdeps -Tdebian/substvars.disorder-playrtp \
                debian/disorder-playrtp/usr/bin/*
-       $(INSTALL) -m 644 debian/README.RTP \
+       $(INSTALL_DATA) debian/README.RTP \
                debian/disorder-playrtp/usr/share/doc/disorder-playrtp/README
-       $(INSTALL) -m 644 COPYING debian/disorder-playrtp/usr/share/doc/disorder-playrtp/GPL
-       $(INSTALL) -m 644 CHANGES debian/disorder-playrtp/usr/share/doc/disorder-playrtp/CHANGES
-       gzip -9f debian/disorder-playrtp/usr/share/doc/disorder-playrtp/GPL \
-                debian/disorder-playrtp/usr/share/doc/disorder-playrtp/CHANGES \
+       $(INSTALL_DATA) CHANGES debian/disorder-playrtp/usr/share/doc/disorder-playrtp/CHANGES
+       gzip -9f debian/disorder-playrtp/usr/share/doc/disorder-playrtp/CHANGES \
                 debian/disorder-playrtp/usr/share/man/man*/*
 ])
 
 archpkg([disobedience], [      m4_dnl
        mkdir -p debian/disobedience/usr/bin
        mkdir -p debian/disobedience/usr/share/man/man1
-       $(INSTALL) -m 755 disobedience/disobedience \
-               debian/disobedience/usr/bin/disobedience
-       $(INSTALL) -m 755 doc/disobedience.1 \
+       $(MAKE) -C disobedience install DESTDIR=`pwd`/debian/disobedience
+       $(INSTALL_DATA) doc/disobedience.1 \
                debian/disobedience/usr/share/man/man1/disobedience.1
-       $(INSTALL) -m 644 debian/etc.disorder.config \
+       $(INSTALL_DATA) debian/etc.disorder.config \
                debian/disorder/etc/disorder/config
        dpkg-shlibdeps -Tdebian/substvars.disobedience \
                debian/disobedience/usr/bin/*
-       $(INSTALL) -m 644 COPYING debian/disobedience/usr/share/doc/disobedience/GPL
-       $(INSTALL) -m 644 CHANGES debian/disobedience/usr/share/doc/disobedience/CHANGES
-       gzip -9f debian/disobedience/usr/share/doc/disobedience/GPL \
-                debian/disobedience/usr/share/doc/disobedience/CHANGES \
+       $(INSTALL_DATA) CHANGES debian/disobedience/usr/share/doc/disobedience/CHANGES
+       gzip -9f debian/disobedience/usr/share/doc/disobedience/CHANGES \
                 debian/disobedience/usr/share/man/man*/*
 ])
 

diff --git a/examples/disorder.init.in b/examples/disorder.init.in
index f09cbca98b146ee3b038da07c0d194a308cca3c3..06a5c0fbbc730fb941ad4e2976095499282a2255 100644 (file)
--- a/examples/disorder.init.in
+++ b/examples/disorder.init.in
@@ -1,7 +1,7 @@
 #! /bin/sh
 #
 # This file is part of DisOrder.
-# Copyright (C) 2004, 2005 Richard Kettlewell
+# Copyright (C) 2004, 2005, 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
@@ -30,26 +30,26 @@ start() {
   if ${CLIENT} >/dev/null 2>&1; then
     : already running
   else
-    printf "Starting disorderd... "
+    printf "Starting DisOrder server: disorderd"
     ${DAEMON}
-    echo done
+    echo .
   fi
 }
 
 stop() {
   if ${CLIENT} >/dev/null 2>&1; then
-    printf "Stopping disorderd... "
+    printf "Stopping DisOrder server: disorderd"
     ${CLIENT} shutdown
-    echo done
+    echo .
   else
     : not running
   fi
 }
 
 reload() {
-  printf "Reconfiguring disorderd... "
+  printf "Reloading DisOrder server configuration..."
   ${CLIENT} reconfigure
-  echo done
+  echo done.
 }
 
 restart() {