split out disorder-server.deb

diff --git a/.bzrignore b/.bzrignore
index b419939fb0990e4eb5ef4ab5cd67211bbd5fb69f..978ce4d59f9d63b00a0bab8773d01c76c29027b3 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -112,3 +112,4 @@ doc/plumbing.png
 disobedience/manual.h
 disobedience/manual.html
 disobedience/images.h
 disobedience/manual.h
 disobedience/manual.html
 disobedience/images.h

+debian/disorder-server

diff --git a/debian/changelog b/debian/changelog
index 726e77eea77437d0877ea06730c1ae5693a31a27..f0395fe92bf5c03f91a2a447475e66a4724d580e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+disorder (1.5.99+dev6) unstable; urgency=low
+
+  * Split disorder into disorder (base) and disorder-server
+
+ -- Richard Kettlewell <rjk@greenend.org.uk>  Wed, 31 Oct 2007 19:08:49 +0000
+

 disorder (1.5.99+dev5) unstable; urgency=low
 
   * Newer Disobedience
 disorder (1.5.99+dev5) unstable; urgency=low
 
   * Newer Disobedience

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

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

diff --git a/debian/control b/debian/control
index 0ef3d879342a36727ac1421a5814fd8c17be08d5..3b30a75ec1c7aaa0f6801d506f91ed1f325c7af9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,24 @@ Package: disorder
 Architecture: any
 Section: sound
 Priority: extra
 Architecture: any
 Section: sound
 Priority: extra

-Depends: httpd-cgi,pwgen,sox,debconf,${shlibs:Depends}
+Depends: ${shlibs:Depends}
+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,
+ 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 command-line client and the documentation.
+ You will need to install disorder-server somewhere and might want to
+ install disorder-playrtp and/or disobedience on any client machines.
+
+Package: disorder-server
+Architecture: any
+Section: sound
+Priority: extra
+Depends: disorder,httpd-cgi,pwgen,sox,debconf,${shlibs:Depends}

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


@@ -38,7 +55,7 @@ Package: disobedience
 Architecture: any
 Section: sound
 Priority: extra
 Architecture: any
 Section: sound
 Priority: extra

-Depends: ${shlibs:Depends}
+Depends: disorder,${shlibs:Depends}

 Suggests: disorder-playrtp
 Description: Controller GUI for DisOrder
  DisOrder is a software jukebox.  It can play OGG, MP3, WAV and FLAC files,
 Suggests: disorder-playrtp
 Description: Controller GUI for DisOrder
  DisOrder is a software jukebox.  It can play OGG, MP3, WAV and FLAC files,

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

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

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

