[SCM] stapler-adjunct-timeline packaging branch, master, updated. debian/1.3-1-5-g266f2ce

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit 266f2cebf3f12edc0a7b50aa4247e9c70d023993
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Fri Oct 28 19:38:23 2011 +0200

    d/copyright: Remove information on MIT/GPL2 items (dropped from tarball).

diff --git a/debian/changelog b/debian/changelog
index db1d686..8d660e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 stapler-adjunct-timeline (1.3+dfsg-1) unstable; urgency=low
 
+  [ James Page ]
   * Initial Debian release (Closes: #631960).
   * Repack upstream tarball to remove embedded javascript.
   * Amended obsolete field names in debian/copyright.
 
+  [ Damien Raude-Morvan ]
+  * d/copyright: Remove information on MIT/GPL2 items (dropped from
+    tarball).
+
  -- James Page <james.page at ubuntu.com>  Wed, 26 Oct 2011 16:44:22 +0100
 
 stapler-adjunct-timeline (1.3-0ubuntu1) oneiric; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 8580f96..2145704 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,10 +6,6 @@ Files: *
 Copyright: 2006, The SIMILE Project
 License: BSD
 
-Files: src/test/resources/timeline_2.3.1/src/ajax/api/scripts/jquery-1.2.6.min.js
-Copyright: 2008 John Resig (jquery.com)
-License: MIT or GPL
-
 Files: debian/*
 Copyright: 2011, Canonical Ltd (http://www.canonical.com/)
 License: BSD
@@ -40,25 +36,3 @@ License: BSD
   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: MIT
-  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 without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  .
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  .
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION 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
-  On Debian systems, the complete text of the GPL License can be
-  found in "/usr/share/common-licenses/GPL".

-- 
stapler-adjunct-timeline packaging