[Python-modules-commits] [rpyc] 10/12: Migrate from git-dpm to gbp

[Carl Suster]

This is an automated email from the git hooks/post-receive script.

arcresu-guest pushed a commit to branch debian/master
in repository rpyc.

commit 0b03b5eade2b4e3854282fe92363641af207cdca
Author: Carl Suster <carl at contraflo.ws>
Date:   Fri Dec 1 17:40:02 2017 +1100

    Migrate from git-dpm to gbp
---
 debian/.git-dpm                                                   | 8 --------
 debian/gbp.conf                                                   | 2 +-
 debian/patches/0002-skip-SSH-tests-Test_Ssh-and-Test_Deploy.patch | 1 -
 .../0005-connect-client-and-server-IP-in-TestUdpRegistry.patch    | 3 +--
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index 895f7a8..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,8 +0,0 @@
-# see git-dpm(1) from git-dpm package
-3da75f581da2afbbc9de627d6edfb0cbf09789a6
-3da75f581da2afbbc9de627d6edfb0cbf09789a6
-c782c046ea5d7875652f7afaf82d57bd90c80981
-c782c046ea5d7875652f7afaf82d57bd90c80981
-rpyc_3.3.0.orig.tar.gz
-ef2ebba439500b022d4088f6a7e7ca6a4f700b87
-546740
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 4480ffc..bf9db1d 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,7 +2,7 @@
 upstream-tree = branch
 debian-tag = debian/%(version)s
 upstream-branch = upstream
-debian-branch = master
+debian-branch = debian/master
 distribution = unstable
 pristine-tar = True
 
diff --git a/debian/patches/0002-skip-SSH-tests-Test_Ssh-and-Test_Deploy.patch b/debian/patches/0002-skip-SSH-tests-Test_Ssh-and-Test_Deploy.patch
index bfc9f58..4cf88eb 100644
--- a/debian/patches/0002-skip-SSH-tests-Test_Ssh-and-Test_Deploy.patch
+++ b/debian/patches/0002-skip-SSH-tests-Test_Ssh-and-Test_Deploy.patch
@@ -1,4 +1,3 @@
-From 08e1766ae309aba1a4b5ad72563a765879d56b8c Mon Sep 17 00:00:00 2001
 From: Carl Suster <carl at contraflo.ws>
 Date: Mon, 9 Jan 2017 18:18:44 +1100
 Subject: skip SSH tests Test_Ssh and Test_Deploy
diff --git a/debian/patches/0005-connect-client-and-server-IP-in-TestUdpRegistry.patch b/debian/patches/0005-connect-client-and-server-IP-in-TestUdpRegistry.patch
index 3e2e26a..0166ba5 100644
--- a/debian/patches/0005-connect-client-and-server-IP-in-TestUdpRegistry.patch
+++ b/debian/patches/0005-connect-client-and-server-IP-in-TestUdpRegistry.patch
@@ -1,4 +1,3 @@
-From 3da75f581da2afbbc9de627d6edfb0cbf09789a6 Mon Sep 17 00:00:00 2001
 From: Carl Suster <carl at contraflo.ws>
 Date: Mon, 9 Jan 2017 19:19:08 +1100
 Subject: connect client and server IP in TestUdpRegistry
@@ -13,7 +12,7 @@ Forwarded: https://github.com/tomerfiliba/rpyc/pull/210
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/tests/test_registry.py b/tests/test_registry.py
-index 1340250..9773660 100644
+index 7201732..400e290 100644
 --- a/tests/test_registry.py
 +++ b/tests/test_registry.py
 @@ -63,11 +63,14 @@ class TestTcpRegistry(BaseRegistryTest, unittest.TestCase):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/rpyc.git