[pkg-java] r13239 - in trunk/rhino/debian: . patches source

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-01-24 18:52:19 +0000 (Mon, 24 Jan 2011)
New Revision: 13239

Added:
   trunk/rhino/debian/source/
   trunk/rhino/debian/source/format
Removed:
   trunk/rhino/debian/README.source
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/rules
Log:
* 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

Deleted: trunk/rhino/debian/README.source
===================================================================
--- trunk/rhino/debian/README.source	2011-01-21 05:09:49 UTC (rev 13238)
+++ trunk/rhino/debian/README.source	2011-01-24 18:52:19 UTC (rev 13239)
@@ -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.
-

Modified: trunk/rhino/debian/changelog
===================================================================
--- trunk/rhino/debian/changelog	2011-01-21 05:09:49 UTC (rev 13238)
+++ trunk/rhino/debian/changelog	2011-01-24 18:52:19 UTC (rev 13239)
@@ -1,3 +1,14 @@
+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 <drazzib at debian.org>  Mon, 24 Jan 2011 19:49:04 +0100
+
 rhino (1.7R2-4) unstable; urgency=low
 
   * Enable E4X support:

Modified: trunk/rhino/debian/control
===================================================================
--- trunk/rhino/debian/control	2011-01-21 05:09:49 UTC (rev 13238)
+++ trunk/rhino/debian/control	2011-01-24 18:52:19 UTC (rev 13239)
@@ -4,8 +4,8 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Paul Cager <paul-debian at home.paulcager.org>,
   Marcus Better <marcus at better.se>, Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, ant, default-jdk, quilt, maven-repo-helper, libxmlbeans-java
-Standards-Version: 3.8.4
+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/

Modified: trunk/rhino/debian/patches/01_rhino-nowarn.patch
===================================================================
--- trunk/rhino/debian/patches/01_rhino-nowarn.patch	2011-01-21 05:09:49 UTC (rev 13238)
+++ trunk/rhino/debian/patches/01_rhino-nowarn.patch	2011-01-24 18:52:19 UTC (rev 13239)
@@ -2,7 +2,7 @@
  during compilation.
 --- a/src/build.xml
 +++ b/src/build.xml
-@@ -57,6 +57,7 @@
+@@ -65,6 +65,7 @@
             debug="${debug}"
         target="${target-jvm}"
         source="${source-level}"
@@ -10,7 +10,7 @@
         >
      </javac>
      <copy todir="${classes}">
-@@ -76,6 +77,7 @@
+@@ -84,6 +85,7 @@
             debug="${debug}"
         target="${target-jvm}"
         source="${source-level}"

Modified: trunk/rhino/debian/patches/02_exclude-jdk15.patch
===================================================================
--- trunk/rhino/debian/patches/02_exclude-jdk15.patch	2011-01-21 05:09:49 UTC (rev 13238)
+++ trunk/rhino/debian/patches/02_exclude-jdk15.patch	2011-01-24 18:52:19 UTC (rev 13239)
@@ -2,7 +2,7 @@
  1.5 specific source code.
 --- a/src/build.xml
 +++ b/src/build.xml
-@@ -72,6 +72,7 @@
+@@ -80,6 +80,7 @@
    <target name="compile-jdk15" if="jdk15">
      <javac srcdir="src"
             destdir="${classes}"

Modified: trunk/rhino/debian/rules
===================================================================
--- trunk/rhino/debian/rules	2011-01-21 05:09:49 UTC (rev 13238)
+++ trunk/rhino/debian/rules	2011-01-24 18:52:19 UTC (rev 13239)
@@ -1,13 +1,12 @@
 #!/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//")
+UVERSION	:= $(shell echo $(DEB_UPSTREAM_VERSION) | sed "s/~RC.//" | sed "s/~pre/pre/")
 BUILDDIRVERSION	:= $(subst .,_,$(UVERSION))
 
 BUILDDIR=build/rhino$(BUILDDIRVERSION)
@@ -34,8 +33,8 @@
 	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
+	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

Added: trunk/rhino/debian/source/format
===================================================================
--- trunk/rhino/debian/source/format	                        (rev 0)
+++ trunk/rhino/debian/source/format	2011-01-24 18:52:19 UTC (rev 13239)
@@ -0,0 +1 @@
+3.0 (quilt)