separate disobedience package; debconf now asks for a port number

diff --git a/.bzrignore b/.bzrignore
index e9353e60f4d361abef98e4f4985ddf9e1da7b514..c6956e1ca595a8fcb14125a321009bf125dba385 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -102,3 +102,4 @@ doc/disorder-playrtp.1
 debian/substvars.*
 debian/disorder-playrtp
 *.bz2
 debian/substvars.*
 debian/disorder-playrtp
 *.bz2

+debian/disobedience

diff --git a/debian/autorules.m4 b/debian/autorules.m4
index d9a4a0cb067584aa390aa95a19c985060d1e442e..16bb4311bd4d8e7ac65454a42cd61e008d26dc6f 100644 (file)
--- a/debian/autorules.m4
+++ b/debian/autorules.m4
@@ -58,6 +58,12 @@ pkg-$1: [build]
        cp debian/changelog \
                debian/$1/usr/share/doc/$1/changelog.Debian
        gzip -9 debian/$1/usr/share/doc/$1/changelog.Debian
        cp debian/changelog \
                debian/$1/usr/share/doc/$1/changelog.Debian
        gzip -9 debian/$1/usr/share/doc/$1/changelog.Debian

+       @for f in preinst postinst prerm postrm conffiles templates config; do\
+         if test -e debian/$$f.$1; then\
+           echo cp debian/$$f.$1 debian/$1/DEBIAN/$$f; \
+           cp debian/$$f.$1 debian/$1/DEBIAN/$$f; \
+         fi;\
+       done

 $2     dpkg-gencontrol -isp -p$1 -Pdebian/$1 -Tdebian/substvars.$1
        chown -R root:root debian/$1
        chmod -R g-ws debian/$1
 $2     dpkg-gencontrol -isp -p$1 -Pdebian/$1 -Tdebian/substvars.$1
        chown -R root:root debian/$1
        chmod -R g-ws debian/$1

diff --git a/debian/conffiles b/debian/conffiles.disorder
similarity index 100%
rename from debian/conffiles
rename to debian/conffiles.disorder

diff --git a/debian/config b/debian/config.disorder
similarity index 71%
rename from debian/config
rename to debian/config.disorder
index d0ee037b974c7010a65e90cde6e90d169c770b40..3389538c738b10db159a414ba0429030489166eb 100755 (executable)
--- a/debian/config
+++ b/debian/config.disorder
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
 #!/bin/sh
 #

-# 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
 #
 # 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


@@ -24,6 +24,7 @@ set -e
 
 db_input high disorder/roots || true
 db_input high disorder/encoding || true
 
 db_input high disorder/roots || true
 db_input high disorder/encoding || true

+db_input high disorder/port || true

 db_input medium disorder/scratches || true
 db_input medium disorder/server-name || true
 db_go || true
 db_input medium disorder/scratches || true
 db_input medium disorder/server-name || true
 db_go || true


@@ -36,6 +37,8 @@ db_get disorder/encoding || true
 encoding="$RET"
 db_get disorder/server-name || true
 server_name="$RET"
 encoding="$RET"
 db_get disorder/server-name || true
 server_name="$RET"

+db_get disorder/port || true
+port="$RET"

 
 mkdir -p /etc/disorder
 cat > /etc/disorder/conf.debconf.new <<EOF
 
 mkdir -p /etc/disorder
 cat > /etc/disorder/conf.debconf.new <<EOF


@@ -43,12 +46,23 @@ cat > /etc/disorder/conf.debconf.new <<EOF
 # do not edit manually
 # run 'dpkg-reconfigure disorder' instead
 EOF
 # do not edit manually
 # run 'dpkg-reconfigure disorder' instead
 EOF

+echo >> /etc/disorder/conf.debconf.new
+echo "# Collection roots"  >> /etc/disorder/conf.debconf.new

 for r in $roots; do
   echo "collection fs $encoding $r" >> /etc/disorder/conf.debconf.new
 done
 for r in $roots; do
   echo "collection fs $encoding $r" >> /etc/disorder/conf.debconf.new
 done

+echo >> /etc/disorder/conf.debconf.new
+echo "# Scratches" >> /etc/disorder/conf.debconf.new

 for s in $scratches; do
   echo "scratch $s" >> /etc/disorder/conf.debconf.new
 done
 for s in $scratches; do
   echo "scratch $s" >> /etc/disorder/conf.debconf.new
 done

