[Python-modules-commits] [pytest] 02/02: Finalize changelog

[Sebastian Ramacher]

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

sramacher pushed a commit to branch master
in repository pytest.

commit 34ed3c72b59cf42d2cd8c3ef522cb2a2f9851973
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Nov 19 11:00:09 2016 +0100

    Finalize changelog
---
 debian/changelog | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6f19176..a942264 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-pytest (3.0.4-1) UNRELEASED; urgency=medium
+pytest (3.0.4-1) unstable; urgency=medium
 
   * New upstream release.
+  * debian/control: Move python{,3}-twisted-core to Build-Conflicts until
+    upstream issues #1989 is fixed. This is a temporary workaround for
+    #844919.
 
- -- Sebastian Ramacher <sramacher at debian.org>  Tue, 15 Nov 2016 22:56:45 +0100
+ -- Sebastian Ramacher <sramacher at debian.org>  Sat, 19 Nov 2016 10:59:59 +0100
 
 pytest (3.0.3-1) unstable; urgency=medium
 

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