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

[bzed-guest at users.alioth.debian.org]

Author: bzed-guest
Date: Fri Nov 30 16:46:34 2007
New Revision: 323

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=323
Log:
more updates
finishing debian/copyright (almost, the stupid datepicker.js still needs fixing)

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=323&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/copyright (original)
+++ trunk/packages/zenoss/debian/copyright Fri Nov 30 16:46:34 2007
@@ -39,8 +39,7 @@
 Files with different copyrights/licenses:
 
 
-  * Products/ZenModel/tests/framework.py:
-  * Products/ZenRelations/tests/framework.py:
+  * Products/*/tests/framework.py:
 
     Copyright (c) 2005 Zope Corporation and Contributors. All Rights Reserved.
 
@@ -50,28 +49,6 @@
     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.
-
-
-    (A copy of the Apache License, Version 2.0, is provided below)
-
 
 
   * Products/ZenUtils/js/{DragAndDrop,Sortable}.js:
@@ -125,6 +102,16 @@
     MIT License, or the Academic Free License version 2.1.  The full text of
     each license is included below.
 
+
+
+  * Products/ZenWidgets/skins/zenui/javascript/swfobject.js:
+
+    SWFObject v1.5: Flash Player detection and embed - http://blog.deconcept.com/swfobject/
+ 
+    SWFObject is (c) 2007 Geoff Stearns and is released under the MIT License:
+    http://www.opensource.org/licenses/mit-license.php
+
+    The full text of the MIT license is included below.
 
 
   * ZenUtils/js/query.js:

Modified: trunk/packages/zenoss/debian/rules-extras.mk
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/rules-extras.mk?rev=323&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/rules-extras.mk (original)
+++ trunk/packages/zenoss/debian/rules-extras.mk Fri Nov 30 16:46:34 2007
@@ -117,7 +117,10 @@
 	    cd $$packdir ;\
 	\
 	echo "removing what we don't want to have in the tarball" ;\
-	    rm -f ZenWidgets/skins/zenui/flex/ZenNetMap.swf ;\
+	    for dfsg in Products/ZenWidgets/skins/zenui/flex/*; do \
+	        rm $$dfsg ;\
+	        touch $$dfsg ;\
+	    done ;\
 	    rm -rf inst/externallibs ;\
 	    rm -rf Products/OFolder/ ;\
 	    rm -rf Products/ManagableIndex/ ;\