[DRE-commits] r4861 - trunk/ohai/debian

[Bryan McLellan]

Author: btm-guest
Date: 2010-03-01 21:20:18 +0000 (Mon, 01 Mar 2010)
New Revision: 4861

Modified:
   trunk/ohai/debian/copyright
Log:
upstream is now fully APL2


Modified: trunk/ohai/debian/copyright
===================================================================
--- trunk/ohai/debian/copyright	2010-03-01 15:26:08 UTC (rev 4860)
+++ trunk/ohai/debian/copyright	2010-03-01 21:20:18 UTC (rev 4861)
@@ -5,7 +5,7 @@
 
 Upstream Authors and Copyright:
 
-    Copyright 2008-2009, Opscode <legal at opscode.com>
+    Copyright 2008-2010, Opscode <legal at opscode.com>
     Copyright 2008-2009, Adam Jacob <adam at opscode.com>
     Copyright 2008-2009, Ben Black <nostromo at gmail.com>
     Copyright 2008-2009, Ezra Zygmuntowicz <ezra at engineyard.com>
@@ -34,24 +34,6 @@
     On Debian systems, the complete text of the Apache License, version 2.0,
     can be found in /usr/share/common-licenses/Apache-2.0
 
-lib/ohai/mixin/command.rb:
-
-    This program 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 3 of the License, or
-    (at your option) any later version.
-    
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-    On Debian GNU/Linux systems, the complete text of version 3 of the GNU
-    General Public License can be found in `/usr/share/common-licenses/GPL-3'
-
 The Debian packaging is © 2010, Bryan McLellan <btm at loftninjas.org> and
 is licensed under the Apache License version 2.0. On Debian and derived
 systems, see `/usr/share/common-licenses/Apache-2.0' for the complete text.