about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2018-12-10 22:04:37 +0100
committerSebastien Bacher <seb128@ubuntu.com>2018-12-10 22:05:20 +0100
commitbe0549a79eba3b672fde7e9b8702b0747e1ade51 (patch)
tree9c9b6b63afa135f1465d98a34d7c19cc772af331
parentaec02e970bcab4bb0b9458a5773ac45fee683f11 (diff)
upload to disco
-rw-r--r--debian/changelog8
-rw-r--r--debian/control2
-rw-r--r--debian/gbp.conf2
3 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index a0c21164..1c20ec7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+network-manager (1.12.6-0ubuntu2) disco; urgency=medium
+
+  [ Robie Basak ]
+  * debian/tests:
+    - Make dep8 nm test directly invokable
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 10 Dec 2018 22:03:01 +0100
+
 network-manager (1.12.6-0ubuntu1) disco; urgency=medium
 
   * New upstream version
diff --git a/debian/control b/debian/control
index 4faa9b5e..14fe0a6a 100644
--- a/debian/control
+++ b/debian/control
@@ -46,7 +46,7 @@ Build-Depends: debhelper (>= 10.3),
 Standards-Version: 4.1.5
 Rules-Requires-Root: no
 Vcs-Git: https://code.launchpad.net/~network-manager/network-manager/+git/ubuntu
-Vcs-Browser: https://git.launchpad.net/network-manager?h=cosmic
+Vcs-Browser: https://git.launchpad.net/network-manager?h=disco
 Homepage: https://wiki.gnome.org/Projects/NetworkManager
 
 Package: network-manager
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 711583dd..74a0ff56 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
 [DEFAULT]
 pristine-tar = True
 patch-numbers = False
-debian-branch = cosmic
+debian-branch = disco
 debian-tag = ubuntu/%(version)s