diff -Nru python-dib-utils-0.0.6/debian/changelog python-dib-utils-0.0.6/debian/changelog
--- python-dib-utils-0.0.6/debian/changelog	2014-09-07 14:34:05.000000000 +0000
+++ python-dib-utils-0.0.6/debian/changelog	2018-04-02 19:09:52.000000000 +0000
@@ -1,3 +1,27 @@
+python-dib-utils (0.0.6-2) unstable; urgency=medium
+
+  [ Ondřej Nový ]
+  * d/control: Set Vcs-* to salsa.debian.org
+  * Fixed upstream GIT url.
+  * d/rules: Changed UPSTREAM_GIT protocol to https
+  * d/copyright: Changed source URL to https protocol
+
+  [ Daniel Baumann ]
+  * Updating vcs fields.
+  * Updating copyright format url.
+  * Running wrap-and-sort -bast.
+  * Updating maintainer field.
+  * Removing gbp.conf, not used anymore or should be specified in the
+    developers dotfiles.
+  * Correcting permissions in debian packaging files.
+
+  [ Thomas Goirand ]
+  * Add missing dh-python build-depends.
+  * Removed Pre-Depends: dpkg (>= 1.15.6~).
+  * Standards-Version is now 4.1.3.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 02 Apr 2018 21:09:52 +0200
+
 python-dib-utils (0.0.6-1) unstable; urgency=medium
 
   * Initial release. (Closes: #760756)
diff -Nru python-dib-utils-0.0.6/debian/control python-dib-utils-0.0.6/debian/control
--- python-dib-utils-0.0.6/debian/control	2014-09-07 14:34:05.000000000 +0000
+++ python-dib-utils-0.0.6/debian/control	2018-04-02 19:09:52.000000000 +0000
@@ -1,25 +1,29 @@
 Source: python-dib-utils
 Section: python
 Priority: optional
-Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
-Uploaders: Thomas Goirand <zigo@debian.org>
-Build-Depends: debhelper (>= 9),
-               openstack-pkg-tools,
-               python-all (>= 2.6.6-3~),
-               python-pbr,
-               python-setuptools,
-               python3-all,
-               python3-pbr,
-               python3-setuptools
-Standards-Version: 3.9.5
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-dib-utils.git
-Vcs-Git: git://anonscm.debian.org/openstack/python-dib-utils.git
+Maintainer: Debian OpenStack <openstack-devel@lists.alioth.debian.org>
+Uploaders:
+ Thomas Goirand <zigo@debian.org>,
+Build-Depends:
+ debhelper (>= 9),
+ dh-python,
+ openstack-pkg-tools,
+ python-all,
+ python-pbr,
+ python-setuptools,
+ python3-all,
+ python3-pbr,
+ python3-setuptools,
+Standards-Version: 4.1.3
+Vcs-Browser: https://salsa.debian.org/openstack-team/libs/python-dib-utils
+Vcs-Git: https://salsa.debian.org/openstack-team/libs/python-dib-utils.git
 Homepage: https://github.com/openstack/dib-utils
 
 Package: python-dib-utils
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${misc:Depends}, ${python:Depends}
+Depends:
+ ${misc:Depends},
+ ${python:Depends},
 Description: Standalone tools related to diskimage-builder - Python 2.x
  These tools were originally part of the diskimage-builder project, but they
  have uses outside of that project as well. Because disk space is at a premium
@@ -32,8 +36,9 @@
 
 Package: python3-dib-utils
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${misc:Depends}, ${python3:Depends}
+Depends:
+ ${misc:Depends},
+ ${python3:Depends},
 Description: Standalone tools related to diskimage-builder - Python 3.x
  These tools were originally part of the diskimage-builder project, but they
  have uses outside of that project as well. Because disk space is at a premium
diff -Nru python-dib-utils-0.0.6/debian/copyright python-dib-utils-0.0.6/debian/copyright
--- python-dib-utils-0.0.6/debian/copyright	2014-09-07 14:34:05.000000000 +0000
+++ python-dib-utils-0.0.6/debian/copyright	2018-04-02 19:09:52.000000000 +0000
@@ -1,6 +1,6 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: dib-utils
-Source: git://github.com/openstack/dib-utils.git
+Source: https://github.com/openstack/dib-utils
 
 Files: debian/*
 Copyright: (c) 2014, Thomas Goirand <zigo@debian.org>
diff -Nru python-dib-utils-0.0.6/debian/gbp.conf python-dib-utils-0.0.6/debian/gbp.conf
--- python-dib-utils-0.0.6/debian/gbp.conf	2014-09-07 14:34:05.000000000 +0000
+++ python-dib-utils-0.0.6/debian/gbp.conf	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-[DEFAULT]
-upstream-branch = master
-debian-branch = debian/unstable
-upstream-tag = %(version)s
-compression = xz
-
-[git-buildpackage]
-export-dir = ../build-area/
-
diff -Nru python-dib-utils-0.0.6/debian/rules python-dib-utils-0.0.6/debian/rules
--- python-dib-utils-0.0.6/debian/rules	2014-09-07 14:34:05.000000000 +0000
+++ python-dib-utils-0.0.6/debian/rules	2018-04-02 19:09:52.000000000 +0000
@@ -3,7 +3,7 @@
 PYTHONS:=$(shell pyversions -vr)
 PYTHON3S:=$(shell py3versions -vr)
 
-UPSTREAM_GIT = git://github.com/<please-user>/dib-utils.git
+UPSTREAM_GIT := https://github.com/openstack/dib-utils.git
 include /usr/share/openstack-pkg-tools/pkgos.make
 
 export OSLO_PACKAGE_VERSION=$(VERSION)