diff -Nru golang-github-vishvananda-netns-0.0~git20150526.1.5478c06/debian/changelog golang-github-vishvananda-netns-0.0~git20150710.0.604eaf1/debian/changelog
--- golang-github-vishvananda-netns-0.0~git20150526.1.5478c06/debian/changelog	2015-08-13 12:10:01.000000000 +0000
+++ golang-github-vishvananda-netns-0.0~git20150710.0.604eaf1/debian/changelog	2015-09-06 20:47:20.000000000 +0000
@@ -1,3 +1,9 @@
+golang-github-vishvananda-netns (0.0~git20150710.0.604eaf1-1) unstable; urgency=medium
+
+  * Update to newer upstream commit.
+
+ -- Tianon Gravi <tianon@debian.org>  Sun, 06 Sep 2015 13:47:19 -0700
+
 golang-github-vishvananda-netns (0.0~git20150526.1.5478c06-1) unstable; urgency=medium
 
   * Initial release (Closes: #787053).
diff -Nru golang-github-vishvananda-netns-0.0~git20150526.1.5478c06/debian/control golang-github-vishvananda-netns-0.0~git20150710.0.604eaf1/debian/control
--- golang-github-vishvananda-netns-0.0~git20150526.1.5478c06/debian/control	2015-08-13 12:10:01.000000000 +0000
+++ golang-github-vishvananda-netns-0.0~git20150710.0.604eaf1/debian/control	2015-09-06 20:47:04.000000000 +0000
@@ -1,13 +1,14 @@
 Source: golang-github-vishvananda-netns
 Section: devel
 Priority: extra
-Maintainer: Tianon Gravi <admwiggin@gmail.com>
-Uploaders: Docker Packaging Team <docker-maint@lists.alioth.debian.org>
+Maintainer: pkg-go <pkg-go-maintainers@lists.alioth.debian.org>
+Uploaders: Tianon Gravi <tianon@debian.org>
 Build-Depends: debhelper (>= 9), dh-golang, golang
 Standards-Version: 3.9.6
 Homepage: https://github.com/vishvananda/netns
 Vcs-Git: git://anonscm.debian.org/pkg-go/packages/golang-github-vishvananda-netns.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-go/packages/golang-github-vishvananda-netns.git
+XS-Go-Import-Path: github.com/vishvananda/netns
 
 Package: golang-github-vishvananda-netns-dev
 Architecture: all
diff -Nru golang-github-vishvananda-netns-0.0~git20150526.1.5478c06/debian/copyright golang-github-vishvananda-netns-0.0~git20150710.0.604eaf1/debian/copyright
--- golang-github-vishvananda-netns-0.0~git20150526.1.5478c06/debian/copyright	2015-08-13 12:10:01.000000000 +0000
+++ golang-github-vishvananda-netns-0.0~git20150710.0.604eaf1/debian/copyright	2015-09-06 20:47:04.000000000 +0000
@@ -6,7 +6,7 @@
 License: Apache-2.0
 
 Files: debian/*
-Copyright: 2015 Tianon Gravi <admwiggin@gmail.com>
+Copyright: 2015 Tianon Gravi <tianon@debian.org>
 License: Apache-2.0
 
 License: Apache-2.0
diff -Nru golang-github-vishvananda-netns-0.0~git20150526.1.5478c06/debian/gbp.conf golang-github-vishvananda-netns-0.0~git20150710.0.604eaf1/debian/gbp.conf
--- golang-github-vishvananda-netns-0.0~git20150526.1.5478c06/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
+++ golang-github-vishvananda-netns-0.0~git20150710.0.604eaf1/debian/gbp.conf	2015-09-06 20:39:00.000000000 +0000
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
diff -Nru golang-github-vishvananda-netns-0.0~git20150526.1.5478c06/debian/rules golang-github-vishvananda-netns-0.0~git20150710.0.604eaf1/debian/rules
--- golang-github-vishvananda-netns-0.0~git20150526.1.5478c06/debian/rules	2015-08-13 12:10:01.000000000 +0000
+++ golang-github-vishvananda-netns-0.0~git20150710.0.604eaf1/debian/rules	2015-09-06 20:39:00.000000000 +0000
@@ -1,9 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-export DH_VERBOSE := 1
-export DH_GOPKG := github.com/vishvananda/netns
-
 %:
 	dh $@ --buildsystem=golang --with=golang
 
diff -Nru golang-github-vishvananda-netns-0.0~git20150526.1.5478c06/netns_linux_arm64.go golang-github-vishvananda-netns-0.0~git20150710.0.604eaf1/netns_linux_arm64.go
--- golang-github-vishvananda-netns-0.0~git20150526.1.5478c06/netns_linux_arm64.go	1970-01-01 00:00:00.000000000 +0000
+++ golang-github-vishvananda-netns-0.0~git20150710.0.604eaf1/netns_linux_arm64.go	2015-09-06 20:32:31.000000000 +0000
@@ -0,0 +1,7 @@
+// +build linux,arm64
+
+package netns
+
+const (
+	SYS_SETNS = 268
+)
diff -Nru golang-github-vishvananda-netns-0.0~git20150526.1.5478c06/netns_linux_arm.go golang-github-vishvananda-netns-0.0~git20150710.0.604eaf1/netns_linux_arm.go
--- golang-github-vishvananda-netns-0.0~git20150526.1.5478c06/netns_linux_arm.go	2015-05-26 17:20:12.000000000 +0000
+++ golang-github-vishvananda-netns-0.0~git20150710.0.604eaf1/netns_linux_arm.go	2015-09-06 20:32:31.000000000 +0000
@@ -3,5 +3,5 @@
 package netns
 
 const (
-	SYS_SETNS = 374
+	SYS_SETNS = 375
 )
diff -Nru golang-github-vishvananda-netns-0.0~git20150526.1.5478c06/netns_linux.go golang-github-vishvananda-netns-0.0~git20150710.0.604eaf1/netns_linux.go
--- golang-github-vishvananda-netns-0.0~git20150526.1.5478c06/netns_linux.go	2015-05-26 17:20:12.000000000 +0000
+++ golang-github-vishvananda-netns-0.0~git20150710.0.604eaf1/netns_linux.go	2015-09-06 20:32:31.000000000 +0000
@@ -52,33 +52,30 @@
 	return GetFromThread(os.Getpid(), syscall.Gettid())
 }
 
-// GetFromName gets a handle to a named network namespace such as one
-// created by `ip netns add`.
-func GetFromName(name string) (NsHandle, error) {
-	fd, err := syscall.Open(fmt.Sprintf("/var/run/netns/%s", name), syscall.O_RDONLY, 0)
+// GetFromPath gets a handle to a network namespace
+// identified by the path
+func GetFromPath(path string) (NsHandle, error) {
+	fd, err := syscall.Open(path, syscall.O_RDONLY, 0)
 	if err != nil {
 		return -1, err
 	}
 	return NsHandle(fd), nil
 }
 
+// GetFromName gets a handle to a named network namespace such as one
+// created by `ip netns add`.
+func GetFromName(name string) (NsHandle, error) {
+	return GetFromPath(fmt.Sprintf("/var/run/netns/%s", name))
+}
+
 // GetFromPid gets a handle to the network namespace of a given pid.
 func GetFromPid(pid int) (NsHandle, error) {
-	fd, err := syscall.Open(fmt.Sprintf("/proc/%d/ns/net", pid), syscall.O_RDONLY, 0)
-	if err != nil {
-		return -1, err
-	}
-	return NsHandle(fd), nil
+	return GetFromPath(fmt.Sprintf("/proc/%d/ns/net", pid))
 }
 
 // GetFromThread gets a handle to the network namespace of a given pid and tid.
 func GetFromThread(pid, tid int) (NsHandle, error) {
-	name := fmt.Sprintf("/proc/%d/task/%d/ns/net", pid, tid)
-	fd, err := syscall.Open(name, syscall.O_RDONLY, 0)
-	if err != nil {
-		return -1, err
-	}
-	return NsHandle(fd), nil
+	return GetFromPath(fmt.Sprintf("/proc/%d/task/%d/ns/net", pid, tid))
 }
 
 // GetFromDocker gets a handle to the network namespace of a docker container.
diff -Nru golang-github-vishvananda-netns-0.0~git20150526.1.5478c06/netns_linux_s390x.go golang-github-vishvananda-netns-0.0~git20150710.0.604eaf1/netns_linux_s390x.go
--- golang-github-vishvananda-netns-0.0~git20150526.1.5478c06/netns_linux_s390x.go	1970-01-01 00:00:00.000000000 +0000
+++ golang-github-vishvananda-netns-0.0~git20150710.0.604eaf1/netns_linux_s390x.go	2015-09-06 20:32:31.000000000 +0000
@@ -0,0 +1,7 @@
+// +build linux,s390x
+
+package netns
+
+const (
+	SYS_SETNS = 339
+)