[Pkg-javascript-commits] [SCM] Collection of jQuery plugins branch, master, updated. 18f13bdb96e60c21677ebd23002c9e2be0514209

[Marcelo Jorge Vieira]

The following commit has been merged in the master branch:
commit e615d29cd73e9b015088b5052bb75dec299abeae
Author: Marcelo Jorge Vieira <metal at alucinados.com>
Date:   Sun May 6 22:19:23 2012 -0300

    Updated Standards-Version to 3.9.3
    
    Machine-readable debian/copyright version 1.0

diff --git a/debian/control b/debian/control
index fa8a4b0..a76209c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Javascript Maintainers <pkg-javascript-devel at lists.alioth.debian.org>
 Uploaders: Marcelo Jorge Vieira (metal) <metal at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), yui-compressor
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Browser: http://git.debian.org/?p=pkg-javascript/jquery-goodies.git
 Vcs-Git: git://git.debian.org/git/pkg-javascript/jquery-goodies.git
 
diff --git a/debian/copyright b/debian/copyright
index 712e925..9b7dec6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: galleriffic/*
 Copyright: (c) 2008, Trent Foley (http://trentacular.com)
@@ -18,7 +18,7 @@ License: MIT
 Files: jfeed/*
 Copyright: 2007, Jean-François Hovinne  (http://www.hovinne.com)
 Homepage: http://hovinne.com/articles/jfeed-jquery-rss-atom-feed-parser-plugin
-License: MIT | GPL-2
+License: MIT or GPL-2
 
 Files: jush/*
 Copyright: 2007, Jakub Vrana, http://php.vrana.cz
@@ -33,7 +33,7 @@ License: MIT
 Files: mousewheel/*
 Copyright: (c) 2009, Brandon Aaron (http://brandonaaron.net)
 Homepage: http://brandonaaron.net/code/mousewheel/docs
-License: MIT | GPL-2
+License: MIT or GPL-2
 
 Files: easing/jquery.easing.1.3.js
 Copyright: (c) 2008 George Smith
@@ -56,7 +56,7 @@ License: MIT
 
 Files: form/*
 Copyright: (c) 2011 Mike Alsup <malsup at gmail.com>
-License: MIT | GPL-2
+License: MIT or GPL-2
 
 Files: tipsy/*
 Copyright:(c) 2008-2009 Jason Frame <jason at onehackoranother.com>
@@ -64,55 +64,55 @@ License: MIT
 
 Files: fancybox/*
 Copyright: Janis Skarnelis
-License: MIT | GPL
+License: MIT or GPL
 
 Files: cookie/*
 Copyright: (c) 2010 Klaus Hartl (stilbuero.de)
-License: MIT | GPL
+License: MIT or GPL
 
 Files: metadata/*
 Copyright: (c) 2006 John Resig, Yehuda Katz, J�örn Zaefferer, Paul McLanahan
-License: MIT | GPL
+License: MIT or GPL
 
 Files: tablesorter/*
 Copyright:
  (c) 2007 Christian Bach <christian at tablesorter.com>
  (c) 2008 Brian Ghidinelli <brian at vfive.com>
-License: MIT | GPL
+License: MIT or GPL
 
 Files: treetable/*
 Copyright: (c) 2010, Ludo van den Boom
-License: MIT | GPL-2
+License: MIT or GPL-2
 
 Files: livequery/*
 Copyright: (c) 2008 Brandon Aaron (http://brandonaaron.net)
-License: MIT | GPL
+License: MIT or GPL
 
 Files: countdown/*
 Copyright: 2008 Keith Wood <kbwood at iinet.com.au>
-License: MIT | GPL-2
+License: MIT or GPL-2
 
 Files: debian/*
 Copyright: (c) 2009-2011 Marcelo Jorge Vieira <metal at debian.org>
-License: MIT | GPL-2+ | BSD | Apache-2.0
+License: MIT or GPL-2+ or BSD or Apache-2.0
 
 License: GPL
-
   On Debian systems, the complete text of the GNU General Public License
   can be found in `/usr/share/common-licenses/GPL'
 
 License: GPL-2
+  On Debian systems, the complete text of the GNU General Public License
+  can be found in `/usr/share/common-licenses/GPL-2'
 
+License: GPL-2+
   On Debian systems, the complete text of the GNU General Public License
   can be found in `/usr/share/common-licenses/GPL-2'
 
 License: Apache-2.0
-
   On Debian GNU/Linux systems, the complete text of the Apache License
   can be found in `/usr/share/common-licenses/Apache-2.0'
 
 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
@@ -121,10 +121,10 @@ License: MIT
   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
@@ -135,10 +135,9 @@ License: MIT
   OTHER DEALINGS IN THE SOFTWARE.
 
 License: BSD
-
   Copyright (c) 2008 George McGinley Smith
   All rights reserved.
-
+  .
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions
   are met:
@@ -150,7 +149,7 @@ License: BSD
   3. Neither the name of the University nor the names of its contributors
      may be used to endorse or promote products derived from this software
      without specific prior written permission.
-
+  .
   THIS SOFTWARE IS PROVIDED BY THE REGENTS 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

-- 
Collection of jQuery plugins