[DRE-commits] [SCM] ruby-fog.git branch, master, updated. debian/1.3.1-1-4-g25c8e39

[Laurent Bigonville]

The following commit has been merged in the master branch:
commit 7665b1ee8a31a81f807abc7efbfceef3fe7c0746
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Fri Jun 1 12:27:10 2012 +0200

    Update debian/copyright file

diff --git a/debian/changelog b/debian/changelog
index efd71a0..d9e463d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ ruby-fog (1.3.1-2) UNRELEASED; urgency=low
   * debian/control: Run wrap-and-sort
   * Add missing non-minified javascript files, the 2 patches have been taken
     from upstream
+  * Update debian/copyright file
 
- -- Laurent Bigonville <bigon at debian.org>  Fri, 01 Jun 2012 11:49:06 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Fri, 01 Jun 2012 12:26:44 +0200
 
 ruby-fog (1.3.1-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index be58faf..81815d0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,6 +5,25 @@ Source: http://fog.io/
 Files: *
 Copyright: 2010 Wesley Beary <geemus at gmail.com>
 License: Expat
+
+Files: docs/public/js/libs/dd_belatedpng.*
+Copyright: 2009 Drew Diller <drew.diller at gmail.com>
+License: Expat
+
+Files: docs/public/js/libs/jquery-1.4.2.*
+Copyright: 2010 John Resig
+License: Expat or GPL-2
+
+Files: docs/public/js/libs/modernizr-1.6.*
+Copyright: 2009-2010 Faruk Ates
+           2009-2010 Paul Irish
+License: Expat or BSD-3-clause
+
+Files: docs/public/js/profiling/yahoo-profiling.*
+Copyright: 2009, Yahoo! Inc. All rights reserved.
+License: BSD-3-clause
+
+License: Expat
  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
@@ -24,6 +43,55 @@ License: Expat
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+License: GPL-2
+ 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; either
+ version 2 of the License.
+ .
+ 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 package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+License: BSD-3-clause
+ Redistribution and use of this software in source and binary forms,
+ with or without modification, are permitted provided that the following
+ conditions are met:
+ .
+ Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ .
+ Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the distribution.
+ .
+ Neither the name of the organization nor the names of it's contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission of Yahoo! Inc.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+
 Files: debian/*
 Copyright: 2012 Laurent Bigonville <bigon at debian.org>
 License: GPL-2+

-- 
ruby-fog.git