simplify build/setup of dovecot-lucene package

ppa/Makefile

@@ -1,13 +1,15 @@
+DOVECOT_VERSION=2.2.9-1ubuntu2.1+miab1
+
 all: clean build_postgrey build_dovecot_lucene
 
 clean:
 	# Clean.
 	rm -rf /tmp/build
 
+build_postgrey:
 	# Prepare to build source packages.
 	mkdir -p /tmp/build
 
-build_postgrey:
 	# Download our fork of the Debian postgrey package.
 	git clone https://github.com/mail-in-a-box/postgrey /tmp/build/postgrey
 
@@ -31,6 +33,9 @@ build_postgrey:
 	#(cd /tmp/build/postgrey; dpkg-buildpackage -us -uc -nc)
 
 build_dovecot_lucene:
+	# Prepare to build source packages.
+	mkdir -p /tmp/build
+
 	# Get the upstream source.
 	(cd /tmp/build; apt-get source dovecot)
 
@@ -41,10 +46,10 @@ build_dovecot_lucene:
 	(cd /tmp/build/dovecot-2.2.9; dpkg-buildpackage -S -us -uc -nc)
 
 	# Sign the packages.
-	debsign /tmp/build/dovecot_2.2.9-1ubuntu2.2~ppa0~trusty0_source.changes
+	debsign /tmp/build/dovecot_$(DOVECOT_VERSION)_source.changes
 
 	# Upload it.
-	dput ppa:mail-in-a-box/ppa /tmp/build/dovecot_2.2.9-1ubuntu2.2~ppa0~trusty0_source.changes
+	dput ppa:mail-in-a-box/ppa /tmp/build/dovecot_$(DOVECOT_VERSION)_source.changes
 
 	# TESTING BINARY PACKAGE
 	# Install build dependencies and build dependencies we've added in our patch,

ppa/README.md

@@ -8,6 +8,8 @@ Packages
 
 * [postgrey](https://github.com/mail-in-a-box/postgrey), with a modification to whitelist senders that are whitelisted by [dnswl.org](https://www.dnswl.org/) (i.e. don't greylist mail from them).
 
+* dovecot-lucene, [dovecot's lucene full text search plugin](http://wiki2.dovecot.org/Plugins/FTS/Lucene), which isn't built by Ubuntu's dovecot package maintainer unfortunately.
+
 Building
 --------
 
@@ -30,9 +32,9 @@ To build:
 	# Build & upload to launchpad.
 	vagrant ssh -- "cd /vagrant && make"
 
-To use on a Mail-in-a-Box box, add the PPA and then upgrade packages:
+Mail-in-a-Box adds our PPA during setup, but if you need to do that yourself for testing:
 
 	apt-add-repository ppa:mail-in-a-box/ppa
 	apt-get update
-	apt-get upgrade
+	apt-get install postgrey dovecot-lucene
 

ppa/dovecot_lucene.diff

@@ -267,7 +267,7 @@ index 0000000..3d933a5
  	dh_clean -k
  	dh_installdirs
 +	mkdir -p $(CURDIR)/debian/dovecot-lucene/usr/lib/dovecot/modules
-+	        mv $(CURDIR)/src/plugins/fts-lucene/.libs/* $(CURDIR)/debian/dovecot-lucene/usr/lib/dovecot/modules/
++	mv $(CURDIR)/src/plugins/fts-lucene/.libs/* $(CURDIR)/debian/dovecot-lucene/usr/lib/dovecot/modules/
 +
 +rest_disabled_by_miab:
  	$(MAKE) install DESTDIR=$(CURDIR)/debian/dovecot-core
@@ -298,7 +298,7 @@ index 0000000..3d933a5
 --- a/debian/changelog
 +++ a/debian/changelog
 @@ -1,3 +1,9 @@
-+dovecot (1:2.2.9-1ubuntu2.2~ppa0~trusty0) trusty; urgency=low
++dovecot (1:2.2.9-1ubuntu2.1+miab1) trusty; urgency=low
 +
 +  * Changed to just build dovecot-lucene for Mail-in-a-box PPA
 +