[SCM] Packaging of ack-grep in Debian branch, master, updated. debian/1.92-1-23-g4864c94

[Ryan Niebur]

The following commit has been merged in the master branch:
commit 4db054f0b1b4e237231dd7d2fba62afa88b4bb94
Author: Ryan Niebur <ryan at debian.org>
Date:   Sun Jun 3 22:24:17 2012 -0700

    further fix formatting of the copyright file

diff --git a/debian/copyright b/debian/copyright
index 1d5469e..4d75e21 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,20 +6,20 @@ Source: http://search.cpan.org/dist/ack/
 Files: *
 Copyright: 2005-2011, Andy Lester <andy at petdance.com>
 License-Alias: Perl
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 Files: debian/*
 Copyright: 2007-2008, Peter Makholm <peter at makholm.net>
  2009, Ryan Niebur <ryanryan52 at gmail.com>
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
-Files: t/swamp/parrot.pir, t/swamp/blib/ignore.pir
+Files: t/swamp/parrot.pir t/swamp/blib/ignore.pir
 Copyright: Copyright (C) 2004, The Perl Foundation.
 License: Artistic
 
 Files: t/swamp/c-header.h
 Copyright: Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, by Larry Wall and others
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 Files: t/swamp/c-source.c
 Copyright: Copyright (C) 2000, 2001 Free Software Foundation, Inc.
@@ -33,7 +33,7 @@ License: GPL-2
 
 Files: etc/ack.bash_completion.sh
 Copyright: 2008-2009 Adam James <atj at pulsewidth.org.uk>
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 License: Artistic
     This program is free software; you can redistribute it and/or modify

-- 
Packaging of ack-grep in Debian