[SCM] java-package packaging branch, master, updated. d7060e07977007ffbf5199efaf69e267febc999b
Cédric Pineau
cedric.pineau at gmail.com
Sun Aug 19 12:46:39 UTC 2012
The following commit has been merged in the master branch:
commit 6a9680451b596aecf3cdfe355c902b184bf20e04
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Feb 6 10:44:48 2012 +0100
Replaced references to "Java 2" by "Java SE"
Signed-off-by: Cédric Pineau <cedric.pineau at gmail.com>
diff --git a/lib/j2re.sh b/lib/j2re.sh
index 2a8c05a..c5d8322 100644
--- a/lib/j2re.sh
+++ b/lib/j2re.sh
@@ -9,7 +9,7 @@ Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2
Provides: java-virtual-machine, java-runtime, java2-runtime, java-runtime-headless, java2-runtime-headless, java-browser-plugin, j2re${j2se_release}
Replaces: ${j2se_package}debian
Description: $j2se_title
- The Java(TM) 2 Runtime Environment contains the Java virtual machine,
+ The Java(TM) SE Runtime Environment contains the Java virtual machine,
runtime class libraries, and Java application launcher that are
necessary to run programs written in the Java progamming language
(this includes the Java 2 Plug-In for Netscape and Mozilla
diff --git a/lib/j2sdk-doc.sh b/lib/j2sdk-doc.sh
index 2a56db9..5b13531 100644
--- a/lib/j2sdk-doc.sh
+++ b/lib/j2sdk-doc.sh
@@ -8,7 +8,7 @@ Recommends:
Provides:
Replaces:
Description: $j2se_title
- The Java(TM) 2 SDK is a development environment for building
+ The Java(TM) SE JDK is a development environment for building
applications, applets, and components that can be deployed on the
Java(TM) platform.
.
diff --git a/lib/j2sdk.sh b/lib/j2sdk.sh
index 988cd6e..f8143e5 100644
--- a/lib/j2sdk.sh
+++ b/lib/j2sdk.sh
@@ -9,11 +9,11 @@ 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, j2sdk$j2se_release, j2re$j2se_release
Replaces: ${j2se_package}debian
Description: $j2se_title
- The Java(TM) 2 SDK is a development environment for building
+ The Java(TM) SE JDK is a development environment for building
applications, applets, and components that can be deployed on the
Java(TM) platform.
.
- The Java(TM) 2 SDK software includes tools useful for developing and
+ The Java(TM) SE JDK software includes tools useful for developing and
testing programs written in the Java programming language and running
on the Java platform. These tools are designed to be used from the
command line. Except for appletviewer, these tools do not provide a
diff --git a/make-jpkg b/make-jpkg
index 0e1d315..74c743b 100755
--- a/make-jpkg
+++ b/make-jpkg
@@ -71,9 +71,9 @@ $program_name builds a Debian package from the given Java binary distribution FI
Supported java binary distributions currently include:
* Oracle (http://www.oracle.com/technetwork/java/javase/downloads) :
- - The J2SE Development Kit (JDK), version 6 (update >= 10), 7
- - The J2SE Runtime Environment (JRE), version 6 (update >= 10), 7
- - The J2SE API Javadoc, version 6 (update >= 10), 7
+ - The Java Development Kit (JDK), version 6 (update >= 10), 7
+ - The Java Runtime Environment (JRE), version 6 (update >= 10), 7
+ - The Java API Javadoc, version 6 (update >= 10), 7
(Choose tar.gz archives or self-extracting archives, do _not_ choose the RPM!)
The following options are recognized:
--
java-package packaging
More information about the pkg-java-commits
mailing list