[pkg-java] r11362 - in trunk/yui-compressor/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Sun Jan 17 18:47:52 UTC 2010
Author: drazzib
Date: 2010-01-17 18:47:52 +0000 (Sun, 17 Jan 2010)
New Revision: 11362
Added:
trunk/yui-compressor/debian/manpages
trunk/yui-compressor/debian/yui-compressor.1
Removed:
trunk/yui-compressor/debian/yui-compressor.1.xml
Modified:
trunk/yui-compressor/debian/changelog
trunk/yui-compressor/debian/control
trunk/yui-compressor/debian/patches/use-system-libraries.patch
trunk/yui-compressor/debian/rules
trunk/yui-compressor/debian/yui-compressor.install
Log:
* Add Depends on a Java runtime (Closes: #565645)
* Depends on libjargs-java instead of embedding it inside yui-compressor
(see use-system-libraries.patch)
* Update Vcs-* fields to reflect package name change
(yuicompressor -> yui-compressor)
* Create extended manpage from help output
- remove docbook debian/yui-compressor.1.xml
- remove Build-Depends on docbook2x
Modified: trunk/yui-compressor/debian/changelog
===================================================================
--- trunk/yui-compressor/debian/changelog 2010-01-17 18:46:30 UTC (rev 11361)
+++ trunk/yui-compressor/debian/changelog 2010-01-17 18:47:52 UTC (rev 11362)
@@ -1,3 +1,16 @@
+yui-compressor (2.4.2-2) unstable; urgency=low
+
+ * Add Depends on a Java runtime (Closes: #565645)
+ * Depends on libjargs-java instead of embedding it inside yui-compressor
+ (see use-system-libraries.patch)
+ * Update Vcs-* fields to reflect package name change
+ (yuicompressor -> yui-compressor)
+ * Create extended manpage from help output
+ - remove docbook debian/yui-compressor.1.xml
+ - remove Build-Depends on docbook2x
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 17 Jan 2010 19:25:37 +0100
+
yui-compressor (2.4.2-1) unstable; urgency=low
[ Dominik Smatana ]
Modified: trunk/yui-compressor/debian/control
===================================================================
--- trunk/yui-compressor/debian/control 2010-01-17 18:46:30 UTC (rev 11361)
+++ trunk/yui-compressor/debian/control 2010-01-17 18:47:52 UTC (rev 11362)
@@ -2,18 +2,19 @@
Section: java
Priority: optional
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 , docbook2x
-Build-Depends-Indep: libjargs-java , rhino (>= 1.7R2) , rhino (<< 1.7R3)
+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-Indep: libjargs-java, rhino (>= 1.7R2), rhino (<< 1.7R3)
Homepage: http://developer.yahoo.com/yui/compressor/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/yuicompressor/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/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
Package: yui-compressor
Architecture: all
-Depends: ${misc:Depends}
-Description: YUI Compressor is JavaScript/CSS minifier
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libjargs-java
+Description: JavaScript/CSS minifier
The YUI Compressor is a JavaScript compressor which, in addition to removing
comments and white-spaces, obfuscates local variables using the smallest
possible variable name. This obfuscation is safe, even when using constructs
Added: trunk/yui-compressor/debian/manpages
===================================================================
--- trunk/yui-compressor/debian/manpages (rev 0)
+++ trunk/yui-compressor/debian/manpages 2010-01-17 18:47:52 UTC (rev 11362)
@@ -0,0 +1 @@
+debian/yui-compressor.1
Modified: trunk/yui-compressor/debian/patches/use-system-libraries.patch
===================================================================
--- trunk/yui-compressor/debian/patches/use-system-libraries.patch 2010-01-17 18:46:30 UTC (rev 11361)
+++ trunk/yui-compressor/debian/patches/use-system-libraries.patch 2010-01-17 18:47:52 UTC (rev 11362)
@@ -1,7 +1,11 @@
-Use Debian's jargs ard rhino libraries
-===================================================================
---- a/build.xml 2009-12-25 14:46:22.000000000 -0500
-+++ b/build.xml 2009-12-25 15:59:59.000000000 -0500
+Description:
+ - use Debian's jargs ard rhino libraries during build
+ - don't embed jargs inside yui-compressor jar
+Author: Michael Gilbert <michael.s.gilbert at gmail.com>
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-01-17
+--- a/build.xml
++++ b/build.xml
@@ -20,10 +20,10 @@
includes="**/*.java"
deprecation="off"
@@ -16,17 +20,22 @@
</classpath>
</javac>
</target>
-@@ -32,8 +32,8 @@
+@@ -32,13 +32,13 @@
<mkdir dir="${build.dir}/jar"/>
<!-- The order is important here. Rhino MUST be unjarred first!
(some of our own classes will override the Rhino classes) -->
- <unjar src="${lib.dir}/jargs-1.0.jar" dest="${build.dir}/jar"/>
- <unjar src="${lib.dir}/rhino-1.6R7.jar" dest="${build.dir}/jar"/>
-+ <unjar src="/usr/share/java/jargs.jar" dest="${build.dir}/jar"/>
+ <unjar src="/usr/share/java/js.jar" dest="${build.dir}/jar"/>
<copy todir="${build.dir}/jar">
<fileset dir="${build.dir}/classes" includes="**/*.class"/>
</copy>
+ <jar destfile="${build.dir}/${jar.name}" basedir="${build.dir}/jar">
+ <manifest>
++ <attribute name="Class-Path" value="/usr/share/java/jargs.jar"/>
+ <attribute name="Main-Class" value="com.yahoo.platform.yui.compressor.Bootstrap"/>
+ </manifest>
+ </jar>
@@ -63,4 +63,4 @@
includes="${dist.package.name}/**/*"/>
</target>
Modified: trunk/yui-compressor/debian/rules
===================================================================
--- trunk/yui-compressor/debian/rules 2010-01-17 18:46:30 UTC (rev 11361)
+++ trunk/yui-compressor/debian/rules 2010-01-17 18:47:52 UTC (rev 11362)
@@ -9,20 +9,14 @@
DEB_JARS := js jargs
DEB_ANT_BUILD_TARGET := build.jar
+DEb_CLEAN_BUILD_TARGET := clean
DEB_DH_INSTALLCHANGELOGS_ARGS := doc/CHANGELOG
LIBRARY=yui-compressor
VERSION=2.4.2
-clean::
- rm -rf build
- rm -f yui-compressor.1.gz
- rm -f doc/changelog
-
build/yui-compressor::
cp build/yuicompressor-${VERSION}.jar build/yui-compressor.jar
- docbook2x-man debian/yui-compressor.1.xml
- gzip -9f yui-compressor.1
get-orig-source:
uscan --force-download
Added: trunk/yui-compressor/debian/yui-compressor.1
===================================================================
--- trunk/yui-compressor/debian/yui-compressor.1 (rev 0)
+++ trunk/yui-compressor/debian/yui-compressor.1 2010-01-17 18:47:52 UTC (rev 11362)
@@ -0,0 +1,51 @@
+.TH YUI-COMPRESSOR "1" "January 2010" "yui-compressor " "User Commands"
+.SH NAME
+yui-compressor \- JavaScript/CSS minifier
+.SH SYNOPSIS
+.B yui-compressor
+\fR[\fIoptions\fR] [\fIinput file\fR]
+.SH DESCRIPTION
+Global Options
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Displays this information
+.TP
+\fB\-\-type\fR <js|css>
+Specifies the type of the input file
+.TP
+\fB\-\-charset\fR <charset>
+Read the input file using <charset>
+.TP
+\fB\-\-line\-break\fR <column>
+Insert a line break after the specified column number
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Display informational messages and warnings
+.TP
+\fB\-o\fR <file>
+Place the output into <file>. Defaults to stdout.
+.PP
+JavaScript Options
+.TP
+\fB\-\-nomunge\fR
+Minify only, do not obfuscate
+.TP
+\fB\-\-preserve\-semi\fR
+Preserve all semicolons
+.TP
+\fB\-\-disable\-optimizations\fR
+Disable all micro optimizations
+.PP
+If no input file is specified, it defaults to stdin. In this case, the 'type'
+option is required. Otherwise, the 'type' option is required only if the input
+file extension is neither 'js' nor 'css'.
+.SH EXAMPLES
+The following example demonstrates how to use yui-compressor
+.TP
+.B yui-compressor -o compressed.js original.js
+.SH SEE ALSO
+.BR /usr/share/doc/yui-compressor/README.gz
+.SH AUTHOR
+This manual page was written by Damien Raude-Morvan <drazzib at debian.org>
+and Michael Gilbert <michael.s.gilbert at gmail.com>,
+for the Debian GNU/Linux system (but may be used by others).
Deleted: trunk/yui-compressor/debian/yui-compressor.1.xml
===================================================================
--- trunk/yui-compressor/debian/yui-compressor.1.xml 2010-01-17 18:46:30 UTC (rev 11361)
+++ trunk/yui-compressor/debian/yui-compressor.1.xml 2010-01-17 18:47:52 UTC (rev 11362)
@@ -1,69 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-"/usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd" [
-
-<!--
- Copyright (C) 2009 Michael S. Gilbert <michael.s.gilbert>.
--->
-
- <!ENTITY dhname "yui-compressor">
- <!ENTITY dhucname "yui-compressor">
- <!ENTITY dhsection "1">
-
-]>
-
-<refentry id="yui-compressor-1" lang="en">
- <refentryinfo>
- <title>yui-compressor</title>
- <productname>yui-compressor</productname>
- <date>$Date: 2009-12-26 12:51:31 $</date>
- <authorgroup>
- <author>
- <firstname>Michael</firstname>
- <surname>Gilbert</surname>
- <affiliation>
- <address>
- <email>michael.s.gilbert at gmail.com</email>
- </address>
- </affiliation>
- </author>
- </authorgroup>
- <copyright>
- <year>2009</year>
- <holder>Michael S Gilbert</holder>
- </copyright>
- </refentryinfo>
- <refmeta>
- <refentrytitle>&dhucname;</refentrytitle>
- <manvolnum>&dhsection;</manvolnum>
- </refmeta>
- <refnamediv id="name">
- <refname>&dhname;</refname>
- <refpurpose>creates packaged javascript libraries</refpurpose>
- </refnamediv>
- <refsect1 id="options">
- <title>OPTIONS</title>
- <para><command>&dhname;</command> has the following options:
- </para>
- <variablelist>
- <varlistentry id="h">
- <term><option>-h,--help</option></term>
- <listitem><para>display help and more information.</para></listitem>
- </varlistentry>
- <varlistentry id="o">
- <term><option>-o file</option></term>
- <listitem><para>place the output into file (default is stdout).</para></listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
- <refsect1 id="examples">
- <title>EXAMPLES</title>
- <para>The following example demonstrates how to use <command>&dhname;</command>.
- </para>
- <cmdsynopsis>
- <command>&dhname;</command>
- <arg choice="plain"><option>-o packed.js</option></arg>
- <arg choice="plain"><option>uncompressed.js</option></arg>
- </cmdsynopsis>
- </refsect1>
-</refentry>
Modified: trunk/yui-compressor/debian/yui-compressor.install
===================================================================
--- trunk/yui-compressor/debian/yui-compressor.install 2010-01-17 18:46:30 UTC (rev 11361)
+++ trunk/yui-compressor/debian/yui-compressor.install 2010-01-17 18:47:52 UTC (rev 11362)
@@ -1,3 +1,2 @@
build/yui-compressor.jar /usr/share/yui-compressor
debian/bin/yui-compressor /usr/bin
-yui-compressor.1.gz /usr/share/man/man1
More information about the pkg-java-commits
mailing list