Author: drazzib Date: 2011-01-24 18:54:41 +0000 (Mon, 24 Jan 2011) New Revision: 13240
Added: tags/rhino/1.7R3~pre-1/ tags/rhino/1.7R3~pre-1/debian/changelog tags/rhino/1.7R3~pre-1/debian/control tags/rhino/1.7R3~pre-1/debian/patches/01_rhino-nowarn.patch tags/rhino/1.7R3~pre-1/debian/patches/02_exclude-jdk15.patch tags/rhino/1.7R3~pre-1/debian/rules tags/rhino/1.7R3~pre-1/debian/source/ Removed: tags/rhino/1.7R3~pre-1/debian/README.source tags/rhino/1.7R3~pre-1/debian/changelog tags/rhino/1.7R3~pre-1/debian/control tags/rhino/1.7R3~pre-1/debian/patches/01_rhino-nowarn.patch tags/rhino/1.7R3~pre-1/debian/patches/02_exclude-jdk15.patch tags/rhino/1.7R3~pre-1/debian/rules Log: [svn-buildpackage] Tagging rhino 1.7R3~pre-1 Deleted: tags/rhino/1.7R3~pre-1/debian/README.source =================================================================== --- trunk/rhino/debian/README.source 2010-12-31 00:19:32 UTC (rev 13192) +++ tags/rhino/1.7R3~pre-1/debian/README.source 2011-01-24 18:54:41 UTC (rev 13240) @@ -1,9 +0,0 @@ -Patch System -============ - -This package uses quilt to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. - -See /usr/share/doc/quilt/README.source for a detailed explanation. - Deleted: tags/rhino/1.7R3~pre-1/debian/changelog =================================================================== --- trunk/rhino/debian/changelog 2010-12-31 00:19:32 UTC (rev 13192) +++ tags/rhino/1.7R3~pre-1/debian/changelog 2011-01-24 18:54:41 UTC (rev 13240) @@ -1,236 +0,0 @@ -rhino (1.7R2-4) unstable; urgency=low - - * Enable E4X support: - - Build-Depends on libxmlbeans-java - - Set JAR location in debian/ant.properties - - Should fix (Closes: #567847) and (LP: #304702) - * Bump Standards-Version to 3.8.4 (no changes needed) - * Fix small typo in rhino-jsc manpage - * Fix debian/copyright: don't use symlink to license - - -- Damien Raude-Morvan <[email protected]> Sat, 06 Feb 2010 21:19:47 +0100 - -rhino (1.7R2-3) unstable; urgency=low - - * Maven POMs: - - debian/control: add a Build-Depends on maven-repo-helper - - debian/rules: use mh_installpoms and mh_installjar - to install the POM and the jar to the Maven repository - - debian/pom.xml: Debian pom.xml file as upstream doesn't provide one - - debian/rules: new get-orig-pom to update debian/pom.xml at new upstream - release. - * Bump debhelper version to >= 7 - * debian/rhino.1: Describe more precisly optimization levels and add missing - level '-1'. Thanks to Marcus Better for notifying (Closes: #558086) - * Remove Arnaud Vandyck from Uploaders - * Add description to debian/patches/*.diff - - -- Damien Raude-Morvan <[email protected]> Sat, 12 Dec 2009 15:18:24 +0100 - -rhino (1.7R2-2) unstable; urgency=low - - * Switch to Quilt patch system: - - Refresh all patches - - Add B-D on quilt - - Include patchsys-quilt.mk in debian/rules - * Bump Standards-Version to 3.8.3: - - Add a README.source to describe patch system - * Add a manpage for rhino-debugger script - * Build-Depends on default-jdk instead of default-jdk-builddep - because we don't build a native GCJ package - * Move api documentation to /usr/share/doc/rhino/api/ - * debian/control: Improve rhino-doc package long description - * debian/copyright: Add missing BSD licence (3 clauses) for files under - toolsrc/org/mozilla/javascript/tools/debugger/treetable - * Update my email address - - -- Damien Raude-Morvan <[email protected]> Fri, 02 Oct 2009 22:23:46 +0200 - -rhino (1.7R2-1) unstable; urgency=low - - [ Marcus Better ] - * Updated package descriptions. - - [ Matthias Klose ] - * (Build-)depend on default-jre-headless/-jdk. - * Drop alternate dependencies on java2-runtime-headless and - java2-runtime-headless. The binary package is currently built to - require a java5 runtime. - - [ Damien Raude-Morvan ] - * New upstream release. - - new 02_exclude-jdk15 patch to exclude already compiled classes - for jdk15 rebuild: gcj doesn't handle compiling classes already - on its classpath - - new "rhino-debugger" launcher for Rhino Debugger Swing UI - - update "rhino" launcher to exclude OpenJDK bundled rhino (Closes: #512498) - * debian/{postinst,prerm }: scripts should take care of errors, - add set -e before any instruction - * debian/rules: add new get-orig-source target using uscan - * debian/control: - - Build-Depends on specialized default-jdk-builddep instead of - default-jdk - - Bump Standards-Version to 3.8.1: Wrap Uploaders field - - add Depends on ${misc:Depends} - - -- Damien Raude-Morvan <[email protected]> Mon, 13 Apr 2009 02:40:15 +0200 - -rhino (1.7R2~pre-2) experimental; urgency=low - - * Really include the debugger. Closes: #474046. - - -- Michael Koch <[email protected]> Sat, 05 Apr 2008 15:03:43 +0200 - -rhino (1.7R2~pre-1) experimental; urgency=low - - * New upstream release. - * Upload to experimental. - * Enable build of debugger. Closes: #474046. - - -- Michael Koch <[email protected]> Fri, 04 Apr 2008 10:32:47 +0200 - -rhino (1.7R1-1) unstable; urgency=low - - * New upstream release. - - -- Michael Koch <[email protected]> Sat, 22 Mar 2008 13:49:49 +0100 - -rhino (1.7R1~RC3-1) experimental; urgency=low - - * New upstream version. - * Fixed hyphen in rhino-jsc manpage. - * Updated watch file to handle upstream RC versions. - * Updated Standards-Version to 3.7.3. - - -- Michael Koch <[email protected]> Tue, 19 Feb 2008 11:17:45 +0100 - -rhino (1.6.R7-2) unstable; urgency=low - - * Fixed bashism in debian/rules. Closes: #453766. - * Fixed names of Homepage, Vcs-Svn and Vcs-Browser fields. - * Added myself to Uploaders. - - -- Michael Koch <[email protected]> Sat, 01 Dec 2007 11:56:31 +0100 - -rhino (1.6.R7-1) unstable; urgency=low - - * New upstream version. - - -- Marcus Better <[email protected]> Thu, 11 Oct 2007 15:50:42 +0200 - -rhino (1.6.R5-3) unstable; urgency=low - - * Removed Wolfgang Baer from Uploaders and added myself. - * Fixed FTBFS: java.net.ConnectException: Connection refused. - Was trying to download xmlbeans Jar, which is not allowed. As - this Jar is not (yet) in Debian, rhino has been built with XML - implementation disabled. - A bug in 1.6.R5-2 meant that it was still trying to download the - "treetable" source. This has been fixed in debian/rules by copying the - sample source code into the "downloaded" directory (the sample source code - had to be modified). - (Closes: #424466) - * Moved "-doc" package to doc section. - - -- Paul Cager <[email protected]> Sun, 15 Jul 2007 00:32:12 +0100 - -rhino (1.6.R5-2) unstable; urgency=low - - * added java classes from a tutorial from Sun (BSD license as mentionned - in #409629), thanks to Roktas, Filipe Lautert and Bruno Harbulot for - filing bug, giving infos and proposed a patch (even if it's not - used). I've just removed the 02-dont_build-toolsrc.patch. I added the - classes examples if needed but it seems not to be the case (closes: - #409629). - - -- Arnaud Vandyck <[email protected]> Fri, 11 May 2007 14:07:21 +0200 - -rhino (1.6.R5-1) unstable; urgency=low - - * New upstream maintenance release. - - -- Matthias Klose <[email protected]> Sat, 3 Feb 2007 16:46:28 +0100 - -rhino (1.6R2-3) unstable; urgency=low - - * debian/patches/02-dont_build-toolsrc.patch: added. Don't build toolsrc - and xmlimplsrc because they use Sun classes to build. If you want to - build them, just remove the file (closes: #395525). - - -- Arnaud Vandyck <[email protected]> Mon, 6 Nov 2006 12:54:28 +0100 - -rhino (1.6R2-2) unstable; urgency=low - - * Changed the dependency from kaffe to java-gcj-compat. - - -- Arnaud Vandyck <[email protected]> Sun, 5 Nov 2006 17:45:52 +0100 - -rhino (1.6R2-1) unstable; urgency=low - - * New upstream (closes: #350971). - * Removed Takashi Okamoto <[email protected]> from uploaders (closes: - #352992) - * Updated Standards-Version to 3.7.2: moved debhelper and cdbs to - Build-Depends. - * Build with java-gcj-compat. - * debian/copyright: updated the download url. - * debian/watch: new file. - - -- Arnaud Vandyck <[email protected]> Mon, 17 Jul 2006 14:50:36 +0200 - -rhino (1.5.R5-5) unstable; urgency=low - - * Removed explicit usage of jikes build compiler property - for kaffe jikes -> ecj transition - - -- Wolfgang Baer <[email protected]> Fri, 6 Jan 2006 18:54:28 +0100 - -rhino (1.5.R5-4) unstable; urgency=low - - * libant1.6-java to ant transition - * Removed dependency on java-common - * Added suggests to rhino-doc and other way round - * Registered documentation with doc-base - * Fixed lintian warning in postinst and added override - for false positive lintian warning - * Standards-Version 3.6.2 (no changes) - - -- Wolfgang Baer <[email protected]> Sat, 24 Sep 2005 23:31:36 +0200 - -rhino (1.5.R5-3) unstable; urgency=low - - * Added java2-runtime to runtime choices - * Removed build.xml workaround patch which is no longer - needed with the current kaffe in sarge/unstable - - -- Wolfgang Baer <[email protected]> Wed, 13 Apr 2005 19:30:40 +0200 - -rhino (1.5.R5-2) unstable; urgency=low - - * Closes: #283651: alternative without a manpage - * upload to main: uses kaffe,jikes to build - * provide JavaScript compiler as rhino-jsc with manpage - * Arnaud Vandyck <[email protected]> did sponsor this package. As a - member of pkg-java Alioth's project, I added Wolfgang as uploaders - - -- Wolfgang Baer <[email protected]> Sat, 12 Feb 2005 11:56:06 +0000 - -rhino (1.5.R5-1) unstable; urgency=low - - * New upstream release - * changed the build system to cdbs - - -- Arnaud Vandyck <[email protected]> Sun, 21 Nov 2004 14:29:34 +0100 - -rhino (1.5.R2-2) unstable; urgency=low - - * Add alternative for /usr/bin/js. The patch is provided by Brian - Bassett. (Closes:#122669) - - -- Takashi Okamoto <[email protected]> Sat, 8 Dec 2001 10:45:06 +0900 - -rhino (1.5.R2-1) unstable; urgency=low - - * Initial Release. - - -- Takashi Okamoto <[email protected]> Fri, 16 Nov 2001 23:51:38 +0900 Copied: tags/rhino/1.7R3~pre-1/debian/changelog (from rev 13239, trunk/rhino/debian/changelog) =================================================================== --- tags/rhino/1.7R3~pre-1/debian/changelog (rev 0) +++ tags/rhino/1.7R3~pre-1/debian/changelog 2011-01-24 18:54:41 UTC (rev 13240) @@ -0,0 +1,247 @@ +rhino (1.7R3~pre-1) experimental; urgency=low + + * New upstream snapshot of 1.7R3: + - Needed by OpenJDK7 >= b126 + - d/patches/*: Refresh all patches + - d/rules: Force version installed by mh_* tools + * Bump Standards-Version to 3.9.1 (no changes needed) + * Switch to 3.0 (quilt) source format + + -- Damien Raude-Morvan <[email protected]> Mon, 24 Jan 2011 19:49:04 +0100 + +rhino (1.7R2-4) unstable; urgency=low + + * Enable E4X support: + - Build-Depends on libxmlbeans-java + - Set JAR location in debian/ant.properties + - Should fix (Closes: #567847) and (LP: #304702) + * Bump Standards-Version to 3.8.4 (no changes needed) + * Fix small typo in rhino-jsc manpage + * Fix debian/copyright: don't use symlink to license + + -- Damien Raude-Morvan <[email protected]> Sat, 06 Feb 2010 21:19:47 +0100 + +rhino (1.7R2-3) unstable; urgency=low + + * Maven POMs: + - debian/control: add a Build-Depends on maven-repo-helper + - debian/rules: use mh_installpoms and mh_installjar + to install the POM and the jar to the Maven repository + - debian/pom.xml: Debian pom.xml file as upstream doesn't provide one + - debian/rules: new get-orig-pom to update debian/pom.xml at new upstream + release. + * Bump debhelper version to >= 7 + * debian/rhino.1: Describe more precisly optimization levels and add missing + level '-1'. Thanks to Marcus Better for notifying (Closes: #558086) + * Remove Arnaud Vandyck from Uploaders + * Add description to debian/patches/*.diff + + -- Damien Raude-Morvan <[email protected]> Sat, 12 Dec 2009 15:18:24 +0100 + +rhino (1.7R2-2) unstable; urgency=low + + * Switch to Quilt patch system: + - Refresh all patches + - Add B-D on quilt + - Include patchsys-quilt.mk in debian/rules + * Bump Standards-Version to 3.8.3: + - Add a README.source to describe patch system + * Add a manpage for rhino-debugger script + * Build-Depends on default-jdk instead of default-jdk-builddep + because we don't build a native GCJ package + * Move api documentation to /usr/share/doc/rhino/api/ + * debian/control: Improve rhino-doc package long description + * debian/copyright: Add missing BSD licence (3 clauses) for files under + toolsrc/org/mozilla/javascript/tools/debugger/treetable + * Update my email address + + -- Damien Raude-Morvan <[email protected]> Fri, 02 Oct 2009 22:23:46 +0200 + +rhino (1.7R2-1) unstable; urgency=low + + [ Marcus Better ] + * Updated package descriptions. + + [ Matthias Klose ] + * (Build-)depend on default-jre-headless/-jdk. + * Drop alternate dependencies on java2-runtime-headless and + java2-runtime-headless. The binary package is currently built to + require a java5 runtime. + + [ Damien Raude-Morvan ] + * New upstream release. + - new 02_exclude-jdk15 patch to exclude already compiled classes + for jdk15 rebuild: gcj doesn't handle compiling classes already + on its classpath + - new "rhino-debugger" launcher for Rhino Debugger Swing UI + - update "rhino" launcher to exclude OpenJDK bundled rhino (Closes: #512498) + * debian/{postinst,prerm }: scripts should take care of errors, + add set -e before any instruction + * debian/rules: add new get-orig-source target using uscan + * debian/control: + - Build-Depends on specialized default-jdk-builddep instead of + default-jdk + - Bump Standards-Version to 3.8.1: Wrap Uploaders field + - add Depends on ${misc:Depends} + + -- Damien Raude-Morvan <[email protected]> Mon, 13 Apr 2009 02:40:15 +0200 + +rhino (1.7R2~pre-2) experimental; urgency=low + + * Really include the debugger. Closes: #474046. + + -- Michael Koch <[email protected]> Sat, 05 Apr 2008 15:03:43 +0200 + +rhino (1.7R2~pre-1) experimental; urgency=low + + * New upstream release. + * Upload to experimental. + * Enable build of debugger. Closes: #474046. + + -- Michael Koch <[email protected]> Fri, 04 Apr 2008 10:32:47 +0200 + +rhino (1.7R1-1) unstable; urgency=low + + * New upstream release. + + -- Michael Koch <[email protected]> Sat, 22 Mar 2008 13:49:49 +0100 + +rhino (1.7R1~RC3-1) experimental; urgency=low + + * New upstream version. + * Fixed hyphen in rhino-jsc manpage. + * Updated watch file to handle upstream RC versions. + * Updated Standards-Version to 3.7.3. + + -- Michael Koch <[email protected]> Tue, 19 Feb 2008 11:17:45 +0100 + +rhino (1.6.R7-2) unstable; urgency=low + + * Fixed bashism in debian/rules. Closes: #453766. + * Fixed names of Homepage, Vcs-Svn and Vcs-Browser fields. + * Added myself to Uploaders. + + -- Michael Koch <[email protected]> Sat, 01 Dec 2007 11:56:31 +0100 + +rhino (1.6.R7-1) unstable; urgency=low + + * New upstream version. + + -- Marcus Better <[email protected]> Thu, 11 Oct 2007 15:50:42 +0200 + +rhino (1.6.R5-3) unstable; urgency=low + + * Removed Wolfgang Baer from Uploaders and added myself. + * Fixed FTBFS: java.net.ConnectException: Connection refused. + Was trying to download xmlbeans Jar, which is not allowed. As + this Jar is not (yet) in Debian, rhino has been built with XML + implementation disabled. + A bug in 1.6.R5-2 meant that it was still trying to download the + "treetable" source. This has been fixed in debian/rules by copying the + sample source code into the "downloaded" directory (the sample source code + had to be modified). + (Closes: #424466) + * Moved "-doc" package to doc section. + + -- Paul Cager <[email protected]> Sun, 15 Jul 2007 00:32:12 +0100 + +rhino (1.6.R5-2) unstable; urgency=low + + * added java classes from a tutorial from Sun (BSD license as mentionned + in #409629), thanks to Roktas, Filipe Lautert and Bruno Harbulot for + filing bug, giving infos and proposed a patch (even if it's not + used). I've just removed the 02-dont_build-toolsrc.patch. I added the + classes examples if needed but it seems not to be the case (closes: + #409629). + + -- Arnaud Vandyck <[email protected]> Fri, 11 May 2007 14:07:21 +0200 + +rhino (1.6.R5-1) unstable; urgency=low + + * New upstream maintenance release. + + -- Matthias Klose <[email protected]> Sat, 3 Feb 2007 16:46:28 +0100 + +rhino (1.6R2-3) unstable; urgency=low + + * debian/patches/02-dont_build-toolsrc.patch: added. Don't build toolsrc + and xmlimplsrc because they use Sun classes to build. If you want to + build them, just remove the file (closes: #395525). + + -- Arnaud Vandyck <[email protected]> Mon, 6 Nov 2006 12:54:28 +0100 + +rhino (1.6R2-2) unstable; urgency=low + + * Changed the dependency from kaffe to java-gcj-compat. + + -- Arnaud Vandyck <[email protected]> Sun, 5 Nov 2006 17:45:52 +0100 + +rhino (1.6R2-1) unstable; urgency=low + + * New upstream (closes: #350971). + * Removed Takashi Okamoto <[email protected]> from uploaders (closes: + #352992) + * Updated Standards-Version to 3.7.2: moved debhelper and cdbs to + Build-Depends. + * Build with java-gcj-compat. + * debian/copyright: updated the download url. + * debian/watch: new file. + + -- Arnaud Vandyck <[email protected]> Mon, 17 Jul 2006 14:50:36 +0200 + +rhino (1.5.R5-5) unstable; urgency=low + + * Removed explicit usage of jikes build compiler property + for kaffe jikes -> ecj transition + + -- Wolfgang Baer <[email protected]> Fri, 6 Jan 2006 18:54:28 +0100 + +rhino (1.5.R5-4) unstable; urgency=low + + * libant1.6-java to ant transition + * Removed dependency on java-common + * Added suggests to rhino-doc and other way round + * Registered documentation with doc-base + * Fixed lintian warning in postinst and added override + for false positive lintian warning + * Standards-Version 3.6.2 (no changes) + + -- Wolfgang Baer <[email protected]> Sat, 24 Sep 2005 23:31:36 +0200 + +rhino (1.5.R5-3) unstable; urgency=low + + * Added java2-runtime to runtime choices + * Removed build.xml workaround patch which is no longer + needed with the current kaffe in sarge/unstable + + -- Wolfgang Baer <[email protected]> Wed, 13 Apr 2005 19:30:40 +0200 + +rhino (1.5.R5-2) unstable; urgency=low + + * Closes: #283651: alternative without a manpage + * upload to main: uses kaffe,jikes to build + * provide JavaScript compiler as rhino-jsc with manpage + * Arnaud Vandyck <[email protected]> did sponsor this package. As a + member of pkg-java Alioth's project, I added Wolfgang as uploaders + + -- Wolfgang Baer <[email protected]> Sat, 12 Feb 2005 11:56:06 +0000 + +rhino (1.5.R5-1) unstable; urgency=low + + * New upstream release + * changed the build system to cdbs + + -- Arnaud Vandyck <[email protected]> Sun, 21 Nov 2004 14:29:34 +0100 + +rhino (1.5.R2-2) unstable; urgency=low + + * Add alternative for /usr/bin/js. The patch is provided by Brian + Bassett. (Closes:#122669) + + -- Takashi Okamoto <[email protected]> Sat, 8 Dec 2001 10:45:06 +0900 + +rhino (1.5.R2-1) unstable; urgency=low + + * Initial Release. + + -- Takashi Okamoto <[email protected]> Fri, 16 Nov 2001 23:51:38 +0900 Deleted: tags/rhino/1.7R3~pre-1/debian/control =================================================================== --- trunk/rhino/debian/control 2010-12-31 00:19:32 UTC (rev 13192) +++ tags/rhino/1.7R3~pre-1/debian/control 2011-01-24 18:54:41 UTC (rev 13240) @@ -1,33 +0,0 @@ -Source: rhino -Section: interpreters -Priority: optional -Maintainer: Debian Java Maintainers <[email protected]> -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, quilt, maven-repo-helper, libxmlbeans-java -Standards-Version: 3.8.4 -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/ - -Package: rhino -Architecture: all -Depends: ${misc:Depends}, default-jre-headless (>= 1.5) | java5-runtime-headless, libjline-java -Suggests: rhino-doc -Description: JavaScript engine written in Java - Rhino is an implementation of the JavaScript language written - entirely in Java. It is typically embedded into Java applications to - provide scripting to end users. - -Package: rhino-doc -Section: doc -Architecture: all -Depends: ${misc:Depends} -Suggests: rhino -Description: Documentation for rhino Java Script Engine - Rhino is an implementation of the JavaScript language written - entirely in Java. It is typically embedded into Java applications to - provide scripting to end users. - . - This is the documentation, including API JavaDoc, for the Rhino - JavaScript engine. Copied: tags/rhino/1.7R3~pre-1/debian/control (from rev 13239, trunk/rhino/debian/control) =================================================================== --- tags/rhino/1.7R3~pre-1/debian/control (rev 0) +++ tags/rhino/1.7R3~pre-1/debian/control 2011-01-24 18:54:41 UTC (rev 13240) @@ -0,0 +1,33 @@ +Source: rhino +Section: interpreters +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +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 +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/ + +Package: rhino +Architecture: all +Depends: ${misc:Depends}, default-jre-headless (>= 1.5) | java5-runtime-headless, libjline-java +Suggests: rhino-doc +Description: JavaScript engine written in Java + Rhino is an implementation of the JavaScript language written + entirely in Java. It is typically embedded into Java applications to + provide scripting to end users. + +Package: rhino-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Suggests: rhino +Description: Documentation for rhino Java Script Engine + Rhino is an implementation of the JavaScript language written + entirely in Java. It is typically embedded into Java applications to + provide scripting to end users. + . + This is the documentation, including API JavaDoc, for the Rhino + JavaScript engine. Deleted: tags/rhino/1.7R3~pre-1/debian/patches/01_rhino-nowarn.patch =================================================================== --- trunk/rhino/debian/patches/01_rhino-nowarn.patch 2010-12-31 00:19:32 UTC (rev 13192) +++ tags/rhino/1.7R3~pre-1/debian/patches/01_rhino-nowarn.patch 2011-01-24 18:54:41 UTC (rev 13240) @@ -1,20 +0,0 @@ -Description: Pass "nowarn" to javac ant task to disable printing of warning - during compilation. ---- a/src/build.xml -+++ b/src/build.xml -@@ -57,6 +57,7 @@ - debug="${debug}" - target="${target-jvm}" - source="${source-level}" -+ nowarn="true" - > - </javac> - <copy todir="${classes}"> -@@ -76,6 +77,7 @@ - debug="${debug}" - target="${target-jvm}" - source="${source-level}" -+ nowarn="true" - > - </javac> - </target> Copied: tags/rhino/1.7R3~pre-1/debian/patches/01_rhino-nowarn.patch (from rev 13239, trunk/rhino/debian/patches/01_rhino-nowarn.patch) =================================================================== --- tags/rhino/1.7R3~pre-1/debian/patches/01_rhino-nowarn.patch (rev 0) +++ tags/rhino/1.7R3~pre-1/debian/patches/01_rhino-nowarn.patch 2011-01-24 18:54:41 UTC (rev 13240) @@ -0,0 +1,20 @@ +Description: Pass "nowarn" to javac ant task to disable printing of warning + during compilation. +--- a/src/build.xml ++++ b/src/build.xml +@@ -65,6 +65,7 @@ + debug="${debug}" + target="${target-jvm}" + source="${source-level}" ++ nowarn="true" + > + </javac> + <copy todir="${classes}"> +@@ -84,6 +85,7 @@ + debug="${debug}" + target="${target-jvm}" + source="${source-level}" ++ nowarn="true" + > + </javac> + </target> Deleted: tags/rhino/1.7R3~pre-1/debian/patches/02_exclude-jdk15.patch =================================================================== --- trunk/rhino/debian/patches/02_exclude-jdk15.patch 2010-12-31 00:19:32 UTC (rev 13192) +++ tags/rhino/1.7R3~pre-1/debian/patches/02_exclude-jdk15.patch 2011-01-24 18:54:41 UTC (rev 13240) @@ -1,12 +0,0 @@ -Description: Exclude everything except "jdk1.5/**" when building - 1.5 specific source code. ---- a/src/build.xml -+++ b/src/build.xml -@@ -72,6 +72,7 @@ - <target name="compile-jdk15" if="jdk15"> - <javac srcdir="src" - destdir="${classes}" -+ excludes="org/**/*.java" - includes="org/**/jdk15/*.java" - deprecation="on" - debug="${debug}" Copied: tags/rhino/1.7R3~pre-1/debian/patches/02_exclude-jdk15.patch (from rev 13239, trunk/rhino/debian/patches/02_exclude-jdk15.patch) =================================================================== --- tags/rhino/1.7R3~pre-1/debian/patches/02_exclude-jdk15.patch (rev 0) +++ tags/rhino/1.7R3~pre-1/debian/patches/02_exclude-jdk15.patch 2011-01-24 18:54:41 UTC (rev 13240) @@ -0,0 +1,12 @@ +Description: Exclude everything except "jdk1.5/**" when building + 1.5 specific source code. +--- a/src/build.xml ++++ b/src/build.xml +@@ -80,6 +80,7 @@ + <target name="compile-jdk15" if="jdk15"> + <javac srcdir="src" + destdir="${classes}" ++ excludes="org/**/*.java" + includes="org/**/jdk15/*.java" + deprecation="on" + debug="${debug}" Deleted: tags/rhino/1.7R3~pre-1/debian/rules =================================================================== --- trunk/rhino/debian/rules 2010-12-31 00:19:32 UTC (rev 13192) +++ tags/rhino/1.7R3~pre-1/debian/rules 2011-01-24 18:54:41 UTC (rev 13240) @@ -1,49 +0,0 @@ -#!/usr/bin/make -f - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/class/ant.mk - -JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_BUILD_TARGET := jar javadoc - -UVERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed "s/~RC.//" | sed "s/~pre//") -BUILDDIRVERSION := $(subst .,_,$(UVERSION)) - -BUILDDIR=build/rhino$(BUILDDIRVERSION) - -POM_VERSION := $(UVERSION) -MAVEN_REPO := http://repository.sonatype.org/service/local/repositories/central/content - -clean:: - rm -rf toolsrc/org/mozilla/javascript/tools/debugger/downloaded/* - rm -rf build - -rm -rf debian/tmp - -# 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 -# debugger. This is obviously not permitted during a Debian build. -# Fortunately the sample code is DFSG-free, so it has been included in the debian directory (in -# its modified format). Copying it to the "downloaded" directory prevents the upstream -# build.xml from attempting to download it. -configure/rhino:: - mkdir -p toolsrc/org/mozilla/javascript/tools/debugger/downloaded - cp debian/src_from_treetable_article_see_bug409629/AbstractCellEditor.java toolsrc/org/mozilla/javascript/tools/debugger/downloaded/ - cp debian/src_from_treetable_article_see_bug409629/JTreeTable.java toolsrc/org/mozilla/javascript/tools/debugger/downloaded/ - cp debian/src_from_treetable_article_see_bug409629/TreeTableModel.java toolsrc/org/mozilla/javascript/tools/debugger/downloaded/ - cp debian/src_from_treetable_article_see_bug409629/TreeTableModelAdapter.java toolsrc/org/mozilla/javascript/tools/debugger/downloaded/ - -install/rhino:: - mh_installpoms -prhino - mh_installjar -prhino -l debian/pom.xml $(BUILDDIR)/js.jar - -install/rhino-doc:: - mv $(BUILDDIR)/javadoc $(BUILDDIR)/api - dh_install -prhino-doc $(BUILDDIR)/api /usr/share/doc/rhino/ - -get-orig-source: - uscan --force-download --repack - -get-orig-pom: - wget -O debian/pom.xml $(MAVEN_REPO)/rhino/js/$(POM_VERSION)/js-$(POM_VERSION).pom - Copied: tags/rhino/1.7R3~pre-1/debian/rules (from rev 13239, trunk/rhino/debian/rules) =================================================================== --- tags/rhino/1.7R3~pre-1/debian/rules (rev 0) +++ tags/rhino/1.7R3~pre-1/debian/rules 2011-01-24 18:54:41 UTC (rev 13240) @@ -0,0 +1,48 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/ant.mk + +JAVA_HOME := /usr/lib/jvm/default-java +DEB_ANT_BUILD_TARGET := jar javadoc + +UVERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed "s/~RC.//" | sed "s/~pre/pre/") +BUILDDIRVERSION := $(subst .,_,$(UVERSION)) + +BUILDDIR=build/rhino$(BUILDDIRVERSION) + +POM_VERSION := $(UVERSION) +MAVEN_REPO := http://repository.sonatype.org/service/local/repositories/central/content + +clean:: + rm -rf toolsrc/org/mozilla/javascript/tools/debugger/downloaded/* + rm -rf build + -rm -rf debian/tmp + +# 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 +# debugger. This is obviously not permitted during a Debian build. +# Fortunately the sample code is DFSG-free, so it has been included in the debian directory (in +# its modified format). Copying it to the "downloaded" directory prevents the upstream +# build.xml from attempting to download it. +configure/rhino:: + mkdir -p toolsrc/org/mozilla/javascript/tools/debugger/downloaded + cp debian/src_from_treetable_article_see_bug409629/AbstractCellEditor.java toolsrc/org/mozilla/javascript/tools/debugger/downloaded/ + cp debian/src_from_treetable_article_see_bug409629/JTreeTable.java toolsrc/org/mozilla/javascript/tools/debugger/downloaded/ + cp debian/src_from_treetable_article_see_bug409629/TreeTableModel.java toolsrc/org/mozilla/javascript/tools/debugger/downloaded/ + cp debian/src_from_treetable_article_see_bug409629/TreeTableModelAdapter.java toolsrc/org/mozilla/javascript/tools/debugger/downloaded/ + +install/rhino:: + mh_installpoms -prhino -e$(UVERSION) + mh_installjar -prhino -e$(UVERSION) -l debian/pom.xml $(BUILDDIR)/js.jar + +install/rhino-doc:: + mv $(BUILDDIR)/javadoc $(BUILDDIR)/api + dh_install -prhino-doc $(BUILDDIR)/api /usr/share/doc/rhino/ + +get-orig-source: + uscan --force-download --repack + +get-orig-pom: + wget -O debian/pom.xml $(MAVEN_REPO)/rhino/js/$(POM_VERSION)/js-$(POM_VERSION).pom + _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
