[pkg-java] r11044 - trunk/yuicompressor/debian

Damien Raude-Morvan drazzib at alioth.debian.org
Mon Nov 9 22:39:03 UTC 2009 

Author: drazzib
Date: 2009-11-09 22:39:02 +0000 (Mon, 09 Nov 2009)
New Revision: 11044

Added:
   trunk/yuicompressor/debian/orig-tar.exclude
   trunk/yuicompressor/debian/orig-tar.sh
Removed:
   trunk/yuicompressor/debian/dirs
Modified:
   trunk/yuicompressor/debian/
   trunk/yuicompressor/debian/changelog
   trunk/yuicompressor/debian/compat
   trunk/yuicompressor/debian/control
   trunk/yuicompressor/debian/copyright
   trunk/yuicompressor/debian/docs
   trunk/yuicompressor/debian/rules
   trunk/yuicompressor/debian/watch
Log:
* TODO FIX CONFLICT WITH RHINO 1.7R2:
  - http://yuilibrary.com/projects/yuicompressor/ticket/1859529
  - http://yuilibrary.com/projects/yuicompressor/ticket/2527981
    [ Release jar needs a rule set to minimize classpath conflicts
      when used in a build environment that has Rhino ]


Property changes on: trunk/yuicompressor/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: trunk/yuicompressor/debian/changelog
===================================================================
--- trunk/yuicompressor/debian/changelog	2009-11-09 14:35:37 UTC (rev 11043)
+++ trunk/yuicompressor/debian/changelog	2009-11-09 22:39:02 UTC (rev 11044)
@@ -1,6 +1,14 @@
 yuicompressor (2.4.2-1) UNRELEASED; urgency=low
 
