The following commit has been merged in the master branch:
commit 848a06f1b5db110b32fc4d42c63b9bc3abc79d1d
Author: Emmanuel Bourg <[email protected]>
Date: Wed Jun 5 15:07:45 2013 +0200
Provide the java<version-1>-runtime and java<version-2>-runtime dependencies
diff --git a/lib/jdk.sh b/lib/jdk.sh
index 1453dc0..99b0587 100644
--- a/lib/jdk.sh
+++ b/lib/jdk.sh
@@ -17,7 +17,7 @@ Package: $j2se_package
Architecture: any
Depends: $depends
Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2, libstdc++5
-Provides: java-virtual-machine, java-runtime, java2-runtime,
$java_browser_plugin java-compiler, java2-compiler, java-runtime-headless,
java2-runtime-headless, java-sdk, java2-sdk, java$((${j2se_release}-2))-sdk,
java$((${j2se_release}-1))-sdk, java${j2se_release}-sdk, j2sdk$j2se_release,
j2re$j2se_release
+Provides: java-virtual-machine, java-runtime, java2-runtime,
java${j2se_release}-runtime, java$((${j2se_release}-1))-runtime,
java$((${j2se_release}-2))-runtime, $java_browser_plugin java-compiler,
java2-compiler, java-runtime-headless, java2-runtime-headless,
java${j2se_release}-runtime-headless,
java$((${j2se_release}-1))-runtime-headless,
java$((${j2se_release}-2))-runtime-headless, java-sdk, java2-sdk,
java$((${j2se_release}-2))-sdk, java$((${j2se_release}-1))-sdk,
java${j2se_release}-sdk, j2sdk$j2se_release, j2re$j2se_release
Replaces: ${j2se_package}debian
Description: $j2se_title
The Java(TM) SE JDK is a development environment for building
diff --git a/lib/jre.sh b/lib/jre.sh
index 864f141..436dea2 100644
--- a/lib/jre.sh
+++ b/lib/jre.sh
@@ -6,7 +6,7 @@ Package: $j2se_package
Architecture: any
Depends: \${shlibs:Depends}
Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2
-Provides: java-virtual-machine, java-runtime, java2-runtime, java5-runtime,
java6-runtime, java-runtime-headless, java2-runtime-headless,
java5-runtime-headless, java6-runtime-headless, java-browser-plugin,
j2re${j2se_release}
+Provides: java-virtual-machine, java-runtime, java2-runtime,
java${j2se_release}-runtime, java$((${j2se_release}-1))-runtime,
java$((${j2se_release}-2))-runtime, java-runtime-headless,
java2-runtime-headless, java${j2se_release}-runtime-headless,
java$((${j2se_release}-1))-runtime-headless,
java$((${j2se_release}-2))-runtime-headless, java-browser-plugin,
j2re${j2se_release}
Replaces: ${j2se_package}debian
Description: $j2se_title
The Java(TM) SE Runtime Environment contains the Java virtual machine,
--
java-package packaging
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
