From f84444b27dbd12257e5d1ead2f778dabe635a104 Mon Sep 17 00:00:00 2001
From: Bastian Kleineidam <bastian.kleineidam@web.de>
Date: Tue, 18 Dec 2012 18:54:24 +0100
Subject: [PATCH] Build fixes

---
 Makefile          | 21 +++++++++++----------
 doc/changelog.txt |  2 +-
 setup.py          |  3 ++-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 8b895e7d0..f7edae169 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,8 @@ homepage:
 	cp doc/$(LAPPNAME).1.html $(HOMEPAGE)/content
 	make -C $(HOMEPAGE) gen
 
-release: distclean releasecheck dist sign upload homepage tag register
+release: distclean releasecheck
+	$(MAKE) dist sign upload homepage tag register deb
 
 tag:
 	git tag upstream/$(VERSION)
@@ -79,9 +80,14 @@ releasecheck: check
 	@if egrep -i "xx\.|xxxx|\.xx" doc/changelog.txt > /dev/null; then \
 	  echo "Could not release: edit doc/changelog.txt release date"; false; \
 	fi
+	@if [ ! -f ../$(ARCHIVE_WIN32) ]; then \
+	  echo "Missing WIN32 distribution archive at ../$(ARCHIVE_WIN32)"; \
+	  false; \
+	fi
 	@if ! grep "Version: $(VERSION)" $(LAPPNAME).freecode > /dev/null; then \
 	  echo "Could not release: edit $(LAPPNAME).freecode version"; false; \
 	fi
+	$(PYTHON) setup.py check --restructuredtext
 
 # The check programs used here are mostly local scripts on my private system.
 # So for other developers there is no need to execute this target.
@@ -111,7 +117,7 @@ clean:
 	rm -rf build dist
 
 distclean: clean
-	rm -rf build dist $(APPNAME).egg-info dosage.prof test.sh testresults.txt
+	rm -rf build dist $(APPNAME).egg-info $(LAPPNAME).prof test.sh
 	rm -f _$(APPNAME)_configdata.py MANIFEST
 
 localbuild:
@@ -120,22 +126,17 @@ localbuild:
 test:	localbuild
 	env LANG=en_US.utf-8 http_proxy="" $(PYTHON) -m pytest $(PYTESTOPTS) $(TESTOPTS) $(TESTS)
 
-doc/$(LAPPNAME).txt: doc/$(LAPPNAME).1
-# make text file from man page for Windows builds
-	cols=`stty size | cut -d" " -f2`; stty cols 72; man -l $< | sed -e 's/.\cH//g' > $@; stty cols $$cols
-
 deb:
 # build a debian package
-	[ -f $(DEBORIGFILE) ] || cp dist/$(ARCHIVE_SOURCE) $(DEBORIGFILE) $(DEBUILDDIR)/$(LAPPNAME)_$(VERSION).orig.tar.gz
-	sed -i 's/VERSION:=.*/VERSION:=$(VERSION)/' $(DEBUILDDIR)/$(LAPPNAME).mak
+	[ -f $(DEBORIGFILE) ] || cp dist/$(ARCHIVE_SOURCE) $(DEBORIGFILE)
+	sed -i -e 's/VERSION_$(LAPPNAME):=.*/VERSION_$(LAPPNAME):=$(VERSION)/' $(DEBUILDDIR)/$(LAPPNAME).mak
 	[ -d $(DEBPACKAGEDIR) ] || (cd $(DEBUILDDIR); \
 	  patool extract $(DEBORIGFILE); \
 	  cd $(CURDIR); \
 	  git checkout debian; \
 	  cp -r debian $(DEBPACKAGEDIR); \
 	  git checkout master)
-	rm -f $(DEBUILDDIR)/$(LAPPNAME)
-	$(MAKE) -C $(DEBUILDDIR) $(LAPPNAME)
+	$(MAKE) -C $(DEBUILDDIR) $(LAPPNAME)_clean $(LAPPNAME)
 
 update-copyright:
 # update-copyright is a local tool which updates the copyright year for each
diff --git a/doc/changelog.txt b/doc/changelog.txt
index 761922101..e13bde553 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,4 +1,4 @@
-Dosage 1.7 (released xx.xx.2012)
+Dosage 1.7 (released 18.12.2012)
 
 Features:
 - cmdline: Added proper return codes for error conditions.
diff --git a/setup.py b/setup.py
index bc4ee56b0..6e4ec9909 100644
--- a/setup.py
+++ b/setup.py
@@ -355,8 +355,9 @@ args = dict(
     version = AppVersion,
     description = 'a commandline webcomic downloader and archiver',
     author = 'Tristan Seligmann, Jonathan Jacobs, Bastian Kleineidam',
+    author_email = 'bastian.kleineidam@web.de',
     maintainer = 'Bastian Kleineidam',
-    maintainer_email = 'calvin@users.sourceforge.net',
+    maintainer_email = 'bastian.kleineidam@web.de',
     license = 'MIT',
     url = 'https://github.com/wummel/dosage',
     packages = (