+  [ Dominik Smatana ]
   * Initial release (closes: #519938)
 
- -- Dominik Smatana <dominik.smatana at gmail.com>  Mon, 30 Mar 2009 21:07:44 +0200
+  [ Damien Raude-Morvan ]
+  * TODO FIX CONFLICT WITH RHINO 1.7R2:
+    - http://yuilibrary.com/projects/yuicompressor/ticket/1859529
+      [ Allow Compressor to work with js.jar ]
+    - http://yuilibrary.com/projects/yuicompressor/ticket/2527981
+      [ Release jar needs a rule set to minimize classpath conflicts
+        when used in a build environment that has Rhino ]
 
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 09 Nov 2009 23:36:47 +0100


Property changes on: trunk/yuicompressor/debian/changelog
___________________________________________________________________
Deleted: svn:executable
   - *

Modified: trunk/yuicompressor/debian/compat
===================================================================
--- trunk/yuicompressor/debian/compat	2009-11-09 14:35:37 UTC (rev 11043)
+++ trunk/yuicompressor/debian/compat	2009-11-09 22:39:02 UTC (rev 11044)
@@ -1 +1 @@
-5
+7


Property changes on: trunk/yuicompressor/debian/compat
___________________________________________________________________
Deleted: svn:executable
   - *

Modified: trunk/yuicompressor/debian/control
===================================================================
--- trunk/yuicompressor/debian/control	2009-11-09 14:35:37 UTC (rev 11043)
+++ trunk/yuicompressor/debian/control	2009-11-09 22:39:02 UTC (rev 11044)
@@ -2,19 +2,17 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Dominik Smatana <dominik.smatana at gmail.com>
-Build-Depends: cdbs (>= 0.4.52), debhelper (>=5.0.30)
-Build-Depends-Indep: default-jdk-builddep, ant, jargs (>= 1.0)
+Uploaders: Dominik Smatana <dominik.smatana at gmail.com>, Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant
+Build-Depends-Indep: libjargs-java
 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
-Standards-Version: 3.8.0
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/yuicompressor/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/yuicompressor/
+Standards-Version: 3.8.3
 
 Package: yuicompressor
 Architecture: all
-Section: java
-Priority: optional
-Depends: openjdk-6-jre | default-jre, jargs (>= 1.0)
+Depends: default-jre-headless, libjargs-java
 Description: YUI Compressor is 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


Property changes on: trunk/yuicompressor/debian/control
___________________________________________________________________
Deleted: svn:executable
   - *

Modified: trunk/yuicompressor/debian/copyright
===================================================================
--- trunk/yuicompressor/debian/copyright	2009-11-09 14:35:37 UTC (rev 11043)
+++ trunk/yuicompressor/debian/copyright	2009-11-09 22:39:02 UTC (rev 11044)
@@ -58,6 +58,7 @@
 
 Files: debian/*
 Copyright: Copyright 2009, Dominik Smatana <dominik.smatana at gmail.com>
+Copyright: Copyright 2009, 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.


Property changes on: trunk/yuicompressor/debian/copyright
___________________________________________________________________
Deleted: svn:executable
   - *

Deleted: trunk/yuicompressor/debian/dirs
===================================================================
--- trunk/yuicompressor/debian/dirs	2009-11-09 14:35:37 UTC (rev 11043)
+++ trunk/yuicompressor/debian/dirs	2009-11-09 22:39:02 UTC (rev 11044)
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/java
-

Modified: trunk/yuicompressor/debian/docs
===================================================================
--- trunk/yuicompressor/debian/docs	2009-11-09 14:35:37 UTC (rev 11043)
+++ trunk/yuicompressor/debian/docs	2009-11-09 22:39:02 UTC (rev 11044)
@@ -1 +1 @@
-doc/
+doc/README


Property changes on: trunk/yuicompressor/debian/docs
___________________________________________________________________
Deleted: svn:executable
   - *

Added: trunk/yuicompressor/debian/orig-tar.exclude
===================================================================
--- trunk/yuicompressor/debian/orig-tar.exclude	                        (rev 0)
+++ trunk/yuicompressor/debian/orig-tar.exclude	2009-11-09 22:39:02 UTC (rev 11044)
@@ -0,0 +1 @@
+*.jar

Added: trunk/yuicompressor/debian/orig-tar.sh
===================================================================
--- trunk/yuicompressor/debian/orig-tar.sh	                        (rev 0)
+++ trunk/yuicompressor/debian/orig-tar.sh	2009-11-09 22:39:02 UTC (rev 11044)
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+# $2 = version
+# $3 = file
+DIR=yuicompressor-$2.orig
+TAR=yuicompressor_$2.orig.tar.gz
+
+# clean up the upstream tarball
+unzip $3
+mv yuicompressor-$2 $DIR
+GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR
+rm -rf $DIR
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+  . .svn/deb-layout
+  mv $TAR $origDir
+  echo "moved $TAR to $origDir"
+fi


Property changes on: trunk/yuicompressor/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/yuicompressor/debian/rules
===================================================================
--- trunk/yuicompressor/debian/rules	2009-11-09 14:35:37 UTC (rev 11043)
+++ trunk/yuicompressor/debian/rules	2009-11-09 22:39:02 UTC (rev 11044)
@@ -5,15 +5,17 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_COMPRESS_EXCLUDE := .class
-JAVA_HOME_DIRS       := /usr/lib/jvm/java-6-openjdk
-ANT_HOME             := /usr/share/ant
-DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar
+JAVA_HOME       := /usr/lib/jvm/default-java
+
+DEB_JARS := js jargs
 DEB_ANT_BUILD_TARGET := build.jar
-# DEB_BUILDDIR         := 
-DEB_DH_INSTALLCHANGELOGS_ARGS := changes.txt
+DEB_DH_INSTALLCHANGELOGS_ARGS := doc/CHANGELOG
 
 LIBRARY=yuicompressor
 VERSION=2.4.2
 
 clean:: 
 	-rm -fr build/*
+
+get-orig-source:
+	uscan --force-download

Modified: trunk/yuicompressor/debian/watch
===================================================================
--- trunk/yuicompressor/debian/watch	2009-11-09 14:35:37 UTC (rev 11043)
+++ trunk/yuicompressor/debian/watch	2009-11-09 22:39:02 UTC (rev 11044)
@@ -1,4 +1,4 @@
 version=3
-http://www.julienlecomte.net/yuicompressor/ \
-  yuicompressor-([\d\.]*).zip
+http://yuilibrary.com/downloads/ \
+  yuicompressor/yuicompressor-([\d\.]*).zip debian debian/orig-tar.sh
 


Property changes on: trunk/yuicompressor/debian/watch
___________________________________________________________________
Deleted: svn:executable
   - *

More information about the pkg-java-commits mailing list