[DRE-commits] [SCM] yard.git branch, master, updated. upstream/0.8.1-41-gf9a47b6

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit f9a47b6e3723a2efa394b841db7f3a8162928569
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Tue May 8 14:45:07 2012 +0200

    add copyright info for source of js libs in debian/

diff --git a/debian/copyright b/debian/copyright
index 48a5e91..5299bf6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -44,6 +44,18 @@ Copyright: 2011 Lucas Nussbaum <lucas at debian.org>
            2012 Cédric Boutillier <cedric.boutillier at gmail.com>
 License: Expat
 
+Files: debian/jquery-1.7.1.js
+Copyright: 2011 John Resig
+License: Expat or GPL-2
+Comment: This is the uncompressed source for
+ templates/default/fulldoc/html/js/jquery.js
+
+Files: debian/debian/jquery.autocomplete.js
+Copyright: 2009 Jörn Zaefferer
+License: Expat or GPL-2+
+Comment: This is the uncompressed source for
+ lib/yard/server/templates/default/fulldoc/html/js/autocomplete.js
+
 License: Expat
  Permission is hereby granted, free of charge, to any person
  obtaining a copy of this software and associated documentation
@@ -112,8 +124,8 @@ License: Ruby
  .
         a) place your modifications in the Public Domain or otherwise
            make them Freely Available, such as by posting said
- 	  modifications to Usenet or an equivalent medium, or by allowing
- 	  the author to include your modifications in the software.
+           modifications to Usenet or an equivalent medium, or by allowing
+           the author to include your modifications in the software.
  .
         b) use the modified software only within your corporation or
            organization.
@@ -127,11 +139,11 @@ License: Ruby
       provided that you do at least ONE of the following:
  .
         a) distribute the binaries and library files of the software,
- 	  together with instructions (in the manual page or equivalent)
- 	  on where to get the original distribution.
+           together with instructions (in the manual page or equivalent)
+           on where to get the original distribution.
  .
         b) accompany the distribution with the machine-readable source of
- 	  the software.
+           the software.
  .
         c) give non-standard binaries non-standard names, with
            instructions on where to get the original software distribution.

-- 
yard.git