+echo >> /etc/disorder/conf.debconf.new
+echo "# Canonical URL of web interface" >> /etc/disorder/conf.debconf.new

 echo "url http://$server_name/cgi-bin/disorder/disorder" >> /etc/disorder/conf.debconf.new
 echo "url http://$server_name/cgi-bin/disorder/disorder" >> /etc/disorder/conf.debconf.new

+if test "$port" != none && test "$port" != ""; then
+  echo >> /etc/disorder/conf.debconf.new
+  echo "# Listen for remote clients" >> /etc/disorder/conf.debconf.new
+  echo "listen 0.0.0.0 $port" >> /etc/disorder/conf.debconf.new
+fi

 
 mv /etc/disorder/conf.debconf.new /etc/disorder/conf.debconf
 
 mv /etc/disorder/conf.debconf.new /etc/disorder/conf.debconf

diff --git a/debian/control b/debian/control
index a7cf9a2f751779521f2058d66ff8726a7e969bc0..f02e0cbfe04230b9ca3b674db2bf3cf1dc8ad190 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Architecture: any
 Section: sound
 Priority: extra
 Depends: httpd,pwgen,mpg321,vorbis-tools,sox,debconf,${shlibs:Depends}
 Section: sound
 Priority: extra
 Depends: httpd,pwgen,mpg321,vorbis-tools,sox,debconf,${shlibs:Depends}

-Suggests: disorder-playrtp
+Suggests: disorder-playrtp,disobedience

 Description: Play random or selected digital audio files continuously
  Controlled from the command line or via a web-based interface.
 
 Description: Play random or selected digital audio files continuously
  Controlled from the command line or via a web-based interface.
 


@@ -22,3 +22,13 @@ 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.
 
   Plays RTP streams issued by DisOrder.  This is only useful if you
   have an install of the disorder package somewhere.
 

+Package: disobedience
+Architecture: any
+Section: sound
+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.

diff --git a/debian/disorder.config b/debian/etc.disorder.config
similarity index 100%
rename from debian/disorder.config
rename to debian/etc.disorder.config

diff --git a/debian/options.debian b/debian/etc.disorder.options
similarity index 100%
rename from debian/options.debian
rename to debian/etc.disorder.options

diff --git a/debian/postinst b/debian/postinst.disorder
similarity index 100%
rename from debian/postinst
rename to debian/postinst.disorder

diff --git a/debian/postrm b/debian/postrm.disorder
similarity index 100%
rename from debian/postrm
rename to debian/postrm.disorder

diff --git a/debian/prerm b/debian/prerm.disorder
similarity index 100%
rename from debian/prerm
rename to debian/prerm.disorder

