diff -Nru golang-github-julienschmidt-httprouter-1.1/debian/changelog golang-github-julienschmidt-httprouter-1.1/debian/changelog --- golang-github-julienschmidt-httprouter-1.1/debian/changelog 2016-11-01 02:38:58.000000000 +0000 +++ golang-github-julienschmidt-httprouter-1.1/debian/changelog 2018-02-16 18:27:00.000000000 +0000 @@ -1,3 +1,25 @@ +golang-github-julienschmidt-httprouter (1.1-5) unstable; urgency=medium + + * Team upload. + * gbp.conf: set debian-branch + * Add fix-test-go1.10.patch + + -- Michael Stapelberg Fri, 16 Feb 2018 19:27:00 +0100 + +golang-github-julienschmidt-httprouter (1.1-4) UNRELEASED; urgency=medium + + [ Paul Tagliamonte ] + * Team upload. + * Remove Built-Using from arch:all -dev package + + -- Martín Ferrari Tue, 08 Aug 2017 23:03:48 -0400 + +golang-github-julienschmidt-httprouter (1.1-3) UNRELEASED; urgency=medium + + * Update version of dh-goland dependency. + + -- Martín Ferrari Mon, 13 Feb 2017 13:51:35 +0000 + golang-github-julienschmidt-httprouter (1.1-2) unstable; urgency=medium [ Paul Tagliamonte ] diff -Nru golang-github-julienschmidt-httprouter-1.1/debian/control golang-github-julienschmidt-httprouter-1.1/debian/control --- golang-github-julienschmidt-httprouter-1.1/debian/control 2016-11-01 02:38:58.000000000 +0000 +++ golang-github-julienschmidt-httprouter-1.1/debian/control 2018-02-16 18:27:00.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Debian Go Packaging Team Uploaders: Martín Ferrari Build-Depends: debhelper (>= 9.0.0), - dh-golang, + dh-golang (>= 1.17~), golang-any, Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-go/packages/golang-github-julienschmidt-httprouter.git @@ -15,7 +15,6 @@ Package: golang-github-julienschmidt-httprouter-dev Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends} -Built-Using: ${misc:Built-Using} Description: High performance HTTP request router for Go that scales well HttpRouter (github.com/julienschmidt/httprouter) is a lightweight high performance HTTP request router (also called multiplexer or just mux for diff -Nru golang-github-julienschmidt-httprouter-1.1/debian/gbp.conf golang-github-julienschmidt-httprouter-1.1/debian/gbp.conf --- golang-github-julienschmidt-httprouter-1.1/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ golang-github-julienschmidt-httprouter-1.1/debian/gbp.conf 2018-02-16 18:27:00.000000000 +0000 @@ -0,0 +1,2 @@ +[DEFAULT] +debian-branch = debian/sid diff -Nru golang-github-julienschmidt-httprouter-1.1/debian/patches/fix-test-go1.10.patch golang-github-julienschmidt-httprouter-1.1/debian/patches/fix-test-go1.10.patch --- golang-github-julienschmidt-httprouter-1.1/debian/patches/fix-test-go1.10.patch 1970-01-01 00:00:00.000000000 +0000 +++ golang-github-julienschmidt-httprouter-1.1/debian/patches/fix-test-go1.10.patch 2018-02-16 18:27:00.000000000 +0000 @@ -0,0 +1,62 @@ +Description: Fix test failure with Go 1.10 +Author: Rebecca Stambler +Origin: vendor, https://github.com/julienschmidt/httprouter/commit/0b0afca848ce5cf472a0dbb426b54e5cdb630f16 +Last-Update: 2018-02-16 + +--- + +From 0b0afca848ce5cf472a0dbb426b54e5cdb630f16 Mon Sep 17 00:00:00 2001 +From: Rebecca Stambler +Date: Fri, 27 Oct 2017 09:33:06 -0400 +Subject: [PATCH] router_test.go: fix to handle changes to Content-Type header + (#220) + +--- + router_test.go | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/router_test.go b/router_test.go +index fe58c8a..b774a4e 100644 +--- a/router_test.go ++++ b/router_test.go +@@ -364,26 +364,26 @@ func TestRouterNotFound(t *testing.T) { + router.GET("/", handlerFunc) + + testRoutes := []struct { +- route string +- code int +- header string ++ route string ++ code int ++ location string + }{ +- {"/path/", 301, "map[Location:[/path]]"}, // TSR -/ +- {"/dir", 301, "map[Location:[/dir/]]"}, // TSR +/ +- {"", 301, "map[Location:[/]]"}, // TSR +/ +- {"/PATH", 301, "map[Location:[/path]]"}, // Fixed Case +- {"/DIR/", 301, "map[Location:[/dir/]]"}, // Fixed Case +- {"/PATH/", 301, "map[Location:[/path]]"}, // Fixed Case -/ +- {"/DIR", 301, "map[Location:[/dir/]]"}, // Fixed Case +/ +- {"/../path", 301, "map[Location:[/path]]"}, // CleanPath +- {"/nope", 404, ""}, // NotFound ++ {"/path/", 301, "/path"}, // TSR -/ ++ {"/dir", 301, "/dir/"}, // TSR +/ ++ {"", 301, "/"}, // TSR +/ ++ {"/PATH", 301, "/path"}, // Fixed Case ++ {"/DIR/", 301, "/dir/"}, // Fixed Case ++ {"/PATH/", 301, "/path"}, // Fixed Case -/ ++ {"/DIR", 301, "/dir/"}, // Fixed Case +/ ++ {"/../path", 301, "/path"}, // CleanPath ++ {"/nope", 404, ""}, // NotFound + } + for _, tr := range testRoutes { + r, _ := http.NewRequest("GET", tr.route, nil) + w := httptest.NewRecorder() + router.ServeHTTP(w, r) +- if !(w.Code == tr.code && (w.Code == 404 || fmt.Sprint(w.Header()) == tr.header)) { +- t.Errorf("NotFound handling route %s failed: Code=%d, Header=%v", tr.route, w.Code, w.Header()) ++ if !(w.Code == tr.code && (w.Code == 404 || fmt.Sprint(w.Header().Get("Location")) == tr.location)) { ++ t.Errorf("NotFound handling route %s failed: Code=%d, Header=%v", tr.route, w.Code, w.Header().Get("Location")) + } + } + diff -Nru golang-github-julienschmidt-httprouter-1.1/debian/patches/series golang-github-julienschmidt-httprouter-1.1/debian/patches/series --- golang-github-julienschmidt-httprouter-1.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ golang-github-julienschmidt-httprouter-1.1/debian/patches/series 2018-02-16 18:27:00.000000000 +0000 @@ -0,0 +1 @@ +fix-test-go1.10.patch