r23141 - in /trunk/jifty/debian: control copyright rules

Mon Jul 14 06:51:48 UTC 2008

Author: yvesago-guest
Date: Mon Jul 14 06:51:48 2008
New Revision: 23141

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=23141
Log:
use of libjs-scriptaculous, libjs-jquery
* add dep in control
* exlude from rules and add links
* remove copyright on jquery and scriptaculous

Modified:
    trunk/jifty/debian/control
    trunk/jifty/debian/copyright
    trunk/jifty/debian/rules

Modified: trunk/jifty/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/control?rev=23141&op=diff
==============================================================================

--- trunk/jifty/debian/control (original)
+++ trunk/jifty/debian/control Mon Jul 14 06:51:48 2008
@@ -37,7 +37,7 @@
  libtest-mockmodule-perl, libtest-www-declare-perl, libtest-mockobject-perl,
  libtest-www-mechanize-perl (>= 1.04), libhttp-server-simple-recorder-perl,
  libmodule-install-perl (>= 0.75), libyaml-syck-perl (>= 0.29),
- libjifty-dbi-perl (>= 0.49),
+ libjifty-dbi-perl (>= 0.49), libjs-scriptaculous, libjs-jquery,
  perl-modules (>= 5.10) | libversion-perl,
  libdevel-cover-perl,
  libauthen-cas-client-perl,
@@ -128,7 +128,8 @@
  libtest-mockmodule-perl, libtest-www-declare-perl, libtest-mockobject-perl,
  libtest-www-mechanize-perl (>= 1.04), libhttp-server-simple-recorder-perl,
  libmodule-install-perl (>= 0.75), libyaml-syck-perl (>= 0.29),
- libjifty-dbi-perl (>= 0.49), perl-modules (>= 5.10) | libversion-perl
+ libjifty-dbi-perl (>= 0.49), libjs-scriptaculous, libjs-jquery,
+ perl-modules (>= 5.10) | libversion-perl
 Suggests: libjifty-plugin-authentication-cas-perl
  libjifty-plugin-authentication-facebook-perl
  libjifty-plugin-authentication-ldap-perl libjifty-plugin-chart-perl

Modified: trunk/jifty/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/copyright?rev=23141&op=diff
==============================================================================
--- trunk/jifty/debian/copyright (original)
+++ trunk/jifty/debian/copyright Mon Jul 14 06:51:48 2008
@@ -78,20 +78,6 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 
-Files: */share/web/static/js/jquery-1.2.1.js
-Copyright:  Copyright (c) 2007 John Resig (jquery.com)
-License: GPL | MIT 
- We keep the embeded jquery lib as a dependency chain try to install
- apache2. This can be a bad on developper desktop.
- .
- Dual licensed under the MIT and GPL licenses. See MIT license below.
-
-Files: */share/web/static/js/jsan/DOM/Events.js
-Copyright: Copyright (c) 2005 Justin Constantino.  All rights reserved.
-License: LGPL
- This module is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public Licence.
-
 Files: */share/web/static/js/jsan/Upgrade.js
 Copyright: Copyright (c) 2005 Adam Kennedy. All rights reserved.
 License:  GPL-1+ | Artistic
@@ -103,31 +89,6 @@
 License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License"); you may not
  use this file except in compliance with the License.
-
-Files: */share/web/static/js/scriptaculous/*
-Copyright: Copyright (c) 2005 Thomas Fuchs
-License: MIT
- We keep the embeded scriptaculous lib as a dependency chain try to install
- apache2. This can be a bad on developper desktop.
- .
- 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.
 
 Files: */Jifty/Plugin/*
 Copyright: Copyright 2005-2007 Best Practical Solutions, LLC. 

Modified: trunk/jifty/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/rules?rev=23141&op=diff
==============================================================================
--- trunk/jifty/debian/rules (original)
+++ trunk/jifty/debian/rules Mon Jul 14 06:51:48 2008
@@ -75,6 +75,7 @@
 	dh_installexamples doc/examples/* examples/*
 	dh_install
 	dh_install -plibjifty-perl -XManual/Tutorial \
+		-Xjs/scriptaculous -Xjs/jquery-1.2.1.js \
 		-XEditInPlace \
 		-XWikiToolbar \
 		-XAuthzLDAP \
@@ -101,6 +102,9 @@
 	chmod 644 $(CURDIR)/debian/libjifty-perl/usr/share/perl5/auto/Jifty/plugins/Jifty/Plugin/OnlineDocs/web/templates/__jifty/online_docs/autohandler
 	chmod 644 $(CURDIR)/debian/libjifty-perl/usr/share/perl5/auto/Jifty/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/_elements/nav
 	dh_link -plibjifty-perl usr/share/man/man3/Jifty.3pm.gz  usr/share/man/man1/jifty.1pm.gz
+	# use of packaged scriptaculous and jquery
+	dh_link -plibjifty-perl /usr/share/javascript/scriptaculous/  usr/share/perl5/auto/Jifty/web/static/js/scriptaculous
+	dh_link -plibjifty-perl /usr/share/javascript/jquery/jquery.js  usr/share/perl5/auto/Jifty/web/static/js/jquery-1.2.1.js
 	dh_installdeb
 	dh_gencontrol
 	dh_md5sums


