updated to new release

moved to originial upstream since moving redirector mode is pointless

5 files changed, 23 insertions, 49 deletions

diff --git a/.gitignore b/.gitignore
index 2e6ca75..8c4dbd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /acmetool.*
-/.gopath
+/acmetool-*.tar.gz
diff --git a/bootstrap.sh b/bootstrap.sh
index d1f7e77..691af72 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,46 +1,15 @@
 #!/bin/sh
 
-set -e
-
-export GOPATH=`pwd`/.gopath
-
-echo -n "Fetching (go get) source ... "
-go get -d github.com/equinox0815/acme/cmd/acmetool
-echo "done."
-
-echo -n "Switching to correct branch ... "
-git -C $GOPATH/src/github.com/equinox0815/acme/cmd/acmetool co seperate-redirector > /dev/null 2>&1
-echo "done."
-
-echo -n "Building acmetool ... "
-export CGO_ENABLED=0
-export GOOS=linux
-
-export GOARCH=amd64
-go build -a -o acmetool.amd64 github.com/equinox0815/acme/cmd/acmetool
-echo -n "amd64 "
-
-export GOARCH=386
-go build -a -o acmetool.i386 github.com/equinox0815/acme/cmd/acmetool
-echo -n "i386 "
-
-export GOARCH=arm64
-go build -a -o acmetool.arm64 github.com/equinox0815/acme/cmd/acmetool
-echo -n "arm64 "
-
-export GOARCH=arm
-export GOARM=7
-go build -a -o acmetool.armhf github.com/equinox0815/acme/cmd/acmetool
-echo -n "armhf "
-
-export GOARCH=arm
-export GOARM=6
-go build -a -o acmetool.raspbian github.com/equinox0815/acme/cmd/acmetool
-echo -n "raspbian "
-
-export GOARCH=arm
-export GOARM=5
-go build -a -o acmetool.armel github.com/equinox0815/acme/cmd/acmetool
-echo -n "armel "
-
-echo " ... done."
+VERSION=0.0.20
+
+echo -n "Fetching release tarballs ... "
+for arch in amd64:amd64 386:i386 arm:armhf; do
+  goarch=${arch%:*}
+  debarch=${arch#*:}
+  wget -nc https://github.com/hlandau/acme/releases/download/v$VERSION/acmetool-v$VERSION-linux_$goarch.tar.gz 2> /dev/null
+  tar -xzf acmetool-v$VERSION-linux_$goarch.tar.gz -O > acmetool.$debarch
+  echo -n "$goarch "
+  rm acmetool-v$VERSION-linux_$goarch.tar.gz
+done
+
+echo ""
diff --git a/clean.sh b/clean.sh
index f8a8b22..0b8c288 100755
--- a/clean.sh
+++ b/clean.sh
@@ -1,6 +1,4 @@
 #!/bin/sh
 
-export GOPATH=`pwd`/.gopath
-
 rm -f acmetool.*
-rm -rf $GOPATH
+rm -f acmetool-*.tar.gz
diff --git a/debian/changelog b/debian/changelog
index 808d709..bd900fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+acmetool (0.0.20-1) unstable; urgency=medium
+
+  * New upstream release.
+  * moved to original upstream since moving out the redirector is pointless
+
+ -- Christian Pointner <equinox@spreadspace.org>  Thu, 10 Dec 2015 19:56:12 +0100
+
 acmetool (0.0.19-1) unstable; urgency=medium
 
   * Initial release.
diff --git a/debian/control b/debian/control
index c0acfb7..979874a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 9)
 
 Package: acmetool
-Architecture: amd64 i386 armel armhf arm64
+Architecture: amd64 i386 armhf
 Depends: ${misc:Depends}
 Description: command line tool for automatically acquiring certificates
  acmetool is an easy-to-use command line tool for automatically acquiring