CVS java-package

[Jeroen van Wolffelaar]

Update of /cvsroot/pkg-java/java-package
In directory haydn:/tmp/cvs-serv13883

Modified Files:
	make-jpkg 
Log Message:
Patch provided by Joshua Kwan <joshk@debian.org>, doing the following of which
I'm not going to dissict back in per-fix changes:

  * Unclutter Debian build system and rework package slightly so that
    *debian packages are not needed anymore. The necessary files will be
    included in the generated packages. (Closes: #291145, #289245, #284779)
  * Add support for Blackdown 1.4.2+01 build. (Closes: #285405)
  * Fix support for Sun 1.5.0 amd64 builds due to typo. (Closes: #290879)
  * Mozilla browser plugin name changed in 1.4.2 versions. Detect and correct.
    (Closes: #273730)
  * Use DEBFULLNAME, DEBNAME and DEBEMAIL as first-priority defaults for
    maintainer name and email, if available. (Closes: #279653)
  * Use --block-size=1M instead of -BM. (Closes: #289005, #291161)
  * Disable support for Sun JDK 1.3 due to its dependencies on libraries
    that are simply not available anymore. (Closes: #272972)
  * Fix up short description a little bit.
  * Bump Standards-Version to 3.6.1 (no changes)
  * Be a bit more conservative with the real-root test.
  * Remove last j2se-package references.
  * Change Suggests on fakeroot to a Depends because it is worthless both
    as real root and as a normal user without fakeroot.



--- /cvsroot/pkg-java/java-package/make-jpkg	2005/01/04 02:56:24	1.6
+++ /cvsroot/pkg-java/java-package/make-jpkg	2005/01/24 23:07:35	1.7
@@ -25,7 +25,7 @@
 	cat << EOF
 Usage: $program_name [OPTION]... FILE
 
-j2se-package builds Debian packages from Java(TM) 2 binary distributions.
+$program_name builds Debian packages from Java(TM) 2 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
@@ -56,7 +56,7 @@
 # options
 while [[ $# -gt 0 && "x$1" == x--* ]]; do
     if [[ "x$1" == x--version ]]; then
-	echo "j2se-package $version"
+	echo "make-jpkg $version"
 	exit 0
     elif [[ "x$1" == x--help ]]; then
 	print_usage
@@ -106,11 +106,17 @@
 fi
 
 # check whether I'm real root, and bail out if so... ugly, but needed
-if mkdir /java-package.$$.please-remove-me 2>/dev/null; then
-	rmdir /java-package.$$.please-remove-me
-	echo "You are real root -- unfortunately, some package install stubs" >&2
-	echo "do evil things in /etc and such, therefore it is important you" >&2
-	echo "run make-jpkg as a non-root user using fakeroot." >&2
+if touch /lib/.test 2>/dev/null; then
+	rm -f /lib/.test
+	echo "You are real root -- unfortunately, some Java distributions have" >&2
+	echo "install scripts that directly manipulate /etc, and may cause some" >&2
+	echo "inconsistencies on your system. Instead, you should become a" >&2
+	echo "non-root user and run:" >&2
+	echo >&2
+	echo "fakeroot make-jpkg $@" >&2
+	echo >&2
+	echo "which will allow no damage to be done to your system files and" >&2
+	echo "still permit the Java distribution to successfully extract." >&2
 	echo >&2
 	echo "Aborting." >&2
 	exit 1