diff --git a/debian/rules.m4 b/debian/rules.m4
index bd78f230944b958765c7ca1374832c2b42eec417..b0c33901f248f085a6d69095fd87576c2c67c15b 100644 (file)
--- a/debian/rules.m4
+++ b/debian/rules.m4
@@ -24,30 +24,19 @@ LIBTOOL=./libtool
 build
 
 archpkg([disorder], [  m4_dnl
 build
 
 archpkg([disorder], [  m4_dnl

-       $(MAKE) DESTDIR=`pwd`/debian/disorder staticdir=/var/www/disorder installdirs install
+       $(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C doc
+       $(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C clients
+       $(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C lib
+       $(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C scripts
+       rm -rf debian/disorder/usr/share/man/man8
+       rm -rf debian/disorder/usr/share/disorder/*.html

        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/disobedience.1
        $(MKDIR) debian/disorder/etc/disorder
        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/disobedience.1
        $(MKDIR) debian/disorder/etc/disorder

-       $(MKDIR) debian/disorder/etc/init.d
-       $(MKDIR) debian/disorder/usr/lib/cgi-bin/disorder
-       $(MKDIR) debian/disorder/var/lib/disorder
-       $(INSTALL_SCRIPT) examples/disorder.init \
-               debian/disorder/etc/init.d/disorder
-       $(INSTALL_DATA) debian/etc.disorder.config \
-               debian/disorder/etc/disorder/config
-       $(INSTALL_DATA) debian/etc.disorder.options \
-               debian/disorder/etc/disorder/options
-       $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) server/disorder.cgi \
-               $(shell pwd)/debian/disorder/usr/lib/cgi-bin/disorder/disorder

        dpkg-shlibdeps -Tdebian/substvars.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_DATA) debian/htaccess \
-               debian/disorder/usr/lib/cgi-bin/disorder/.htaccess
+               debian/disorder/usr/bin/*

        $(INSTALL_DATA) CHANGES README debian/README.Debian \
                BUGS README.* \
                debian/disorder/usr/share/doc/disorder/.
        $(INSTALL_DATA) CHANGES README debian/README.Debian \
                BUGS README.* \
                debian/disorder/usr/share/doc/disorder/.


@@ -60,6 +49,39 @@ archpkg([disorder], [        m4_dnl
                 debian/disorder/usr/share/man/man*/*
 ])
 
                 debian/disorder/usr/share/man/man*/*
 ])
 

+archpkg([disorder-server], [   m4_dnl
+       $(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C images
+       $(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C server
+       $(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C templates
+       $(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C driver
+       $(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C plugins
+       $(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C sounds
+       $(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C doc
+       rm -rf debian/disorder-server/usr/share/man/man1
+       rm -rf debian/disorder-server/usr/share/man/man3
+       rm -rf debian/disorder-server/usr/share/man/man5
+       $(MKDIR) debian/disorder-server/etc/disorder
+       $(MKDIR) debian/disorder-server/etc/init.d
+       $(MKDIR) debian/disorder-server/usr/lib/cgi-bin/disorder
+       $(MKDIR) debian/disorder-server/var/lib/disorder
+       $(INSTALL_SCRIPT) examples/disorder.init \
+               debian/disorder-server/etc/init.d/disorder
+       $(INSTALL_DATA) debian/etc.disorder.config \
+               debian/disorder-server/etc/disorder/config
+       $(INSTALL_DATA) debian/etc.disorder.options \
+               debian/disorder-server/etc/disorder/options
+       $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) server/disorder.cgi \
+               $(shell pwd)/debian/disorder-server/usr/lib/cgi-bin/disorder/disorder
+       dpkg-shlibdeps -Tdebian/substvars.disorder-server \
+               debian/disorder-server/usr/lib/cgi-bin/disorder/* \
+               debian/disorder-server/usr/sbin/* \
+               debian/disorder-server/usr/lib/disorder/*.so*
+       $(INSTALL_DATA) debian/htaccess \
+               debian/disorder-server/usr/lib/cgi-bin/disorder/.htaccess
+       rm -rf debian/disorder-server/usr/share/doc/disorder-server
+       ln -s disorder debian/disorder-server/usr/share/doc/disorder-server
+])
+

 archpkg([disorder-playrtp], [  m4_dnl
        $(MKDIR) debian/disorder-playrtp/usr/bin
        $(MKDIR) debian/disorder-playrtp/usr/share/man/man1
 archpkg([disorder-playrtp], [  m4_dnl
        $(MKDIR) debian/disorder-playrtp/usr/bin
        $(MKDIR) debian/disorder-playrtp/usr/share/man/man1


@@ -89,13 +111,10 @@ archpkg([disobedience], [  m4_dnl
                        debian/disobedience/usr/share/pixmaps
        $(INSTALL_DATA) debian/usr.share.menu.disobedience \
                debian/disobedience/usr/share/menu/disobedience
                        debian/disobedience/usr/share/pixmaps
        $(INSTALL_DATA) debian/usr.share.menu.disobedience \
                debian/disobedience/usr/share/menu/disobedience

-       $(INSTALL_DATA) debian/etc.disorder.config \
-               debian/disorder/etc/disorder/config

        dpkg-shlibdeps -Tdebian/substvars.disobedience \
                debian/disobedience/usr/bin/*
        dpkg-shlibdeps -Tdebian/substvars.disobedience \
                debian/disobedience/usr/bin/*

-       $(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*/*
+       rm -rf debian/disobedience/usr/share/doc/disobedience
+       ln -s disorder debian/disobedience/usr/share/doc/disobedience

 ])
 
 binary
 ])
 
 binary

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