diff -Nru golang-fsnotify-1.4.7/debian/changelog golang-fsnotify-1.4.7/debian/changelog
--- golang-fsnotify-1.4.7/debian/changelog	2018-03-02 14:19:15.000000000 +0000
+++ golang-fsnotify-1.4.7/debian/changelog	2018-06-10 17:59:24.000000000 +0000
@@ -1,3 +1,15 @@
+golang-fsnotify (1.4.7-2) unstable; urgency=medium
+
+  [ Alexandre Viau ]
+  * Point Vcs-* urls to salsa.debian.org.
+
+  [ Martín Ferrari ]
+  * Add new possible import path, as upstream can't make up their mind :/
+  * Automated cme fixes.
+  * Reconfigure repo with current std.
+
+ -- Martín Ferrari <tincho@debian.org>  Sun, 10 Jun 2018 17:59:24 +0000
+
 golang-fsnotify (1.4.7-1) unstable; urgency=medium
 
   [ Paul Tagliamonte ]
diff -Nru golang-fsnotify-1.4.7/debian/control golang-fsnotify-1.4.7/debian/control
--- golang-fsnotify-1.4.7/debian/control	2018-03-02 14:18:49.000000000 +0000
+++ golang-fsnotify-1.4.7/debian/control	2018-06-10 17:59:24.000000000 +0000
@@ -2,24 +2,24 @@
 Maintainer: Debian Go Packaging Team <pkg-go-maintainers@lists.alioth.debian.org>
 Uploaders: Tianon Gravi <tianon@debian.org>,
            Anthony Fok <foka@debian.org>,
-           Martín Ferrari <tincho@debian.org>
+           Martín Ferrari <tincho@debian.org>,
 Section: devel
 Testsuite: autopkgtest-pkg-go
 Priority: optional
 Build-Depends: debhelper (>= 11),
                dh-golang,
                golang-any,
-               golang-golang-x-sys-dev
-Standards-Version: 4.1.3
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-go/packages/golang-fsnotify.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-go/packages/golang-fsnotify.git
+               golang-golang-x-sys-dev,
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/go-team/packages/golang-fsnotify
+Vcs-Git: https://salsa.debian.org/go-team/packages/golang-fsnotify.git
 Homepage: https://fsnotify.org/
 XS-Go-Import-Path: github.com/fsnotify/fsnotify
 
 Package: golang-github-fsnotify-fsnotify-dev
 Architecture: all
-Depends: ${misc:Depends},
-         golang-golang-x-sys-dev
+Depends: golang-golang-x-sys-dev,
+         ${misc:Depends},
 Description: File system notifications for Go
  Package fsnotify provides a platform-independent interface for file system
  notifications, for use with the Go programming language.
diff -Nru golang-fsnotify-1.4.7/debian/gbp.conf golang-fsnotify-1.4.7/debian/gbp.conf
--- golang-fsnotify-1.4.7/debian/gbp.conf	2016-04-21 21:23:43.000000000 +0000
+++ golang-fsnotify-1.4.7/debian/gbp.conf	2018-06-10 17:59:24.000000000 +0000
@@ -1,2 +1,6 @@
 [DEFAULT]
-pristine-tar = True
+debian-branch = debian/sid
+
+[buildpackage]
+dist = DEP14
+upstream-tag = upstream/%(version)s
diff -Nru golang-fsnotify-1.4.7/debian/golang-github-fsnotify-fsnotify-dev.links golang-fsnotify-1.4.7/debian/golang-github-fsnotify-fsnotify-dev.links
--- golang-fsnotify-1.4.7/debian/golang-github-fsnotify-fsnotify-dev.links	2016-04-21 21:53:09.000000000 +0000
+++ golang-fsnotify-1.4.7/debian/golang-github-fsnotify-fsnotify-dev.links	2018-06-10 17:59:24.000000000 +0000
@@ -1,2 +1,3 @@
-usr/share/gocode/src/github.com/fsnotify/fsnotify usr/share/gocode/src/gopkg.in/fsnotify.v1
 usr/share/gocode/src/github.com/fsnotify/fsnotify usr/share/gocode/src/github.com/go-fsnotify/fsnotify
+usr/share/gocode/src/github.com/fsnotify/fsnotify usr/share/gocode/src/gopkg.in/fsnotify.v1
+usr/share/gocode/src/github.com/fsnotify/fsnotify usr/share/gocode/src/gopkg.in/fsnotify/fsnotify.v1