make debian-snapshot

make debian-snapshot

[david]

Here is a simple way to make debian packages for testing without
fussing about with pristine-tar and so on.  

The first patch changes the git snapshot versioning scheme from 0.9-2-g1234
to 0.9+2~g1234 to reduce confusion with released versions like 0.9-2

In principle this should work outside a git repo, but this is untested.

[PATCH 1/2] build system: remove dashes from git-describe generated version.

[david]

From: David Bremner <bremner@debian.org>

This makes it less confusing with released Debian versions, now that we have
non-native Debian versions.
---
 Makefile.local |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile.local b/Makefile.local
index 38f6c17..2c07bd7 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -17,7 +17,7 @@ ifneq ($(MAKECMDGOALS),release)
 ifneq ($(MAKECMDGOALS),release-message)
 ifneq ($(MAKECMDGOALS),pre-release)
 ifeq ($(IS_GIT),yes)
-VERSION:=$(shell git describe --match '[0-9.]*')
+VERSION:=$(shell git describe --match '[0-9.]*'|sed -e s/-/+/ -e s/-/~/)
 endif
 endif
 endif
-- 
1.7.6.3

[PATCH 2/2] build system: target to make a Debian snapshot package.

[david]

From: David Bremner <bremner@debian.org>

Currently this builds a native package, but since the source package
is throw away, it should not matter too much, except for the extra
warnings from lintian.

The extra +1 is so that if $(VERSION) is the same as the last released
version (for example outside a git repo) then the versions still order
correctly.
---
 Makefile.local |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/Makefile.local b/Makefile.local
index 2c07bd7..ec09f95 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -130,6 +130,17 @@ pre-release:
 	mkdir -p releases
 	mv $(TAR_FILE) $(DEB_TAR_FILE) releases
 
+.PHONY: debian-snapshot
+debian-snapshot: TMPFILE := $(shell mktemp)
+debian-snapshot:
+	make VERSION=$(VERSION) clean
+	cp debian/changelog $(TMPFILE)
+	EDITOR=/bin/true dch -v $(VERSION)+1 -D UNRELEASED 'test build, not for upload'
+	echo '3.0 (native)' > debian/source/format
+	debuild -us -uc
+	mv -f $(TMPFILE) debian/changelog
+	echo '3.0 (quilt)' > debian/source/format
+
 .PHONY: release-message
 release-message:
 	@echo "To: notmuch@notmuchmail.org"
-- 
1.7.6.3

Re: make debian-snapshot

[David Bremner]

On Wed, 12 Oct 2011 22:23:31 -0300, david@tethera.net wrote:
> Here is a simple way to make debian packages for testing without
> fussing about with pristine-tar and so on.  
> 
> The first patch changes the git snapshot versioning scheme from 0.9-2-g1234
> to 0.9+2~g1234 to reduce confusion with released versions like 0.9-2
> 

I wanted this again today test other people's patches, so I pushed it.

d