[SCM] java-package packaging branch, master, updated. e4a69a493cb024bf4c746b21bdbc115d7142d610

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit e4a69a493cb024bf4c746b21bdbc115d7142d610
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date:   Sat Jan 21 13:38:22 2012 +0100

    Drop some old information

diff --git a/make-jpkg b/make-jpkg
index e1e16ce..5a788db 100755
--- a/make-jpkg
+++ b/make-jpkg
@@ -67,7 +67,7 @@ print_usage() {
 	cat << EOF
 Usage: $program_name [OPTION]... FILE
 
-$program_name builds Debian packages from Java(TM) 2 binary distributions.
+$program_name builds Debian packages from Java binary distributions.
 
   --full-name NAME   full name used in the maintainer field of the package
   --email EMAIL      email address used in the maintainer field of the package
diff --git a/make-jpkg.1 b/make-jpkg.1
index dee5358..62108ee 100644
--- a/make-jpkg.1
+++ b/make-jpkg.1
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-make-jpkg \- build Debian packages from Java(TM) 2 binary distributions
+make-jpkg \- build Debian packages from Java binary distributions
 .SH SYNOPSIS
 .B make-jpkg
 [\fIOPTION\fR]... [\fIFILE\fR]
@@ -25,8 +25,8 @@ make-jpkg \- build Debian packages from Java(TM) 2 binary distributions
 .\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
 .\" respectively.
 .PP
-\fBmake-jpkg\fP creates a Debian package from a Java(TM) 2
-distribution. This program works currently with the following Java(TM) 2 REs, SDKs and APIs:
+\fBmake-jpkg\fP creates a Debian package from a Java
+distribution. This program works currently with the following Java REs, SDKs and APIs:
  Oracle(TM) 1.6 Standard Edition (starting with update 10)
  Oracle(TM) 1.7 Standard Edition
 .PP
@@ -50,7 +50,7 @@ display help text and exit
 .B --version
 output version information and exit
 .PP
-Download a supported Java(TM) 2 RE or SDK or API tar.gz or self-extracting archive from
+Download a supported Java RE or SDK or API tar.gz or self-extracting archive from
 .B http://www.oracle.com/technetwork/java/javase/downloads
 and execute
 .B make-jpkg

-- 
java-package packaging