[Pkg-javascript-commits] [SCM] JavaScript mapping API branch, master, updated. debian/1.0_b1+ds1-1-1-g4751741

[David Paleino]

The following commit has been merged in the master branch:
commit 4751741d5833eec786ddc6de904995cf12c44dad
Author: David Paleino <dapal at debian.org>
Date:   Mon Nov 12 17:06:31 2012 +0100

    Fixed debian/copyright.

diff --git a/debian/changelog b/debian/changelog
index c3002ba..a3d950f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jquery-geo (1.0~b1+ds1-2) UNRELEASED; urgency=low
+
+  * Fixed debian/copyright.
+
+ -- David Paleino <dapal at debian.org>  Mon, 12 Nov 2012 17:06:17 +0100
+
 jquery-geo (1.0~b1+ds1-1) unstable; urgency=low
 
   * Initial release (Closes: #648075)
diff --git a/debian/copyright b/debian/copyright
index e928dbd..274321a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,6 +9,19 @@ Files: debian/*
 Copyright: © 2012, David Paleino <dapal at debian.org>
 License: MIT
 
+Files: js/jquery.geo.head.js
+Copyright: © 2007-2012, Applied Geographics, Inc.
+License: MIT or GPL-2.0+
+Comment: the file also mentions some Google copyright, with Apache 2.0
+ license. That snippet of copyright really refers to excanvas, which
+ has been stripped from the tarball, and is therefore no more relevant
+ now.
+
+Files: libs/qunit/*
+Copyright: © 2012, John Resig
+ © 2012, Jörn Zaefferer
+License: MIT or GPL-2.0+
+
 License: MIT
  Permission is hereby granted, free of charge, to any person
  obtaining a copy of this software and associated documentation

-- 
JavaScript mapping API