From 71b49a3c5c2b79566e86fcfa124a780e72070dd7 Mon Sep 17 00:00:00 2001
Message-Id: <71b49a3c5c2b79566e86fcfa124a780e72070dd7.1714928602.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Fri, 2 Nov 2007 22:26:00 +0000
Subject: [PATCH] miscellaneous distribution changes
Organization: Straylight/Edgeware

From: Richard Kettlewell <rjk@greenend.org.uk>

---
 .bzrignore         |  2 ++
 Makefile.am        |  5 ++++-
 debian/Makefile.am |  8 +++++---
 debian/control     |  2 +-
 debian/rules.m4    | 20 ++++++++++++++++++++
 driver/Makefile.am |  7 ++++++-
 lib/Makefile.am    |  2 +-
 7 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/.bzrignore b/.bzrignore
index 4fd0909..a9aab7e 100644
--- 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 13f7727..0b6f5a7 100644
--- 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 162d244..e9d5108 100644
--- 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 3b30a75..45ce7e7 100644
--- 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 b0c3390..7e92aca 100644
--- 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 64da99d..7ccc4bf 100644
--- 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 d641036..dc6518d 100644
--- 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
 
-- 
[mdw]