[pkg-java] r13571 - in trunk/yui-compressor/debian: . patches source

Damien Raude-Morvan drazzib at alioth.debian.org
Mon Apr 25 10:09:01 UTC 2011


Author: drazzib
Date: 2011-04-25 10:09:00 +0000 (Mon, 25 Apr 2011)
New Revision: 13571

Added:
   trunk/yui-compressor/debian/source/
   trunk/yui-compressor/debian/source/format
Removed:
   trunk/yui-compressor/debian/README.source
Modified:
   trunk/yui-compressor/debian/changelog
   trunk/yui-compressor/debian/control
   trunk/yui-compressor/debian/copyright
   trunk/yui-compressor/debian/patches/parser.patch
   trunk/yui-compressor/debian/patches/tokenstream.patch
   trunk/yui-compressor/debian/patches/use-system-libraries.patch
   trunk/yui-compressor/debian/rules
   trunk/yui-compressor/debian/watch
Log:
* New upstream release (Closes: #622856).
* Bump Standards-Version to 3.9.2 (no changes needed).
* Switch to 3.0 (quilt) source format.
* d/watch: Upstream has broken scanning. Disable uscan for now.
* d/copyright: Update copyright years and paste full licence text.

Deleted: trunk/yui-compressor/debian/README.source
===================================================================
--- trunk/yui-compressor/debian/README.source	2011-04-24 23:20:07 UTC (rev 13570)
+++ trunk/yui-compressor/debian/README.source	2011-04-25 10:09:00 UTC (rev 13571)
@@ -1,2 +0,0 @@
-this package uses quilt for its patch system, see:
-/usr/share/doc/quilt/README.source

Modified: trunk/yui-compressor/debian/changelog
===================================================================
--- trunk/yui-compressor/debian/changelog	2011-04-24 23:20:07 UTC (rev 13570)
+++ trunk/yui-compressor/debian/changelog	2011-04-25 10:09:00 UTC (rev 13571)
@@ -1,3 +1,13 @@
+yui-compressor (2.4.6-1) unstable; urgency=low
+
+  * New upstream release (Closes: #622856).
+  * Bump Standards-Version to 3.9.2 (no changes needed).
+  * Switch to 3.0 (quilt) source format.
+  * d/watch: Upstream has broken scanning. Disable uscan for now.
+  * d/copyright: Update copyright years and paste full licence text.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 25 Apr 2011 11:50:28 +0200
+
 yui-compressor (2.4.2-2) unstable; urgency=low
 
   * Add Depends on a Java runtime (Closes: #565645)

Modified: trunk/yui-compressor/debian/control
===================================================================
--- trunk/yui-compressor/debian/control	2011-04-24 23:20:07 UTC (rev 13570)
+++ trunk/yui-compressor/debian/control	2011-04-25 10:09:00 UTC (rev 13571)
@@ -4,12 +4,12 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Dominik Smatana <dominik.smatana at gmail.com>, Damien Raude-Morvan <drazzib at debian.org>,
  Michael Gilbert <michael.s.gilbert at gmail.com>
-Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant, quilt
+Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant
 Build-Depends-Indep: libjargs-java, rhino (>= 1.7R2), rhino (<< 1.7R3)
-Homepage: http://developer.yahoo.com/yui/compressor/
+Homepage: http://yuilibrary.com/projects/yuicompressor/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/yui-compressor/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/yui-compressor/
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
 
 Package: yui-compressor
 Architecture: all

Modified: trunk/yui-compressor/debian/copyright
===================================================================
--- trunk/yui-compressor/debian/copyright	2011-04-24 23:20:07 UTC (rev 13570)
+++ trunk/yui-compressor/debian/copyright	2011-04-25 10:09:00 UTC (rev 13571)
@@ -1,23 +1,73 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=454
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
 Upstream-Name: YUI Compressor
-Upstream-Maintainer: Julien Lecomte <jlecomte at yahoo-inc.com>
-Upstream-Source: http://developer.yahoo.com/yui/compressor/
+Upstream-Contact: Julien Lecomte <jlecomte at yahoo-inc.com>
+Source: http://yuilibrary.com/projects/yuicompressor/
 
 Files: *
-Copyright: Copyright 2007-2009, Yahoo! Inc. All rights reserved.
+Copyright: Copyright 2007-2011, Yahoo! Inc. All rights reserved.
 License: BSD
- http://developer.yahoo.com/yui/license.html
- On Debian systems the full text of the BSD License
- can be found in the '/usr/share/common-licenses/BSD' file.
+ Redistribution and use of this software in source and binary forms,
+ with or without modification, are permitted provided that the following
+ conditions are met:
+ .
+ * Redistributions of source code must retain the above
+   copyright notice, this list of conditions and the
+   following disclaimer.
+ .
+ * Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the
+   following disclaimer in the documentation and/or other
+   materials provided with the distribution.
+ .
+ * Neither the name of Yahoo! Inc. nor the names of its
+   contributors may be used to endorse or promote products
+   derived from this software without specific prior
+   written permission of Yahoo! Inc.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (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: src/com/yahoo/platform/yui/compressor/CssCompressor.java
 Copyright: Copyright 2007-2009, Yahoo! Inc. All rights reserved.
 License: BSD
  This code is a port of Isaac Schlueter's cssmin utility.
- This code is licensed under the BSD License: 
- http://developer.yahoo.com/yui/license.html
- On Debian systems the full text of the BSD License
- can be found in the '/usr/share/common-licenses/BSD' file.
+ .
+ Redistribution and use of this software in source and binary forms,
+ with or without modification, are permitted provided that the following
+ conditions are met:
+ .
+ * Redistributions of source code must retain the above
+   copyright notice, this list of conditions and the
+   following disclaimer.
+ .
+ * Redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the
+   following disclaimer in the documentation and/or other
+   materials provided with the distribution.
+ .
+ * Neither the name of Yahoo! Inc. nor the names of its
+   contributors may be used to endorse or promote products
+   derived from this software without specific prior
+   written permission of Yahoo! Inc.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (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: src/org/*
 Copyright: Copyright 1997-1999, Netscape Communications Corporation.
@@ -58,7 +108,7 @@
 
 Files: debian/*
 Copyright: Copyright 2009, Dominik Smatana <dominik.smatana at gmail.com>
-Copyright: Copyright 2009, Damien Raude-Morvan <drazzib at debian.org>
+Copyright: Copyright 2009-2011, Damien Raude-Morvan <drazzib at debian.org>
 License: GPL-3
  On Debian systems the full text of the GNU General Public License version 3
  can be found in the '/usr/share/common-licenses/GPL-3' file.

Modified: trunk/yui-compressor/debian/patches/parser.patch
===================================================================
--- trunk/yui-compressor/debian/patches/parser.patch	2011-04-24 23:20:07 UTC (rev 13570)
+++ trunk/yui-compressor/debian/patches/parser.patch	2011-04-25 10:09:00 UTC (rev 13571)
@@ -1,8 +1,8 @@
 YUI patch for the Rhino library's Parser.java
 ===================================================================
---- a/src/org/mozilla/javascript/Parser.java	2008-11-14 10:13:36.000000000 -0500
-+++ b/src/org/mozilla/javascript/Parser.java	2008-11-14 10:13:36.000000000 -0500
-@@ -163,11 +163,30 @@
+--- a/src/org/mozilla/javascript/Parser.java
++++ b/src/org/mozilla/javascript/Parser.java
+@@ -169,11 +169,30 @@
      {
          int tt = currentFlaggedToken;
          if (tt == Token.EOF) {

Modified: trunk/yui-compressor/debian/patches/tokenstream.patch
===================================================================
--- trunk/yui-compressor/debian/patches/tokenstream.patch	2011-04-24 23:20:07 UTC (rev 13570)
+++ trunk/yui-compressor/debian/patches/tokenstream.patch	2011-04-25 10:09:00 UTC (rev 13571)
@@ -1,7 +1,7 @@
 YUI patch for the Rhino library's TokenStream.java
 ===================================================================
---- a/src/org/mozilla/javascript/TokenStream.java.orig	2009-12-25 00:40:57.000000000 -0500
-+++ b/src/org/mozilla/javascript/TokenStream.java	2009-12-25 00:41:26.000000000 -0500
+--- a/src/org/mozilla/javascript/TokenStream.java
++++ b/src/org/mozilla/javascript/TokenStream.java
 @@ -526,7 +526,7 @@
                  stringBufferTop = 0;
  
@@ -43,7 +43,22 @@
 -                                if (escapeVal < 0) {
 -                                    continue strLoop;
 -                                }
--                                addToString(c);
++
++                            case '\\': // backslash
++                            case 'b':  // backspace
++                            case 'f':  // form feed
++                            case 'n':  // line feed
++                            case 'r':  // carriage return
++                            case 't':  // horizontal tab
++                            case 'v':  // vertical tab
++                            case 'd':  // octal sequence
++                            case 'u':  // unicode sequence
++                            case 'x':  // hexadecimal sequence
++                                // Only keep the '\' character for those
++                                // characters that need to be escaped...
++                                // Don't escape quoting characters...
++                                addToString('\\');
+                                 addToString(c);
 -                            }
 -                            // prepare for replace of stored 'u' sequence
 -                            // by escape value
@@ -72,29 +87,14 @@
 -                                }
 -                            }
 -                            break;
++                                break;
  
 -                        case '\n':
 -                            // Remove line terminator after escape to follow
 -                            // SpiderMonkey and C/C++
 -                            c = getChar();
 -                            continue strLoop;
-+                            case '\\': // backslash
-+                            case 'b':  // backspace
-+                            case 'f':  // form feed
-+                            case 'n':  // line feed
-+                            case 'r':  // carriage return
-+                            case 't':  // horizontal tab
-+                            case 'v':  // vertical tab
-+                            case 'd':  // octal sequence
-+                            case 'u':  // unicode sequence
-+                            case 'x':  // hexadecimal sequence
-+                                // Only keep the '\' character for those
-+                                // characters that need to be escaped...
-+                                // Don't escape quoting characters...
-+                                addToString('\\');
-+                                addToString(c);
-+                                break;
- 
+-
 -                        default:
 -                            if ('0' <= c && c < '8') {
 -                                int val = c - '0';

Modified: trunk/yui-compressor/debian/patches/use-system-libraries.patch
===================================================================
--- trunk/yui-compressor/debian/patches/use-system-libraries.patch	2011-04-24 23:20:07 UTC (rev 13570)
+++ trunk/yui-compressor/debian/patches/use-system-libraries.patch	2011-04-25 10:09:00 UTC (rev 13571)
@@ -36,10 +36,3 @@
                  <attribute name="Main-Class" value="com.yahoo.platform.yui.compressor.Bootstrap"/>
              </manifest>
          </jar>
-@@ -63,4 +63,4 @@
-              includes="${dist.package.name}/**/*"/>
-     </target>
- 
--</project>
-\ No newline at end of file
-+</project>

Modified: trunk/yui-compressor/debian/rules
===================================================================
--- trunk/yui-compressor/debian/rules	2011-04-24 23:20:07 UTC (rev 13570)
+++ trunk/yui-compressor/debian/rules	2011-04-25 10:09:00 UTC (rev 13571)
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_COMPRESS_EXCLUDE := .class
 JAVA_HOME       := /usr/lib/jvm/default-java
@@ -13,10 +12,11 @@
 DEB_DH_INSTALLCHANGELOGS_ARGS := doc/CHANGELOG
 
 LIBRARY=yui-compressor
-VERSION=2.4.2
+VERSION=2.4.6
+RHINO_VERSION=1.7R2-4
 
 build/yui-compressor::
 	cp build/yuicompressor-${VERSION}.jar build/yui-compressor.jar
 
 get-orig-source:
-	uscan --force-download
+	debian/fetch-upstream ${VERSION} ${RHINO_VERSION}

Added: trunk/yui-compressor/debian/source/format
===================================================================
--- trunk/yui-compressor/debian/source/format	                        (rev 0)
+++ trunk/yui-compressor/debian/source/format	2011-04-25 10:09:00 UTC (rev 13571)
@@ -0,0 +1 @@
+3.0 (quilt)

Modified: trunk/yui-compressor/debian/watch
===================================================================
--- trunk/yui-compressor/debian/watch	2011-04-24 23:20:07 UTC (rev 13570)
+++ trunk/yui-compressor/debian/watch	2011-04-25 10:09:00 UTC (rev 13571)
@@ -1,4 +1,4 @@
-version=3
-http://yuilibrary.com/downloads/ \
-  yuicompressor/yuicompressor-([\d\.]*).zip debian debian/orig-tar.sh
+# No watch file
+# Upstream download site http://yuilibrary.com/downloads/
+# doesn't provide a way for scanning.
 




More information about the pkg-java-commits mailing list