[Pkg-zenoss-commits] r373 - in /trunk/packages/wmi/debian: changelog copyright

[bzed at users.alioth.debian.org]

Author: bzed
Date: Thu Jul 24 01:22:48 2008
New Revision: 373

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=373
Log:
  - Removing .pyc files and other cruft in the clean target.
* debian/copyright:
  - Clarifying and updating copyright informations.

Modified:
    trunk/packages/wmi/debian/changelog
    trunk/packages/wmi/debian/copyright

Modified: trunk/packages/wmi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/wmi/debian/changelog?rev=373&op=diff
==============================================================================
--- trunk/packages/wmi/debian/changelog (original)
+++ trunk/packages/wmi/debian/changelog Thu Jul 24 01:22:48 2008
@@ -2,7 +2,9 @@
 
   * New upstream version.
   * debian/rules:
-    - removing .pyc files and other cruft in the clean target.
+    - Removing .pyc files and other cruft in the clean target.
+  * debian/copyright:
+    - Clarifying and updating copyright informations.
 
  -- Bernd Zeimetz <bzed at debian.org>  Fri, 30 May 2008 23:50:00 +0200
 

Modified: trunk/packages/wmi/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/wmi/debian/copyright?rev=373&op=diff
==============================================================================
--- trunk/packages/wmi/debian/copyright (original)
+++ trunk/packages/wmi/debian/copyright Thu Jul 24 01:22:48 2008
@@ -11,17 +11,24 @@
            275 West St. Suite 204
            Annapolis, MD 21401, USA
 
-
-Copyright and License for pycom:
+Copyright for pycom:
 
    This program is part of Zenoss Core, an open source monitoring platform.
    Copyright (C) 2007, Zenoss Inc.
+
+Copyright for DCOM/WMI (winexe):
+
+ Copyright (C) Andrzej Hajda 2006
+
+License for pycom and DCOM/WMI (winexe):
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License version 2 as published by
    the Free Software Foundation.
 
    For complete information please visit: http://www.zenoss.com/oss/
+
+Please note that no GPL v3 code of Samba are linked to GPL-2 only parts.
 
 
 As the Samba Copyright Policy
@@ -29,20 +36,20 @@
 asks for personal copyrights, please review the source file headers for
 appropriate copyright information.
 
-License for Samba itself and DCOM/WMI (winexe):
+License for Samba itself:
 
    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; version 2 dated June, 1991.
-
+   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, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 License for talloc, ldb, tdb and parts of the replace subsystem:
@@ -223,9 +230,9 @@
 
 
 On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL',
-and the complete text of the GNU Lesser General Public License can
-be found in `/usr/share/common-licenses/LGPL'.
+Public License, version 3, can be found in `/usr/share/common-licenses/GPL-3',
+and the complete text of the GNU Lesser General Public License, version 2, can
+be found in `/usr/share/common-licenses/LGPL-2'.
 
 The Debian packaging is (C) 2007, Bernd Zeimetz <bernd at bzed.de> and
 is licensed under the GPL, see above.