new disorder-rtp deb

diff --git a/.bzrignore b/.bzrignore
index 8704579..e9353e6 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -99,3 +99,6 @@ doc/guts
 clients/disorder-playrtp
 doc/disorder-playrtp.1.html
 doc/disorder-playrtp.1
+debian/substvars.*
+debian/disorder-playrtp
+*.bz2

diff --git a/debian/README.RTP b/debian/README.RTP
new file mode 100644 (file)
index 0000000..e7fd94b
--- /dev/null
+++ b/debian/README.RTP
@@ -0,0 +1,5 @@
+This is disorder-playrtp, a simple RTP client suitable for use with
+DisOrder.  See http://www.greenend.org.uk/rjk/disorder for further
+information.
+
+(c) 2007 Richard Kettlewell.  GPL v2 or later.

diff --git a/debian/autorules.m4 b/debian/autorules.m4
index 4dd49fe..d9a4a0c 100644 (file)
--- a/debian/autorules.m4
+++ b/debian/autorules.m4
@@ -30,7 +30,9 @@ m4_changequote([,])
 m4_define([build], [.PHONY: [build]
 [build]:
 m4_syscmd([test -f ../configure || test -f ../config.status])m4_dnl
-m4_ifelse(m4_sysval,0,[        ./configure ${CONFIGURE} ${CONFIGURE_EXTRA}
+m4_ifelse(m4_sysval,0,[        if test -f config.status; then \
+         ./config.status; else\
+         ./configure ${CONFIGURE} ${CONFIGURE_EXTRA}; fi
 ])m4_dnl
        $(MAKE) prefix=/usr])m4_dnl
 

diff --git a/debian/changelog b/debian/changelog
index dddbf0c..3db2dee 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+disorder (1.5.99+dev1) unstable; urgency=low
+
+  * New disorder-playrtp package
+
+ -- Richard Kettlewell <rjk@greenend.org.uk>  Tue, 25 Sep 2007 12:27:11 +0100
+
 disorder (1.5.99+dev) unstable; urgency=low
 
   * Intermediate version number

diff --git a/debian/control b/debian/control
index 7ce3388..a7cf9a2 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,16 @@ Architecture: any
 Section: sound
 Priority: extra
 Depends: httpd,pwgen,mpg321,vorbis-tools,sox,debconf,${shlibs:Depends}
-Conflicts: jukebox
+Suggests: disorder-playrtp
 Description: Play random or selected digital audio files continuously
  Controlled from the command line or via a web-based interface.
+
+Package: disorder-playrtp
+Architecture: any
+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.
+

diff --git a/debian/copyright b/debian/copyright
index 3450076..185918c 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ Package home page:
   http://www.greenend.org.uk/rjk/disorder/
 
 DisOrder - select and play digital audio files
-Copyright (C) 2003, 2004, 2005 Richard Kettlewell
+Copyright (C) 2003, 2004, 2005, 2006, 2007 Richard Kettlewell
 Portions extracted from MPG321, http://mpg321.sourceforge.net/
   Copyright (C) 2001 Joe Drew
   Copyright (C) (C) 2000-2001 Robert Leslie

diff --git a/debian/rules.m4 b/debian/rules.m4
index 51678c4..842f46a 100644 (file)
--- a/debian/rules.m4
+++ b/debian/rules.m4
@@ -25,6 +25,8 @@ build
 
 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/share/man/man1/disorder-playrtp.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
@@ -65,6 +67,22 @@ archpkg([disorder], [        m4_dnl
                debian/disorder/DEBIAN/.
 ])
 
+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 \
+               debian/disorder-playrtp/usr/bin/disorder-playrtp
+       $(INSTALL) -m 755 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 \
+               debian/disorder-playrtp/usr/share/doc/disorder-playrtp/README
+       $(INSTALL) -m 644 COPYING 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/man/man*/*
+])
+
 binary
 
 clean

diff --git a/lib/Makefile.am b/lib/Makefile.am
index f79435b..e9f7e43 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -78,7 +78,9 @@ definitions.h: Makefile
        echo "#define SBINDIR \"${sbindir}/\"" >> $@.new
        echo "#define BINDIR \"${bindir}/\"" >> $@.new
        echo "#define FINKBINDIR \"${finkbindir}/\"" >> $@.new
-       mv $@.new $@
+       @if cmp $@.new $@; then \
+               echo rm -f $@.new; rm -f $@.new; else \
+               echo mv $@.new $@; mv $@.new $@; fi
 defs.o: definitions.h
 defs.lo: definitions.h
 
@@ -93,4 +95,4 @@ check: test #test.i
        $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) -c $< > $@.new
        mv $@.new $@
 
-CLEANFILES=definitions.h
+CLEANFILES=definitions.h definitions.h.new