r36086 - in /desktop/experimental/yelp-xsl/debian: changelog patches/fix_jquery_syntax_licensing

[smcv at users.alioth.debian.org]

Author: smcv
Date: Mon Oct 22 21:12:10 2012
New Revision: 36086

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36086
Log:
revert the part of that patch that was applied upstream

Modified:
    desktop/experimental/yelp-xsl/debian/changelog
    desktop/experimental/yelp-xsl/debian/patches/fix_jquery_syntax_licensing

Modified: desktop/experimental/yelp-xsl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp-xsl/debian/changelog?rev=36086&op=diff
==============================================================================
--- desktop/experimental/yelp-xsl/debian/changelog [utf-8] (original)
+++ desktop/experimental/yelp-xsl/debian/changelog [utf-8] Mon Oct 22 21:12:10 2012
@@ -7,6 +7,7 @@
 
   [ Simon McVittie ]
   * New upstream release
+    - revert the part of that patch that was applied upstream
 
  -- Iain Lane <laney at debian.org>  Thu, 30 Aug 2012 14:34:20 +0100
 

Modified: desktop/experimental/yelp-xsl/debian/patches/fix_jquery_syntax_licensing
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/yelp-xsl/debian/patches/fix_jquery_syntax_licensing?rev=36086&op=diff
==============================================================================
--- desktop/experimental/yelp-xsl/debian/patches/fix_jquery_syntax_licensing [utf-8] (original)
+++ desktop/experimental/yelp-xsl/debian/patches/fix_jquery_syntax_licensing [utf-8] Mon Oct 22 21:12:10 2012
@@ -3,27 +3,6 @@
 Author: Steve Magoun <steve.magoun at canonical.com>
 
 
-Index: b/COPYING
-===================================================================
---- a/COPYING
-+++ b/COPYING
-@@ -55,14 +55,6 @@
- the MIT and and the Gnu GPLv2 licenses. See COPYING.MIT and COPYING.GPL
- for details.
- 
--The jQuery.Syntax library is copyright 2010 Samuel Williams and is licensed
--under the GNU AGPLv3. See COPYING.AGPL for details. The jQuery.Syntax authors
--have granted the following additional permissions (as per section 7):
-+The jQuery.Syntax library is copyright 2011 Samuel Williams and is licensed
-+under the MIT license. See COPYING.MIT for details.
- 
-- 1) Any HTML file which merely makes function calls to this code, and for
--    that purpose includes it by reference shall be deemed a separate work
--    for copyright law purposes.
-- 2) You may distribute non-source (e.g., minimized or compacted) forms of
--    the code without the copy of the GNU AGPL normally required by section
--    4, provided you include this license notice and a URL through which
--    recipients can access the Corresponding Source.
 Index: b/COPYING.MIT
 ===================================================================
 --- /dev/null