miscellaneous distribution changes

diff --git a/.bzrignore b/.bzrignore
index 4fd09091de8044f3e8181395c487d69036c5e09c..a9aab7eae8ec80331b56e3d18da54a838b990e0d 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -116,3 +116,5 @@ debian/disorder-server
 doc/disorder-stats.8
 doc/disorder-stats.8.html
 server/disorder-stats
+*.deb
+*.dsc

diff --git a/Makefile.am b/Makefile.am
index 13f7727c6918fff63c9a6bb52f6228d7f005b519..0b6f5a744a3c3f09b2d9e8dfa2206d6b7e533c8e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
 #
 
 EXTRA_DIST=TODO CHANGES README.streams BUGS ChangeLog.d        \
-README.upgrades README.client
+README.upgrades README.client README.mac README.raw
 SUBDIRS=@subdirs@
 
 dist-hook:
@@ -27,3 +27,6 @@ dist-hook:
 
 echo-distdir:
        @echo $(distdir)
+
+echo-version:
+       @echo $(VERSION)

diff --git a/debian/Makefile.am b/debian/Makefile.am
index 162d2443d79960a45a96294a4cb397ffd149f14c..e9d5108adb4b3f775c32bfd3fb6c1d7ff9634e34 100644 (file)
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -29,9 +29,11 @@ rules: ${autorules_m4} ${rules_m4}
        chmod 555 rules.tmp
        mv -f rules.tmp rules
 
-EXTRA_DIST=README.Debian autorules.m4 config.disorder control copyright \
+EXTRA_DIST=README.Debian autorules.m4 config.disorder-server control \
+          copyright README.RTP \
           etc.disorder.options etc.disorder.config htaccess \
-          postinst.disorder prerm.disorder postrm.disorder \
-          templates.disorder conffiles.disorder \
+          postinst.disorder-server prerm.disorder-server \
+          postrm.disorder-server \
+          templates.disorder-server conffiles.disorder-server \
           rules.m4 rules changelog usr.share.menu.disobedience \
           postinst.disobedience

diff --git a/debian/control b/debian/control
index 3b30a75ec1c7aaa0f6801d506f91ed1f325c7af9..45ce7e7e141c012f1dd67d83c3bba882bb2b53d3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: disorder
-Maintainer: Richard Kettlewell <richard+disorder@sfere.greenend.org.uk>
+Maintainer: Richard Kettlewell <debian-disorder@greenend.org.uk>
 Uploaders: Ian Jackson <ian@davenant.greenend.org.uk>
 Priority: optional
 Standards-Version: 3.7.2.2

diff --git a/debian/rules.m4 b/debian/rules.m4
index b0c33901f248f085a6d69095fd87576c2c67c15b..7e92aca1184b97837f62e0dde52c4404fd94798a 100644 (file)
--- a/debian/rules.m4
+++ b/debian/rules.m4
@@ -20,6 +20,7 @@
 
 CONFIGURE=--prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --mandir=/usr/share/man
 LIBTOOL=./libtool
+FAKEROOT=fakeroot
 
 build
 
@@ -117,6 +118,25 @@ archpkg([disobedience], [  m4_dnl
        ln -s disorder debian/disobedience/usr/share/doc/disobedience
 ])
 
+DEBVERSION:=$(shell dpkg-parsechangelog|awk '/Version:/ {print $$2}')
+DSC:=disorder_$(DEBVERSION).dsc
+DEBSRC:=disorder_$(DEBVERSION).tar.gz
+VERSION:=$(shell $(MAKE) echo-version)
+
+source:
+       $(MAKE) dist
+       rm -rf disorder-$(VERSION)
+       tar xfz disorder-$(VERSION).tar.gz
+       dpkg-source -b disorder-$(VERSION)
+       rm -rf disorder-$(VERSION) disorder-$(VERSION).tar.gz
+
+source-check: source
+       rm -rf disorder-$(DEBVERSION)
+       dpkg-source -x $(DSC)
+       cd disorder-$(DEBVERSION) && dpkg-buildpackage -r$(FAKEROOT)
+
+.PHONY: source source-check
+
 binary
 
 clean

diff --git a/driver/Makefile.am b/driver/Makefile.am
index 64da99d56144e1ef93a5e1ff412c4f33d1dc55be..7ccc4bf7ddede9db4ab6876eedc544264ecbb0a7 100644 (file)
--- a/driver/Makefile.am
+++ b/driver/Makefile.am
@@ -28,9 +28,14 @@ AM_CPPFLAGS=-I${top_srcdir}/lib
 libdisorder_la_SOURCES=disorder.c
 libdisorder_la_LDFLAGS=-module
 
+install-data-hook:
+
 # Link ao driver into right location.  If you have some other location then
 # you'll need to modify this or link it manually.
-install-data-hook:
+#
+# We don't mess with this for now; since disorder-decode covers some common
+# cases, the libao driver is less useful than it was.
+link-ao-driver:
        @if test -d ${DESTDIR}${finkaolibdir} \
           && test ${finkaolibdir} != ${aolibdir}; then \
          echo rm -f ${DESTDIR}${finkaolibdir}/libdisorder.*; \

diff --git a/lib/Makefile.am b/lib/Makefile.am
index d64103607f60056629ed1d29f075f457c5563b1b..dc6518d27a3ca0a9f323a6958b42267c3c564c1b 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -69,7 +69,7 @@ libdisorder_a_SOURCES=charset.c charset.h             \
        vacopy.h                                        \
        vector.c vector.h                               \
        wav.h wav.c                                     \
-       words.c words.h casefold.h unicodegc.h          \
+       words.c words.h                                 \
        wstat.c wstat.h                                 \
        disorder.h