[Pkg-ganeti-devel] [ganeti] 01/03: d/copyright: fix jquery.js license

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository ganeti.

commit 31c59b89adc4f410333ba8e4d8d3a4860a6cb9f0
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Tue Oct 14 09:40:57 2014 +0300

    d/copyright: fix jquery.js license
    
    Embedded jquery.js is dual-licensed under MIT or GPL-2. Note that we do
    not ship this copy in the binary packages.
    
    Thanks: Thorsten Alteholz
---
 debian/copyright | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/debian/copyright b/debian/copyright
index 13de391..2c80705 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,7 +23,7 @@ License: BSD-2-Clause
 Files: doc/html/_static/jquery.js
 Copyright: Copyright 2011, John Resig
            Copyright 2011, The Dojo Foundation
-License: MIT
+License: MIT or GPL-2
 
 Files: doc/html/_static/underscore.js
 Copyright: (c) 2011 Jeremy Ashkenas, DocumentCloud Inc.
@@ -73,6 +73,27 @@ License: MIT
  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: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git