[Python-modules-commits] [txwinrm] 03/04: Add Conflicts with winrm_0.0~git20160323.0752679-1 (Bug#848234)

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch master
in repository txwinrm.

commit 83aeafc140a81befcf6d7e8525c43d1c99eb7b65
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Tue Feb 28 20:28:28 2017 +0000

    Add Conflicts with winrm_0.0~git20160323.0752679-1 (Bug#848234)
---
 debian/changelog                 | 1 +
 debian/control                   | 1 +
 debian/txwinrm.lintian-overrides | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e4215c1..aba652d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ txwinrm (1.2.7-1) UNRELEASED; urgency=medium
   * Add man pages 
   * Move man pages to txwinrm package 
   * Update year to 2017 in debian/copyright 
+  * Add Conflicts with winrm_0.0~git20160323.0752679-1 (Bug#848234) 
 
  -- Christopher Hoskin <mans0954 at debian.org>  Sat, 25 Feb 2017 13:35:40 +0000
 
diff --git a/debian/control b/debian/control
index 46ec088..6a4a38a 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Package: txwinrm
 Section: utils
 Architecture: all
 Depends: ${misc:Depends}, python-txwinrm
+Conflicts: winrm (=0.0~git20160323.0752679-1)
 Description: asynchronous Python WinRM client binaries
  Command line utilities for asynchronously managing Microsoft Windows systems,
  via WinRM and WinRS services.
diff --git a/debian/txwinrm.lintian-overrides b/debian/txwinrm.lintian-overrides
new file mode 100644
index 0000000..24b67b6
--- /dev/null
+++ b/debian/txwinrm.lintian-overrides
@@ -0,0 +1,2 @@
+# See Bug#848234
+txwinrm binary: conflicts-with-version winrm (= 0.0~git20160323.0752679-1)

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