[DRE-commits] [SCM] ruby-sigar.git branch, master, updated. debian/0.7.0-1-6-gce45428

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 568620c984741211bf48390fed7aa324d34bb28f
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Thu Jun 28 11:21:25 2012 +0200

    Update copyright to DEP-5 copyright-format/1.0

diff --git a/debian/copyright b/debian/copyright
index defe32a..fa0ba71 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: sigar
 Source: http://rubygems.org/gems/sigar
 
@@ -48,7 +48,7 @@ License: Apache-2.0
 
 Files: bindings/ruby/sigar_getline.c src/sigar_getline.c
 Copyright: 1991, 1992 by Chris Thewalt (thewalt at ce.berkeley.edu)
-License:
+License: other
  Permission to use, copy, modify, and distribute this software
  for any purpose and without fee is hereby granted, provided
  that the above copyright notices appear in all copies and that both the
@@ -218,7 +218,7 @@ License: Apache-2.0
 
 Files: src/os/solaris/get_mib2.c src/os/solaris/get_mib2.h
 Copyright: 1995 Purdue Research Foundation. / 1995 Purdue Research Foundation, West Lafayette, Indiana
-License:
+License: other
  Written by Victor A. Abell <abe at cc.purdue.edu>
  .
  This software is not subject to any license of the American Telephone
@@ -239,7 +239,7 @@ License:
     misrepresented as being the original software.
  .
  4. This notice may not be removed or altered.
- 
+
 Files: src/os/solaris/sigar_os.h 
 Copyright: 2009 SpringSource, Inc / 2004-2007 Hyperic, Inc
 License: Apache-2.0
@@ -263,7 +263,7 @@ License: Apache-2.0
 Files: src/sigar_fileinfo.c 
 Copyright: 2010 VMware, Inc / 2009 SpringSource, Inc / 2000-2003 The Apache Software Foundation. All rights / 2004-2005, 2007-2008 Hyperic, Inc
 License: Apache-2.0
- 
+
 Files: debian/*
 Copyright: 2012 Praveen Arimbrathodiyil <pravi.a at gmail.com>
 License: Apache-2.0
@@ -283,3 +283,4 @@ License: Apache-2.0
  .
  On Debian systems, the full text of the Apache License version 2.0 can be
  found in the file `/usr/share/common-licenses/Apache-2.0'.
+

-- 
ruby-sigar.git