Merge pull request #88 from alphagov/upgrade_goenv

Upgrade goenv to 0.0.6
alphagov · Jan 26, 2015 · 9afd9d3 · 9afd9d3
2 parents be9a6d0 + a8aca30
commit 9afd9d3
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 32 deletions.
diff --git a/build_source.py b/build_source.py
@@ -40,7 +40,7 @@ def populate(self):
     out = p.communicate()[0]
     # See https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Version for details
     # of the version field
-    matches = re.search(r"^Source: (.+)\nVersion: (?:\d+:)?([A-Za-s0-9.+:~-]*?)(?:-[^-\n]+)?\n", out)
+    matches = re.search(r"^Source: (.+)\nVersion: (?:\d+:)?([A-Za-z0-9.+:~-]*?)(?:-[^-\n]+)?\n", out)
 
     self.source = matches.group(1)
     self.version = matches.group(2)

diff --git a/pkg/goenv/debian/changelog b/pkg/goenv/debian/changelog
@@ -1,3 +1,10 @@
+goenv (0.0.6-alext-1~ppa1) trusty; urgency=medium
+
+  * New upstream version 0.0.6
+  * Switch to alext fork
+
+ -- Alex Tomlins <[email protected]>  Fri, 23 Jan 2015 15:36:32 +0000
+
 goenv (0.0.5-1~ppa2) precise; urgency=low
 
   * Add fix for goenv install with newer versions (1.3.1+)

diff --git a/pkg/goenv/debian/control b/pkg/goenv/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Alex Tomlins <[email protected]>
 Build-Depends: debhelper (>= 7.0.50)
 Standards-Version: 3.9.3
-Homepage: https://github.com/wfarr/goenv
+Homepage: https://github.com/alext/goenv
 
 Package: goenv
 Architecture: all

diff --git a/pkg/goenv/debian/patches/fix_install.diff b/pkg/goenv/debian/patches/fix_install.diff
diff --git a/pkg/goenv/debian/patches/series b/pkg/goenv/debian/patches/series
diff --git a/pkg/goenv/srcurl b/pkg/goenv/srcurl
@@ -1 +1 @@
-https://github.com/wfarr/goenv/archive/0.0.5.tar.gz
+https://github.com/alext/goenv/archive/v0.0.6.tar.gz