[DRE-commits] r4471 - trunk/merb/debian

[Joshua Timberman]

Author: jtimberman-guest
Date: 2009-12-17 05:04:35 +0000 (Thu, 17 Dec 2009)
New Revision: 4471

Modified:
   trunk/merb/debian/README.source
   trunk/merb/debian/copyright
   trunk/merb/debian/repack.sh
Log:
more copyright/license fixes and repack updates

Modified: trunk/merb/debian/README.source
===================================================================
--- trunk/merb/debian/README.source	2009-12-15 20:28:17 UTC (rev 4470)
+++ trunk/merb/debian/README.source	2009-12-17 05:04:35 UTC (rev 4471)
@@ -48,3 +48,8 @@
 
 These gems would need to be manually retrieved and installed to the
 merb-core directories in order to run the spec tests.
+
+The following files are blatantly not redistributable and are removed by the repack script.
+
+./merb-core/tools/allison-2.0.2/lib/allison.css
+./merb-core/tools/allison-2.0.2/lib/allison.js

Modified: trunk/merb/debian/copyright
===================================================================
--- trunk/merb/debian/copyright	2009-12-15 20:28:17 UTC (rev 4470)
+++ trunk/merb/debian/copyright	2009-12-17 05:04:35 UTC (rev 4471)
@@ -221,6 +221,11 @@
     Source Initiative (OSI) and You comply with its license review and
     certification process.
 
+./merb-core/tools/allison-2.0.2/lib/allison.css
+    This file is not redistributable and is removed by the repack script so it
+    will not be in the resulting package.
+    Copyright 2007 Cloudburst LLC, all rights reserved
+
 ./merb-core/spec/public/webrat/test_app/public/javascripts/jquery.js
     Merb incorporates code modified from JQuery (http://jquery.com/) and is Copyright (c) John Resig.
 
@@ -245,6 +250,26 @@
     Copyright (c) 2008 Yehuda Katz
     Licensed under MIT License
 
+./merb-action-args/*
+    Copyright (c) 2008 Yehuda Katz
+    Licensed under MIT License
+
+./merb-assets/*
+    Copyright (c) 2008 Ezra Zygmuntowicz
+    Licensed under MIT License
+
+./merb-gen/lib/generators/templates/application/merb_core/doc/rdoc/generators/template/merb/prototype.js
+    Copyright (c) 2005-2007 Sam Stephenson
+    Licensed under MIT License
+
+./merb-gen/lib/generators/templates/application/common/jquery.js
+    Copyright (c) 2009 John Resig
+    Dual licensed under the MIT and GPL licenses.
+
+./merb-gen/*
+    Copyright (c) 2008 Jonas Nicklas, Ezra Zygmuntowicz, the merb dev team
+    Licensed under MIT License
+
 ./merb-haml/*
     Copyright (c) 2008 Yehuda Katz
     Licensed under MIT License

Modified: trunk/merb/debian/repack.sh
===================================================================
--- trunk/merb/debian/repack.sh	2009-12-15 20:28:17 UTC (rev 4470)
+++ trunk/merb/debian/repack.sh	2009-12-17 05:04:35 UTC (rev 4471)
@@ -31,6 +31,7 @@
 rm -vfr $UP_BASE/merb-core/docs/merb-core-call-stack-diagram.pdf
 rm -vfr $UP_BASE/merb-core/spec/
 rm -vfr $UP_BASE/merb-core/spec10/
+rm -vfr $UP_BASE/merb-core/tools/allison-2.0.2/
 ## End
 
 mv "$UP_BASE" "$DIR/$REPACK_DIR"