[SCM] Debian packaging of jifty branch, master, updated. c8718dc80a8e07ec8ce4aa65c5abed7e8fb547c4

[gregor herrmann]

The following commit has been merged in the master branch:
commit 1c7bca91c9b9782149414d2040bf1e943f8bdec6
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Aug 29 19:17:08 2011 +0200

    debian/copyright: update third-party copyright.

diff --git a/debian/copyright b/debian/copyright
index f8dfd51..0d7ec73 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,14 +15,22 @@ Copyright: 2002-2010, Adam Kennedy <adamk at cpan.org>
  2002-2010, Brian Ingerson <ingy at cpan.org>
 License: Artistic or GPL-1+
 
-Files: */share/web/static/js/key_bindings.js
+Files: share/web/static/js/key_bindings.js
 Copyright: 2004-2006, Best Practical Solutions, LLC
 License: Artistic or GPL-1+
 
-Files: */share/web/static/js/facebox.js
+Files: share/web/static/js/facebox.js
 Copyright: 2007, 2008, Chris Wanstrath
 License: MIT
 
+Files: share/plugins/Jifty/Plugin/IEFixes/web/static/js/iefixes/*
+Copyright: 2004-2008, Dean Edwards
+License: MIT
+
+Files: share/web/static/js/iutil.js
+Copyright: 2006, Stefan Petre
+License: MIT
+
 Files: */share/web/static/[css|js|images]/yui/* 
 Copyright: 2007, Yahoo! Inc.
 License: BSD-like
@@ -61,39 +69,54 @@ License: BSD-like
  (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: */share/web/static/js/jquery-1.4.1.js
+Files: share/web/static/js/jquery-1.4.1.js
 Copyright: 2010, John Resig (jquery.com)
 License: GPL or MIT 	 
   	 
-Files: */share/web/static/js/jsan/DOM/Events.js 	 
+Files: t/TestApp-JiftyJS/share/web/static/js-test/lib/DOM/Events.js
 Copyright: 2005, Justin Constantino. All rights reserved. 	 
 License: LGPL 	 
 
-Files: */share/web/static/js/jsan/Upgrade.js
-Copyright: 2005, Adam Kennedy. All rights reserved.
-License:  Artistic or GPL-1+
-
-Files: */share/web/static/js/rico.js
+Files: share/web/static/js/rico.js
 Copyright: 2005, Sabre Airline Solutions
 License: Apache-2.0
 
-Files: */share/web/static/js/scriptaculous/*  	 
-Copyright: 2005 Thomas Fuchs 	 
+Files: share/web/static/js/jquery.timepickr.js
+ share/web/static/js/ui.core.js
+ share/web/static/js/ui.sortable.js
+Copyright: 2011, Paul Bakaus, http://jqueryui.com/
+License: MIT or GPL-2
+
+Files: share/web/static/js/jquery.autocomplete.js
+Copyright: 2009, Jörn Zaefferer
+License: MIT or GPL-1+
+
+Files: share/web/static/js/jquery.bgiframe.min.js
+Copyright: 2006, Brandon Aaron
+License: MIT or GPL-1+
+
+Files: share/plugins/Jifty/Plugin/Prototypism/web/static/js/prototypism/scriptaculous/*
+Copyright: 2005-2007 Thomas Fuchs 	 
+License: MIT 	 
+
+Files: share/plugins/Jifty/Plugin/Prototypism/web/static/js/prototypism/scriptaculous/slider.js
+Copyright: 2005-2007 Marty Haught
+ 2005-2007, Thomas Fuchs 
 License: MIT 	 
 
 Files: examples/Yada/share/web/static/js/Asynapse/REST.js
 Copyright: 2007, Kang-min Liu <gugod at gugod.org>
 License: Artistic or GPL-1+
 
-Files: */Jifty/Plugin/CSSQuery*
+Files: lib/Jifty/Plugin/CSSQuery.pm
 Copyright: 2007, Handlino, Inc.
 License: Artistic or GPL-1+
 
-Files: */static/js/cssquery*
+Files: share/plugins/Jifty/Plugin/CSSQuery/web/static/js/cssquery/*
 Copyright: 2004-2005, Dean Edwards
 License: LGPL-2.1
 
-Files: */js/singlepage/rsh/rsh.js
+Files: share/plugins/Jifty/Plugin/SinglePage/web/static/js/singlepage/rsh/rsh.js
 Copyright: 2007, Brian Dillard and Brad Neuberg
 License: other-BSD
  Brian Dillard | Project Lead | bdillard at pathf.com | http://blogs.pathf.com/agileajax/
@@ -148,6 +171,14 @@ License: GPL-1+
  On Debian systems, the complete text of version 1 of the GNU
  General Public License can be found in `/usr/share/common-licenses/GPL-1'.
 
+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; version 2.
+ .
+ On Debian systems, the complete text of version 2 of the GNU
+ General Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
 License: LGPL-2.1
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as published by
@@ -183,4 +214,3 @@ License: MIT
  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.
-

-- 
Debian packaging of jifty