r64611 - in /trunk/libnet-patricia-perl/debian: changelog copyright

[ansgar at users.alioth.debian.org]

Author: ansgar
Date: Sat Nov  6 12:02:53 2010
New Revision: 64611

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=64611
Log:
debian/copyright: Merge "GPL-1+ or GPL-2+" to "GPL-1+".

Modified:
    trunk/libnet-patricia-perl/debian/changelog
    trunk/libnet-patricia-perl/debian/copyright

Modified: trunk/libnet-patricia-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-patricia-perl/debian/changelog?rev=64611&op=diff
==============================================================================
--- trunk/libnet-patricia-perl/debian/changelog (original)
+++ trunk/libnet-patricia-perl/debian/changelog Sat Nov  6 12:02:53 2010
@@ -1,11 +1,15 @@
 libnet-patricia-perl (1.18-1) unstable; urgency=low
 
+  [ Jotam Jr. Trejo ]
   * New upstream release
   * debian/copyright: Adopt format specification givin in revision
     135 of DEP5 proposal for machine readable copyright information
   * debian/control: Add myself to Uploaders
   * debian/control: Bump Standards Version to 3.9.1, no changes needed
   * debian/control: Add (build) dependency on libnet-cidr-lite-perl
+
+  [ Ansgar Burchardt ]
+  * debian/copyright: Merge "GPL-1+ or GPL-2+" to "GPL-1+".
 
  -- Jotam Jr. Trejo <jotamjr at debian.org.sv>  Fri, 05 Nov 2010 01:17:10 -0600
 

Modified: trunk/libnet-patricia-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-patricia-perl/debian/copyright?rev=64611&op=diff
==============================================================================
--- trunk/libnet-patricia-perl/debian/copyright (original)
+++ trunk/libnet-patricia-perl/debian/copyright Sat Nov  6 12:02:53 2010
@@ -52,7 +52,7 @@
  2008, Damyan Ivanov <dmn at debian.org>
  2009, Ryan Niebur <ryan at debian.org>
  2010, Jotam Jr. Trejo <jotamjr at debian.org.sv>
-License: GPL-2+ or Artistic or GPL-1+
+License: Artistic or GPL-1+
 
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify