[pkg-java] r4943 - trunk/icedtea/debian

[twerner at alioth.debian.org]

Author: twerner
Date: 2007-12-02 21:34:34 +0000 (Sun, 02 Dec 2007)
New Revision: 4943

Modified:
   trunk/icedtea/debian/control
   trunk/icedtea/debian/control.in
   trunk/icedtea/debian/rules
Log:
minor fixes


Modified: trunk/icedtea/debian/control
===================================================================
--- trunk/icedtea/debian/control	2007-12-02 14:48:15 UTC (rev 4942)
+++ trunk/icedtea/debian/control	2007-12-02 21:34:34 UTC (rev 4943)
@@ -21,7 +21,7 @@
 Package: icedtea-java7-jre
 Architecture: all
 Section: interpreters
-Depends: icedtea-java7-bin (>= ${base:Version}), java-common, ${shlibs:Depends}, ${misc:Depends}
+Depends: icedtea-java7-bin (>= ${source:Version}), java-common, ${shlibs:Depends}, ${misc:Depends}
 Suggests: icedtea-java7-plugin, sun-java6-fonts, ttf-baekmuk | ttf-unfonts | ttf-unfonts-core, ttf-kochi-gothic | ttf-sazanami-gothic , ttf-kochi-mincho | ttf-sazanami-mincho, ttf-arphic-uming
 Provides: java-runtime, java2-runtime, java5-runtime, java6-runtime, java7-runtime
 Description: Java runtime based on OpenJDK

Modified: trunk/icedtea/debian/control.in
===================================================================
--- trunk/icedtea/debian/control.in	2007-12-02 14:48:15 UTC (rev 4942)
+++ trunk/icedtea/debian/control.in	2007-12-02 21:34:34 UTC (rev 4943)
@@ -21,7 +21,7 @@
 Package: icedtea-java7-jre
 Architecture: all
 Section: interpreters
-Depends: icedtea-java7-bin (>= ${base:Version}), java-common, ${shlibs:Depends}, ${misc:Depends}
+Depends: icedtea-java7-bin (>= ${source:Version}), java-common, ${shlibs:Depends}, ${misc:Depends}
 Suggests: icedtea-java7-plugin, sun-java6-fonts, ttf-baekmuk | ttf-unfonts | ttf-unfonts-core, ttf-kochi-gothic | ttf-sazanami-gothic , ttf-kochi-mincho | ttf-sazanami-mincho, ttf-arphic-uming
 Provides: java-runtime, java2-runtime, java5-runtime, java6-runtime, java7-runtime
 Description: Java runtime based on OpenJDK

Modified: trunk/icedtea/debian/rules
===================================================================
--- trunk/icedtea/debian/rules	2007-12-02 14:48:15 UTC (rev 4942)
+++ trunk/icedtea/debian/rules	2007-12-02 21:34:34 UTC (rev 4943)
@@ -82,7 +82,7 @@
 	--with-icedtea-home=/usr/lib/jvm/java-7-icedtea \
 	--with-java=/usr/lib/jvm/java-7-icedtea/bin/java \
 	--with-javah=/usr/lib/jvm/java-7-icedtea/bin/javah \
-	--with-rmic=/usr/lib/jvm/java-7-icedtea/binrmic \
+	--with-rmic=/usr/lib/jvm/java-7-icedtea/bin/rmic \
 	--with-jar=/usr/lib/jvm/java-7-icedtea/bin/jar \
 	--with-xalan2-jar=/usr/share/java/xalan2.jar \
 	--with-xalan2-serializer-jar=/usr/share/java/serializer.jar
@@ -186,7 +186,6 @@
 
 bd_options = -- -Zbzip2
 control_vars = \
-	'-Vbase:Version=7~b21' \
 	'-Vdlopen:Depends=$(dlopen_depends)' \
 	'-Vdlopen:Recommends=$(dlopen_recommends)' \