[SCM] UNNAMED PROJECT branch, master, updated. 0.40-3-g1917a14

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit 1917a146f1b73eaf7cc9709c24689dd6ed706dea
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date:   Fri Feb 24 15:52:18 2012 +0100

    Update of the documentation regarding recent changes in jh_makepkg

diff --git a/jh_makepkg.1 b/jh_makepkg.1
index eb06557..846c4dc 100644
--- a/jh_makepkg.1
+++ b/jh_makepkg.1
@@ -30,11 +30,10 @@ Pick One:
 \fB\-k\fR \fB\-\-makefiles\fR: Build with make
 \fB\-n\fR \fB\-\-none\fR: Create own buildsystem
 Pick One:
-\fB\-5\fR \fB\-\-sun5\fR: Build with Sun Java 1.5 (package must be contrib)
-\fB\-6\fR \fB\-\-sun6\fR: Build with Sun Java <1.6 (package must be contrib)
 \fB\-g\fR \fB\-\-gcj\fR: Build with gcj
 \fB\-d\fR \fB\-\-default\fR: Build with default free compiler
 \fB\-o\fR \fB\-\-openjdk\fR: Build with OpenJDK 6
+\fB\-o7\fR \fB\-\-openjdk7\fR: Build with OpenJDK 7
 .SS "Environment Variables:"
 .IP
 DEBEMAIL: Default maintainer email address

-- 
UNNAMED PROJECT