Author: mkoch
Date: 2008-02-19 15:20:29 +0000 (Tue, 19 Feb 2008)
New Revision: 5745

Modified:
   trunk/rhino/debian/changelog
   trunk/rhino/debian/control
   trunk/rhino/debian/rhino-jsc.1
   trunk/rhino/debian/rhino.1
   trunk/rhino/debian/rules
   trunk/rhino/debian/watch
Log:
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



Modified: trunk/rhino/debian/changelog
===================================================================
--- trunk/rhino/debian/changelog        2008-02-19 15:03:19 UTC (rev 5744)
+++ trunk/rhino/debian/changelog        2008-02-19 15:20:29 UTC (rev 5745)
@@ -1,3 +1,12 @@
+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.

Modified: trunk/rhino/debian/control
===================================================================
--- trunk/rhino/debian/control  2008-02-19 15:03:19 UTC (rev 5744)
+++ trunk/rhino/debian/control  2008-02-19 15:20:29 UTC (rev 5745)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]>
 Uploaders: Arnaud Vandyck <[EMAIL PROTECTED]>, Paul Cager <[EMAIL PROTECTED]>, 
Marcus Better <[EMAIL PROTECTED]>, Michael Koch <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 5), cdbs, ant, java-gcj-compat-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 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/rhino-jsc.1
===================================================================
--- trunk/rhino/debian/rhino-jsc.1      2008-02-19 15:03:19 UTC (rev 5744)
+++ trunk/rhino/debian/rhino-jsc.1      2008-02-19 15:20:29 UTC (rev 5745)
@@ -57,13 +57,10 @@
 
 Example compiling the NervousText.js applet written in JavaScript. The example 
is provided in the rhino-doc package.
 
-$ rhino-jsc -extends java.applet.Applet -implements java.lang.Runnable 
NervousText.js 
+$ rhino-jsc \-extends java.applet.Applet \-implements java.lang.Runnable 
NervousText.js 
 
 .SH SEE ALSO
-The online documentation under
-.UR http://www.mozilla.org/rhino/jsc.html
-.I http://www.mozilla.org/rhino/jsc.html
-.UE
+The online documentation under http://www.mozilla.org/rhino/jsc.html
 
 .SH AUTHOR
 This manual page was written by Wolfgang Baer <[EMAIL PROTECTED]>,

Modified: trunk/rhino/debian/rhino.1
===================================================================
--- trunk/rhino/debian/rhino.1  2008-02-19 15:03:19 UTC (rev 5744)
+++ trunk/rhino/debian/rhino.1  2008-02-19 15:20:29 UTC (rev 5745)
@@ -84,10 +84,7 @@
 Get or set JavaScript version number. If no argument is supplied, the current 
version number is returned. If an argument is supplied, it is expected to be 
one of 100, 110, 120, 130, or 140 to indicate JavaScript version 1.0, 1.1, 1.2, 
1.3, or 1.4 respectively.
 
 .SH SEE ALSO
-The online documentation under
-.UR http://www.mozilla.org/rhino/shell.html
-.I http://www.mozilla.org/rhino/shell.html
-.UE
+The online documentation under http://www.mozilla.org/rhino/shell.html
 
 .SH AUTHOR
 This manual page was written by Wolfgang Baer <[EMAIL PROTECTED]>,

Modified: trunk/rhino/debian/rules
===================================================================
--- trunk/rhino/debian/rules    2008-02-19 15:03:19 UTC (rev 5744)
+++ trunk/rhino/debian/rules    2008-02-19 15:20:29 UTC (rev 5745)
@@ -1,25 +1,17 @@
 #!/usr/bin/make -f
-# debian/rules file for rhino (uses cdbs)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME := /usr/lib/jvm/java-gcj
-ANT_HOME := /usr/share/ant
 
-DEB_ANT_CLEAN_TARGET := clean
 DEB_ANT_BUILD_TARGET := jar javadoc 
 
-VERSION        := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 
| cut -d'-' -f1)
-UVERSION       := $(shell echo $(VERSION) | sed "s/\.R/R/")
+UVERSION       := $(shell echo $(DEB_UPSTREAM_VERSION) | sed "s/~RC.//")
 BUILDDIRVERSION        := $(subst .,_,$(UVERSION))
 
-JARNAME=js
 BUILDDIR=build/rhino$(BUILDDIRVERSION)
-JARFILE=$(BUILDDIR)/$(JARNAME).jar
 
-JAVALIBDIR     = debian/rhino/usr/share/java
-
 clean::
        rm -rf toolsrc/org/mozilla/javascript/tools/debugger/downloaded/*
        rm -rf build
@@ -38,9 +30,8 @@
        cp 
debian/src_from_treetable_article_see_bug409629/TreeTableModelAdapter.java 
toolsrc/org/mozilla/javascript/tools/debugger/downloaded/
 
 install/rhino::
-       mkdir -p $(JAVALIBDIR)
-       install -m 644 $(JARFILE) $(JAVALIBDIR)/$(JARNAME)-$(UVERSION).jar
-       ln -s $(JARNAME)-$(UVERSION).jar $(JAVALIBDIR)/$(JARNAME).jar
+       install -m 644 -D $(BUILDDIR)/js.jar 
debian/rhino/usr/share/java/js-$(UVERSION).jar
+       dh_link -prhino usr/share/java/js-$(UVERSION).jar usr/share/java/js.jar
 
 install/rhino-doc::
        mv $(BUILDDIR)/javadoc debian/rhino-doc/usr/share/doc/rhino-doc/apidocs

Modified: trunk/rhino/debian/watch
===================================================================
--- trunk/rhino/debian/watch    2008-02-19 15:03:19 UTC (rev 5744)
+++ trunk/rhino/debian/watch    2008-02-19 15:20:29 UTC (rev 5745)
@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/\.R/R/ \
+opts=uversionmangle=s/-RC/~RC/ \
   ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino(.*)_(.*)\.zip debian uupdate


_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits

Reply via email to