r2279 - in trunk/rhino/debian: . patches

Arnaud Vandyck avdyk at costa.debian.org
Mon Jul 17 12:51:18 UTC 2006 

Author: avdyk
Date: 2006-07-17 12:51:17 +0000 (Mon, 17 Jul 2006)
New Revision: 2279

Added:
   trunk/rhino/debian/watch
Removed:
   trunk/rhino/debian/patches/02-remove-swing-things.patch
   trunk/rhino/debian/patches/02-remove-swing-things.unpatch
Modified:
   trunk/rhino/debian/changelog
   trunk/rhino/debian/control
   trunk/rhino/debian/copyright
   trunk/rhino/debian/rhino-doc.docs
   trunk/rhino/debian/rhino.links
   trunk/rhino/debian/rules
Log:
rhino (1.6R2-1) unstable; urgency=low

  * New upstream (closes: #350971).
  * Removed Takashi Okamoto <tora at debian.org> 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 <avdyk at debian.org>  Mon, 17 Jul 2006 14:50:36 +0200


Modified: trunk/rhino/debian/changelog
===================================================================
--- trunk/rhino/debian/changelog	2006-07-11 08:14:23 UTC (rev 2278)
+++ trunk/rhino/debian/changelog	2006-07-17 12:51:17 UTC (rev 2279)
@@ -1,3 +1,16 @@
+rhino (1.6R2-1) unstable; urgency=low
+
+  * New upstream (closes: #350971).
+  * Removed Takashi Okamoto <tora at debian.org> 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 <avdyk at debian.org>  Mon, 17 Jul 2006 14:50:36 +0200
+
 rhino (1.5.R5-5) unstable; urgency=low
 
   * Removed explicit usage of jikes build compiler property

Modified: trunk/rhino/debian/control
===================================================================
--- trunk/rhino/debian/control	2006-07-11 08:14:23 UTC (rev 2278)
+++ trunk/rhino/debian/control	2006-07-17 12:51:17 UTC (rev 2279)
@@ -2,9 +2,10 @@
 Section: interpreters
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Takashi Okamoto <tora at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs, ant, kaffe (>= 2:1.1.5-3) 
-Standards-Version: 3.6.2
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
+Build-Depends: debhelper (>= 4.2.30), cdbs
+Build-Depends-Indep: ant, java-gcj-compat-dev
+Standards-Version: 3.7.2
 
 Package: rhino
 Architecture: all

Modified: trunk/rhino/debian/copyright
===================================================================
--- trunk/rhino/debian/copyright	2006-07-11 08:14:23 UTC (rev 2278)
+++ trunk/rhino/debian/copyright	2006-07-17 12:51:17 UTC (rev 2279)
@@ -1,7 +1,7 @@
 This package was debianized by Takashi Okamoto <tora at debian.org> on
 Fri, 16 Nov 2001 23:51:38 +0900.
 
-It was downloaded from ftp://ftp.mozilla.org/pub/js/.
+It was downloaded from ftp://ftp.mozilla.org/pub/mozilla.org/js/.
 
 Copyright:
      AMENDMENTS

Deleted: trunk/rhino/debian/patches/02-remove-swing-things.patch
===================================================================
--- trunk/rhino/debian/patches/02-remove-swing-things.patch	2006-07-11 08:14:23 UTC (rev 2278)
+++ trunk/rhino/debian/patches/02-remove-swing-things.patch	2006-07-17 12:51:17 UTC (rev 2279)
@@ -1,15 +0,0 @@
---- toolsrc/build.xml.orig	2004-11-21 14:11:23.726293256 +0100
-+++ toolsrc/build.xml	2004-11-21 14:12:26.692720904 +0100
-@@ -62,10 +62,11 @@
-     </replace>
-   </target>
- 
--  <target name="compile" depends="properties,get-swing-ex">
-+  <target name="compile" depends="properties">
-     <javac srcdir="."
-            destdir="${nest}/${classes}"
-            includes="org/**/*.java"
-+           excludes="**/debugger/*"
-            deprecation="on"
-            debug="${debug}">
-     </javac>

Deleted: trunk/rhino/debian/patches/02-remove-swing-things.unpatch
===================================================================
--- trunk/rhino/debian/patches/02-remove-swing-things.unpatch	2006-07-11 08:14:23 UTC (rev 2278)
+++ trunk/rhino/debian/patches/02-remove-swing-things.unpatch	2006-07-17 12:51:17 UTC (rev 2279)
@@ -1,15 +0,0 @@
---- toolsrc/build.xml.orig	2004-11-21 14:11:23.726293256 +0100
-+++ toolsrc/build.xml	2004-11-21 14:12:26.692720904 +0100
-@@ -62,10 +62,11 @@
-     </replace>
-   </target>
- 
--  <target name="compile" depends="properties,get-swing-ex">
-+  <target name="compile" depends="properties">
-     <javac srcdir="."
-            destdir="${nest}/${classes}"
-            includes="org/**/*.java"
-+           excludes="**/debugger/*"
-            deprecation="on"
-            debug="${debug}">
-     </javac>

Modified: trunk/rhino/debian/rhino-doc.docs
===================================================================
--- trunk/rhino/debian/rhino-doc.docs	2006-07-11 08:14:23 UTC (rev 2278)
+++ trunk/rhino/debian/rhino-doc.docs	2006-07-17 12:51:17 UTC (rev 2279)
@@ -1 +1 @@
-build/rhino1_5R5/docs/*
+build/rhino1_6R2/docs/*

Modified: trunk/rhino/debian/rhino.links
===================================================================
--- trunk/rhino/debian/rhino.links	2006-07-11 08:14:23 UTC (rev 2278)
+++ trunk/rhino/debian/rhino.links	2006-07-17 12:51:17 UTC (rev 2279)
@@ -1 +1 @@
-/usr/share/java/js-1.5.R5.jar  /usr/share/java/js.jar 
+/usr/share/java/js-1.6R2.jar  /usr/share/java/js.jar 

Modified: trunk/rhino/debian/rules
===================================================================
--- trunk/rhino/debian/rules	2006-07-11 08:14:23 UTC (rev 2278)
+++ trunk/rhino/debian/rules	2006-07-17 12:51:17 UTC (rev 2279)
@@ -5,22 +5,21 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME := /usr/lib/kaffe
+JAVA_HOME := /usr/lib/jvm/java-gcj
 ANT_HOME := /usr/share/ant
 
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar
 DEB_ANT_CLEAN_TARGET := clean
 DEB_ANT_BUILD_TARGET := jar javadoc 
 
 PNAME=js
-JARFILE=build/rhino1_5R5/${PNAME}.jar
-VERSION=1.5.R5
+JARFILE=build/rhino1_6R2/${PNAME}.jar
+VERSION=1.6R2
 
 clean::
 	-rm -fr build
 
 install/rhino::
-	rm -f build/rhino1_5R5/docs/apidocs/package-list
+	rm -f build/rhino1_6R2/docs/apidocs/package-list
 	install -m 644 ${JARFILE} $(CURDIR)/debian/rhino/usr/share/java/${PNAME}-${VERSION}.jar
 	install -m 744 debian/rhino.sh $(CURDIR)/debian/rhino/usr/bin/rhino
 	install -m 744 debian/rhino-jsc.sh $(CURDIR)/debian/rhino/usr/bin/rhino-jsc

Added: trunk/rhino/debian/watch
===================================================================
--- trunk/rhino/debian/watch	2006-07-11 08:14:23 UTC (rev 2278)
+++ trunk/rhino/debian/watch	2006-07-17 12:51:17 UTC (rev 2279)
@@ -0,0 +1,2 @@
+version=3
+ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino(.*)_(.*)\.zip debian uupdate

More information about the pkg-java-commits mailing list