diff --git a/debian/rules.m4 b/debian/rules.m4
index 842f46abb2f33d56618646ed53fc2bc0d86d8a44..2be1ffd9f02bde4e589e857a62f1d5feea54c446 100644 (file)
--- a/debian/rules.m4
+++ b/debian/rules.m4
@@ -26,7 +26,9 @@ build
 archpkg([disorder], [  m4_dnl
        $(MAKE) DESTDIR=`pwd`/debian/disorder staticdir=/var/www/disorder installdirs install
        rm -f debian/disorder/usr/bin/disorder-playrtp
 archpkg([disorder], [  m4_dnl
        $(MAKE) DESTDIR=`pwd`/debian/disorder staticdir=/var/www/disorder installdirs install
        rm -f debian/disorder/usr/bin/disorder-playrtp

+       rm -f debian/disorder/usr/bin/disobedience

        rm -f debian/disorder/usr/share/man/man1/disorder-playrtp.1
        rm -f debian/disorder/usr/share/man/man1/disorder-playrtp.1

+       rm -f debian/disorder/usr/share/man/man1/disobedience.1

        mkdir -m 755 -p debian/disorder/etc/disorder
        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/etc/disorder
        mkdir -m 755 -p debian/disorder/etc/init.d
        mkdir -m 755 -p debian/disorder/usr/lib/cgi-bin/disorder


@@ -34,9 +36,9 @@ archpkg([disorder], [ m4_dnl
        mkdir -m 755 -p debian/disorder/usr/share/doc/disorder/ChangeLog.d
        $(INSTALL) -m 755 examples/disorder.init \
                debian/disorder/etc/init.d/disorder
        mkdir -m 755 -p debian/disorder/usr/share/doc/disorder/ChangeLog.d
        $(INSTALL) -m 755 examples/disorder.init \
                debian/disorder/etc/init.d/disorder

-       $(INSTALL) -m 644 debian/disorder.config \
+       $(INSTALL) -m 644 debian/etc.disorder.config \

                debian/disorder/etc/disorder/config
                debian/disorder/etc/disorder/config

-       $(INSTALL) -m 644 debian/options.debian \
+       $(INSTALL) -m 644 debian/etc.disorder.options \

                debian/disorder/etc/disorder/options
        $(LIBTOOL) --mode=install $(INSTALL) -m 755 server/disorder.cgi \
                $(shell pwd)/debian/disorder/usr/lib/cgi-bin/disorder/disorder
                debian/disorder/etc/disorder/options
        $(LIBTOOL) --mode=install $(INSTALL) -m 755 server/disorder.cgi \
                $(shell pwd)/debian/disorder/usr/lib/cgi-bin/disorder/disorder


@@ -60,11 +62,6 @@ archpkg([disorder], [        m4_dnl
                 debian/disorder/usr/share/doc/disorder/BUGS \
                 debian/disorder/usr/share/doc/disorder/GPL \
                 debian/disorder/usr/share/man/man*/*
                 debian/disorder/usr/share/doc/disorder/BUGS \
                 debian/disorder/usr/share/doc/disorder/GPL \
                 debian/disorder/usr/share/man/man*/*

-       $(INSTALL) -m 755 debian/postinst debian/prerm debian/postrm \
-               debian/config \
-               debian/disorder/DEBIAN/.
-       $(INSTALL) -m 644 debian/conffiles debian/templates \
-               debian/disorder/DEBIAN/.

 ])
 
 archpkg([disorder-playrtp], [  m4_dnl
 ])
 
 archpkg([disorder-playrtp], [  m4_dnl


@@ -79,10 +76,30 @@ archpkg([disorder-playrtp], [       m4_dnl
        $(INSTALL) -m 644 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 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 \
        gzip -9f debian/disorder-playrtp/usr/share/doc/disorder-playrtp/GPL \

+                debian/disorder-playrtp/usr/share/doc/disorder-playrtp/CHANGES \

                 debian/disorder-playrtp/usr/share/man/man*/*
 ])
 
                 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 \
+               debian/disobedience/usr/share/man/man1/disobedience.1
+       $(INSTALL) -m 644 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 \
+                debian/disobedience/usr/share/man/man*/*
+])
+

 binary
 
 clean
 binary
 
 clean

diff --git a/debian/templates b/debian/templates.disorder
similarity index 73%
rename from debian/templates
rename to debian/templates.disorder
index a6712d1cd3ddd432ecc9fcf0c05e49f99cb8eb2f..fcb1594bb565273466db81b2f2e95222435987f4 100644 (file)
--- a/debian/templates
+++ b/debian/templates.disorder
@@ -26,3 +26,10 @@ Default: localhost
 Description: Web server hostname
  Enter the hostname that the web interface will appear under.
 
 Description: Web server hostname
  Enter the hostname that the web interface will appear under.
 

+Template: disorder/port
+Type: string
+Default: none
+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.

diff --git a/doc/disobedience.1.in b/doc/disobedience.1.in
index c9c9fe74f47e7e4fa1b5173250ac72d33bdf91f0..82916fb125dfe8e4f9effde508b29c593ac6d4c1 100644 (file)
--- a/doc/disobedience.1.in
+++ b/doc/disobedience.1.in
@@ -27,6 +27,19 @@ disobedience \- GUI client for DisOrder jukebox
 is a graphical client for DisOrder.  It is a work in progress and many features
 are not implemented yet.  However everything in this man page is either
 implemented or marked as missing.
 is a graphical client for DisOrder.  It is a work in progress and many features
 are not implemented yet.  However everything in this man page is either
 implemented or marked as missing.

+.SH "SETTING UP"
+You might use commands such as the following to set up a standalone instance of
+Disobedience:
+.PP
+.RS
+.nf
+cd
+mkdir .disorder
+echo password <your password> > .disorder/passwd
+echo connect <hostname> <port> >> .disorder/passwd
+chmod 600 .disorder/passwd
+.fi
+.RE

 .SH OPTIONS
 .TP
 .B --config \fIPATH\fR, \fB-c \fIPATH
 .SH OPTIONS
 .TP
 .B --config \fIPATH\fR, \fB-c \fIPATH