From 2b29171edb515deee82f3703521a09f71c75a494 Mon Sep 17 00:00:00 2001
From: Bastian Kleineidam <bastian.kleineidam@web.de>
Date: Thu, 18 Jul 2013 23:56:34 +0200
Subject: [PATCH] Replace non-working github upload API.

---
 Makefile                       | 19 ++++++++++---------
 doc/web/templates/default.html |  4 ++--
 doc/web/wokconfig              |  2 +-
 dosage.freecode                |  4 ++--
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index abf7737b5..6d7f4a86a 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,8 @@ ARCHIVE_SOURCE:=$(LAPPNAME)-$(VERSION).tar.gz
 ARCHIVE_WIN32:=$(LAPPNAME)-$(VERSION).exe
 GITUSER:=wummel
 GITREPO:=$(LAPPNAME)
-WEB_META:=doc/web/app.yaml
+WEBPAGE:=$(HOME)/public_html/dosage-webpage.git
+WEBMETA:=doc/web/app.yaml
 DEBUILDDIR:=$(HOME)/projects/debian/official
 DEBORIGFILE:=$(DEBUILDDIR)/$(LAPPNAME)_$(VERSION).orig.tar.gz
 DEBPACKAGEDIR:=$(DEBUILDDIR)/$(LAPPNAME)-$(VERSION)
@@ -39,17 +40,17 @@ sign:
 	[ -f dist/$(ARCHIVE_WIN32).asc ] || gpg --detach-sign --armor dist/$(ARCHIVE_WIN32)
 
 upload:
-	github-upload $(GITUSER) $(GITREPO) \
-	  dist/$(ARCHIVE_SOURCE) dist/$(ARCHIVE_WIN32) \
-	  dist/$(ARCHIVE_SOURCE).asc dist/$(ARCHIVE_WIN32).asc
+	cp dist/$(ARCHIVE_SOURCE) dist/$(ARCHIVE_WIN32) \
+	  dist/$(ARCHIVE_SOURCE).asc dist/$(ARCHIVE_WIN32).asc \
+	  $(WEBPAGE)/dist
 
 homepage:
 # update metadata
-	@echo "version: \"$(VERSION)\"" > $(WEB_META)
-	@echo "name: \"$(APPNAME)\"" >> $(WEB_META)
-	@echo "lname: \"$(LAPPNAME)\"" >> $(WEB_META)
-	@echo "maintainer: \"$(MAINTAINER)\"" >> $(WEB_META)
-	@echo "author: \"$(AUTHOR)\"" >> $(WEB_META)
+	@echo "version: \"$(VERSION)\"" > $(WEBMETA)
+	@echo "name: \"$(APPNAME)\"" >> $(WEBMETA)
+	@echo "lname: \"$(LAPPNAME)\"" >> $(WEBMETA)
+	@echo "maintainer: \"$(MAINTAINER)\"" >> $(WEBMETA)
+	@echo "author: \"$(AUTHOR)\"" >> $(WEBMETA)
 	git add doc/web/app.yaml
 	git commit -m "Updated webpage meta info"
 # update documentation and release website
diff --git a/doc/web/templates/default.html b/doc/web/templates/default.html
index 160cd44c9..1e9dc19f2 100644
--- a/doc/web/templates/default.html
+++ b/doc/web/templates/default.html
@@ -39,10 +39,10 @@
 <aside id="sidebar">
 <h2>Downloads</h2>
 <p>
-<a href="http://github.com/downloads/wummel/{{site.app.lname}}/{{site.app.lname}}-{{site.app.version}}.tar.gz"
+<a href="http://wummel.github.io/{{site.app.lname}}/dist/{{site.app.lname}}-{{site.app.version}}.tar.gz"
   title="Download source .tar.gz package"
   class="button"><span>{{site.app.name}}.tar.gz version {{site.app.version}}</span></a>
-<a href="http://github.com/downloads/wummel/{{site.app.lname}}/{{site.app.lname}}-{{site.app.version}}.exe"
+<a href="http://wummel.github.io/{{site.app.lname}}/dist/{{site.app.lname}}-{{site.app.version}}.exe"
   title="Download Windows .exe installer"
   class="button"><span>{{site.app.name}}.exe version {{site.app.version}}</span></a>
 </p>
diff --git a/doc/web/wokconfig b/doc/web/wokconfig
index d148777b6..293cd5053 100644
--- a/doc/web/wokconfig
+++ b/doc/web/wokconfig
@@ -1,3 +1,3 @@
 app: !include app.yaml
 output_dir: ~/public_html/dosage-webpage.git
-output_exclude: ["todo", "dosage.1.html"]
+output_exclude: ["todo", "dist", "dosage.1.html"]
diff --git a/dosage.freecode b/dosage.freecode
index dd7d4978f..7179b293e 100644
--- a/dosage.freecode
+++ b/dosage.freecode
@@ -3,9 +3,9 @@ Version: 2.5
 Hide: N
 Website-URL: http://wummel.github.io/dosage/
 Changelog-URL: https://github.com/wummel/dosage/blob/master/doc/changelog.txt
-Source-Package-URL: http://github.com/downloads/wummel/dosage/dosage-${version}.tar.gz
+Source-Package-URL: http://wummel.github.io/dosage/dist/dosage-${version}.tar.gz
 GIT-Tree-URL: https://github.com/wummel/dosage.git
-Windows-installer-URL: http://github.com/downloads/wummel/dosage/dosage-${version}.exe
+Windows-installer-URL: http://wummel.github.io/dosage/dist/dosage-${version}.exe
 
 The comics EatLiver, ICanBarelyDraw, JimBenton, MarriedToTheSea
 and NatalieDee have been added. Several comics have been fixed.