Author: drazzib Date: 2011-05-25 21:46:41 +0000 (Wed, 25 May 2011) New Revision: 13707
Added: trunk/rhino/debian/orig-tar.exclude trunk/rhino/debian/orig-tar.sh Modified: trunk/rhino/debian/changelog trunk/rhino/debian/control trunk/rhino/debian/patches/01_rhino-nowarn.patch trunk/rhino/debian/patches/02_exclude-jdk15.patch trunk/rhino/debian/pom.xml trunk/rhino/debian/rules trunk/rhino/debian/watch Log: * New upstream release: - Upstream changelog <https://developer.mozilla.org/en/New_in_Rhino_1.7R3> - Refresh all patches. * Bump Standards-Version to 3.9.2 (no changes needed). * d/rules: replace "rm debian/tmp" by mh_clean call. Modified: trunk/rhino/debian/changelog =================================================================== --- trunk/rhino/debian/changelog 2011-05-25 21:31:43 UTC (rev 13706) +++ trunk/rhino/debian/changelog 2011-05-25 21:46:41 UTC (rev 13707) @@ -1,3 +1,13 @@ +rhino (1.7R3-1) experimental; urgency=low + + * New upstream release: + - Upstream changelog <https://developer.mozilla.org/en/New_in_Rhino_1.7R3> + - Refresh all patches. + * Bump Standards-Version to 3.9.2 (no changes needed). + * d/rules: replace "rm debian/tmp" by mh_clean call. + + -- Damien Raude-Morvan <[email protected]> Wed, 25 May 2011 23:43:56 +0200 + rhino (1.7R3~pre-2) experimental; urgency=low * Fix parsing of command line arguments by using quotes. Modified: trunk/rhino/debian/control =================================================================== --- trunk/rhino/debian/control 2011-05-25 21:31:43 UTC (rev 13706) +++ trunk/rhino/debian/control 2011-05-25 21:46:41 UTC (rev 13707) @@ -5,7 +5,7 @@ Uploaders: Paul Cager <[email protected]>, Marcus Better <[email protected]>, Michael Koch <[email protected]>, Damien Raude-Morvan <[email protected]> Build-Depends: debhelper (>= 7), cdbs, ant, default-jdk, maven-repo-helper, libxmlbeans-java -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: http://www.mozilla.org/rhino/ Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/rhino/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/rhino/ Added: trunk/rhino/debian/orig-tar.exclude =================================================================== --- trunk/rhino/debian/orig-tar.exclude (rev 0) +++ trunk/rhino/debian/orig-tar.exclude 2011-05-25 21:46:41 UTC (rev 13707) @@ -0,0 +1,3 @@ +javadoc/* +js.jar +js-14.jar Added: trunk/rhino/debian/orig-tar.sh =================================================================== --- trunk/rhino/debian/orig-tar.sh (rev 0) +++ trunk/rhino/debian/orig-tar.sh 2011-05-25 21:46:41 UTC (rev 13707) @@ -0,0 +1,12 @@ +#!/bin/sh -e + +# called by uscan with '--upstream-version' <version> <file> +DIR=rhino-$2 +TAR=rhino_$2.orig.tar.gz + +# Repack upstream source to tar.gz +unzip $3 +mv rhino* $DIR +GZIP=--best tar czf $TAR -X debian/orig-tar.exclude $DIR +rm -rf $DIR + Property changes on: trunk/rhino/debian/orig-tar.sh ___________________________________________________________________ Added: svn:executable + * Modified: trunk/rhino/debian/patches/01_rhino-nowarn.patch =================================================================== --- trunk/rhino/debian/patches/01_rhino-nowarn.patch 2011-05-25 21:31:43 UTC (rev 13706) +++ trunk/rhino/debian/patches/01_rhino-nowarn.patch 2011-05-25 21:46:41 UTC (rev 13707) @@ -2,19 +2,19 @@ during compilation. --- a/src/build.xml +++ b/src/build.xml -@@ -65,6 +65,7 @@ +@@ -62,6 +62,7 @@ + includes="org/**/*.java" + excludes="org/**/jdk15/*.java" + deprecation="on" ++ nowarn="true" debug="${debug}" - target="${target-jvm}" - source="${source-level}" -+ nowarn="true" - > - </javac> - <copy todir="${classes}"> -@@ -84,6 +85,7 @@ + includeAntRuntime="false" + target="${target-jvm}" +@@ -80,6 +81,7 @@ + destdir="${classes}" + includes="org/**/jdk15/*.java" + deprecation="on" ++ nowarn="true" debug="${debug}" - target="${target-jvm}" - source="${source-level}" -+ nowarn="true" - > - </javac> - </target> + includeAntRuntime="false" + target="${target-jvm}" Modified: trunk/rhino/debian/patches/02_exclude-jdk15.patch =================================================================== --- trunk/rhino/debian/patches/02_exclude-jdk15.patch 2011-05-25 21:31:43 UTC (rev 13706) +++ trunk/rhino/debian/patches/02_exclude-jdk15.patch 2011-05-25 21:46:41 UTC (rev 13707) @@ -2,11 +2,11 @@ 1.5 specific source code. --- a/src/build.xml +++ b/src/build.xml -@@ -80,6 +80,7 @@ +@@ -79,6 +79,7 @@ <target name="compile-jdk15" if="jdk15"> <javac srcdir="src" destdir="${classes}" + excludes="org/**/*.java" includes="org/**/jdk15/*.java" deprecation="on" - debug="${debug}" + nowarn="true" Modified: trunk/rhino/debian/pom.xml =================================================================== --- trunk/rhino/debian/pom.xml 2011-05-25 21:31:43 UTC (rev 13706) +++ trunk/rhino/debian/pom.xml 2011-05-25 21:46:41 UTC (rev 13707) @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>rhino</groupId> <artifactId>js</artifactId> - <version>1.7R2</version> + <version>1.7R3</version> <packaging>jar</packaging> <name>Rhino</name> <description>Rhino is an open-source implementation of JavaScript written entirely in Java. It is typically embedded into Java applications to provide scripting to end users.</description> Modified: trunk/rhino/debian/rules =================================================================== --- trunk/rhino/debian/rules 2011-05-25 21:31:43 UTC (rev 13706) +++ trunk/rhino/debian/rules 2011-05-25 21:46:41 UTC (rev 13707) @@ -17,7 +17,7 @@ clean:: rm -rf toolsrc/org/mozilla/javascript/tools/debugger/downloaded/* rm -rf build - -rm -rf debian/tmp + mh_clean # The upstream build file (toolsrc/org/mozilla/javascript/tools/debugger/build.xml) downloads # a ZIP file containing some sample swing code, which is then modified and used as part of the @@ -41,7 +41,7 @@ dh_install -plibrhino-java-doc $(BUILDDIR)/api /usr/share/doc/rhino/ get-orig-source: - uscan --force-download --repack + uscan --force-download get-orig-pom: wget -O debian/pom.xml $(MAVEN_REPO)/rhino/js/$(POM_VERSION)/js-$(POM_VERSION).pom Modified: trunk/rhino/debian/watch =================================================================== --- trunk/rhino/debian/watch 2011-05-25 21:31:43 UTC (rev 13706) +++ trunk/rhino/debian/watch 2011-05-25 21:46:41 UTC (rev 13707) @@ -1,3 +1,3 @@ version=3 opts=uversionmangle=s/-RC/~RC/;s/pre/~pre/ \ - ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino(.*)_(.*)\.zip debian uupdate + ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino(.*)_(.*)\.zip debian debian/orig-tar.sh _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
