From bb4ebcfeccc733d580f7d8dbe17f9be434fff54a Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael+x200@stapelberg.de>
Date: Fri, 1 May 2009 19:57:09 +0200
Subject: [PATCH] Fix URLs, fix make release, update debian/changelog

---
 Makefile         | 8 +++++++-
 debian/changelog | 3 ++-
 debian/control   | 2 +-
 debian/copyright | 2 +-
 i3status.1       | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 7dfc5b4..0b51a6e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,8 @@ CFLAGS+=-std=gnu99
 CFLAGS+=-pedantic
 CFLAGS+=-DPREFIX=\"\"
 
+VERSION=$(shell git describe --tags --abbrev=0)
+
 ifeq ($(shell uname),Linux)
 CFLAGS+=-DLINUX
 CFLAGS+=-D_GNU_SOURCE
@@ -29,6 +31,10 @@ install:
 	install -m 644 i3status.1 $(DESTDIR)/usr/share/man/man1
 
 release:
-	tar cjf i3status.tar.bz2 *.c *.h *.1 *.conf Makefile
+	[ -f i3status-${VERSION} ] || rm -rf i3status-${VERSION}
+	mkdir i3status-${VERSION}
+	cp *.c *.h *.1 *.conf Makefile i3status-${VERSION}
+	tar cjf i3status-${VERSION}.tar.bz2 i3status-${VERSION}
+	rm -rf i3status-${VERSION}
 
 all: i3status
diff --git a/debian/changelog b/debian/changelog
index 7ba58d4..86c94fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 i3status (1.0-1) unstable; urgency=low
 
   * Initial release
+  * Closes: #526520
 
- -- Michael Stapelberg <michael+i3status@stapelberg.de>  Fri, 17 Apr 2009 13:35:00 +0200
+ -- Michael Stapelberg <michael+i3status@stapelberg.de>  Fri, 01 May 2009 19:52:45 +0200
diff --git a/debian/control b/debian/control
index be6dfc5..365668e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Michael Stapelberg <michael@stapelberg.de>
 DM-Upload-Allowed: yes
 Standards-Version: 3.7.3
-Homepage: http://michael.stapelberg.de/i3status
+Homepage: http://i3.zekjur.net/i3status
 
 Package: i3status
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 7ef35a7..a3c6e59 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 This Debian package is based on a tarball downloaded from
-http://michael.stapelberg.de/i3status
+http://i3.zekjur.net/i3status
 
 Copyright: (C) 2008 Michael Stapelberg <michael+i3status at stapelberg dot de>
 
diff --git a/i3status.1 b/i3status.1
index 4345671..417dc7c 100644
--- a/i3status.1
+++ b/i3status.1
@@ -147,4 +147,4 @@ this, please fix it and send me a patch.
 Michael Stapelberg <michael+i3status at stapelberg dot de>
 
 .SH WEBSITE
-See http://michael.stapelberg.de/i3status for the newest release.
+See http://i3.zekjur.net/i3status for the newest release.