[Pkg-zenoss-commits] r295 - in /trunk/packages/zenoss/debian: copyright copyright.in rules-extras.mk

Wed Sep 19 22:10:35 UTC 2007

Author: bzed-guest
Date: Wed Sep 19 22:10:34 2007
New Revision: 295

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=295
Log:
more copyright work
.... waiting for upstream fixes....


Removed:
    trunk/packages/zenoss/debian/copyright.in
Modified:
    trunk/packages/zenoss/debian/copyright
    trunk/packages/zenoss/debian/rules-extras.mk

Modified: trunk/packages/zenoss/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/copyright?rev=295&op=diff
==============================================================================

--- trunk/packages/zenoss/debian/copyright (original)
+++ trunk/packages/zenoss/debian/copyright Wed Sep 19 22:10:34 2007
@@ -36,49 +36,126 @@
 is licensed under the GPL, see above.
 
 
-The license of PDIS-XPath-0.3 is:
+Files with different copyrights/licenses:
 
-  Copyright 2004 Helsinki Institute for Information Technology (HIIT)
-  and the authors.  All rights reserved.
+  * PDIS-XPath-0.3/*:
 
-  Permission is hereby granted, free of charge, to any person
-  obtaining a copy of this software and associated documentation files
-  (the "Software"), to deal in the Software without restriction,
-  including without limitation the rights to use, copy, modify, merge,
-  publish, distribute, sublicense, and/or sell copies of the Software,
-  and to permit persons to whom the Software is furnished to do so,
-  subject to the following conditions:
+    Copyright 2004 Helsinki Institute for Information Technology (HIIT)
+    and the authors.  All rights reserved.
 
-  The above copyright notice and this permission notice shall be
-  included in all copies or substantial portions of the Software.
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation files
+    (the "Software"), to deal in the Software without restriction,
+    including without limitation the rights to use, copy, modify, merge,
+    publish, distribute, sublicense, and/or sell copies of the Software,
+    and to permit persons to whom the Software is furnished to do so,
+    subject to the following conditions:
 
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-  CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-The license of testgen is:
+  * testgen/*:
 
-  Copyright (c) 2006, Matt Harrison and Duncan McGreggor
+    Copyright (c) 2006, Matt Harrison and Duncan McGreggor
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of
-  this software and associated documentation files (the "Software"), to deal in
-  the Software without restriction, including without limitation the rights to
-  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-  of the Software, and to permit persons to whom the Software is furnished to do
-  so, subject to the following conditions:
+    Permission is hereby granted, free of charge, to any person obtaining a copy of
+    this software and associated documentation files (the "Software"), to deal in
+    the Software without restriction, including without limitation the rights to
+    use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is furnished to do
+    so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
 
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+
+
+
+
+
+FIXME FIXME FIXME:
+
+
+Products/ZenModel/tests/framework.py:
+Products/ZenRelations/tests/framework.py:
+
+# Copyright (c) 2005 Zope Corporation and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+
+
+
+Products/ZenUITests/tests/selenium/util/selenium.py:
+"""
+Copyright 2006 ThoughtWorks, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+
+
+Products/ZenUtils/js/DragAndDrop.js:
+Products/ZenUtils/js/Sortable.js:
+
+Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+    Mochi-ized By Thomas Herve (_firstname_ at nimail.org)
+
+
+Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+    Mochi-ized By Thomas Herve (_firstname_ at nimail.org)
+
+See scriptaculous.js for full license.
+
+
+Products/ZenUtils/js/MochiKit.js:
+MochiKit.MochiKit 1.4 : PACKED VERSION
+
+
+
+ZenUtils/js/query.js:
+// Code adapted from Trac http://trac.edgewall.org/ a copy of which
+// can be found in the same directory as this file.
+
+
+
+
+Licenses:
+------> ZenUtils/js/Trac-LICENSE.txt
+------> ZenUtils/js/scriptaculous.js
+------> ZenUtils/js/MochiKit-LICENSE.txt
+
+
+
+Products/ZenUITests/tests/selenium/util/selenium.py --> apache license
+Products/ZenWidgets/skins/zenui/yui/* --> yahoo / bsd license

Modified: trunk/packages/zenoss/debian/rules-extras.mk
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/rules-extras.mk?rev=295&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/rules-extras.mk (original)
+++ trunk/packages/zenoss/debian/rules-extras.mk Wed Sep 19 22:10:34 2007
@@ -158,8 +158,9 @@
 	    find . -name .cvsignore -print0 | xargs -0 rm -f ;\
 	    mv inst/* . ;\
 	    rm -rf  *.sh zen2dump.py autoinstall  ZEN2UPGRADE.txt rpm fs \
-                     docs/INSTALL_* docs/BUILD_Source-Solaris10.txt MacOS \
-	             GNUmakefile inst ;\
+                     docs/INSTALL_* docs/BUILD_* MacOS \
+	             GNUmakefile inst conf/sudoers docs/UPGRADE.txt ;\
+	    rmdir zendocs/zenjmx ;\
 	    mv zendocs/Admin\ Guide\ 2.0 zendocs/Admin_Guide_2.0 ;\
 	\
 	echo "fixing broken file permissions" ;\


