improve "the Debian way" build process to produce foolscap .debs

diff --git a/GNUmakefile b/GNUmakefile
index 07b187d85bab3988190c8752c8d5ec5b1ba00007..49aa9f7745efc1da7143614c4f81d6e43a6a17b0 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -211,13 +211,28 @@ setup-feisty:
 
 
 deb-dapper: setup-dapper
-       fakeroot debian/rules binary
+       fakeroot debian/rules binary &&
+       make -C src/foolscap debian-dapper &&
+       mv src/python-foolscap*.deb .. &&
+       echo "The newly built .deb packages are in the parent directory from here."
+
 deb-sid: setup-sid
-       fakeroot debian/rules binary
+       fakeroot debian/rules binary &&
+       make -C src/foolscap debian-sid &&
+       mv src/python-foolscap*.deb .. &&
+       echo "The newly built .deb packages are in the parent directory from here."
+
 deb-edgy: setup-edgy
-       fakeroot debian/rules binary
+       fakeroot debian/rules binary &&
+       make -C src/foolscap debian-edgy &&
+       mv src/python-foolscap*.deb .. &&
+       echo "The newly built .deb packages are in the parent directory from here."
+
 deb-feisty: setup-feisty
-       fakeroot debian/rules binary
+       fakeroot debian/rules binary &&
+       make -C src/foolscap debian-feisty &&
+       mv src/python-foolscap*.deb .. &&
+       echo "The newly built .deb packages are in the parent directory from here."
 
 increment-deb-version:
        debchange --newversion $(DEBSTRING) $(DEBCOMMENTS)

diff --git a/README b/README
index c3664b278e9026836255ae9c7b0c4c52c924d654..deb55098eec54fd3ec156f65fc56326c46ae2d7e 100644 (file)
--- a/README
+++ b/README
@@ -72,6 +72,12 @@ DEPENDENCIES:
 
    http://peak.telecommunity.com/DevCenter/EasyInstall#installation-instructions
 
+   Note: the build process will automatically download and install setuptools
+   if it is not present.  However, if an old, incompatible version of
+   setuptools (< v0.6c3) is present then the build will fail.  Therefore, if
+   the build fails due to setuptools not being compatible, then either
+   upgrade or uninstall your version of setuptools and then try again.
+
  * Python PyOpenSSL (0.6 or later) (secure transport layer)
 
    http://pyopenssl.sourceforge.net
@@ -112,8 +118,9 @@ INSTALLING:
  The Debian Way:
 
   If you're running on a debian system, use 'make deb-dapper', 'make
-  deb-sid', 'make deb-edgy', or 'make deb-feisty' to construct a debian
-  package named 'allmydata-tahoe', which you can then install.
+  deb-sid', 'make deb-edgy', or 'make deb-feisty' to construct two debian
+  packages named 'allmydata-tahoe' and 'python-foolscap' which you can then
+  install.
 
  The Python Way: