[Forensics-changes] [wipe] 01/01: Imported Debian patch 0.22-3

[Joao Eriberto Mota Filho]

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

eriberto pushed a commit to branch debian
in repository wipe.

commit 7277bd9d0c81b34621c8328947c5fedeed15d95c
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Tue May 5 11:21:50 2015 -0300

    Imported Debian patch 0.22-3
---
 debian/changelog | 7 +++++++
 debian/copyright | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 958fb1b..8439067 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wipe (0.22-3) unstable; urgency=medium
+
+  * Upload to unstable.
+  * debian/copyright: changed from 'and' to 'or' in License field in GPL text.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Tue, 05 May 2015 11:21:50 -0300
+
 wipe (0.22-2) experimental; urgency=medium
 
   * New co-maintainer.
diff --git a/debian/copyright b/debian/copyright
index d7cc3d1..0298bc5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,7 +18,7 @@ Copyright: 1999-2006 Thomas Schoepf <schoepf at debian.org>
            2015      Joao Eriberto Mota Filho <eriberto at debian.org>
 License: GPL-2+
 
-License: GPL-2 and GPL-2+
+License: GPL-2 or GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/wipe.git