[pkg-java] r12238 - trunk/sun-java6/debian
Torsten Werner
twerner at alioth.debian.org
Sat May 1 08:50:39 UTC 2010
Author: twerner
Date: 2010-05-01 08:50:35 +0000 (Sat, 01 May 2010)
New Revision: 12238
Removed:
trunk/sun-java6/debian/JB-doc.README.Debian.in
trunk/sun-java6/debian/JB-doc.doc-base.in
trunk/sun-java6/debian/JB-doc.overrides.in
trunk/sun-java6/debian/JB-doc.postinst.in
trunk/sun-java6/debian/JB-doc.prerm.in
Modified:
trunk/sun-java6/debian/changelog
trunk/sun-java6/debian/rules
Log:
Remove files for the old -doc package since we Suggests: openjdk-6-doc
today.
Deleted: trunk/sun-java6/debian/JB-doc.README.Debian.in
===================================================================
--- trunk/sun-java6/debian/JB-doc.README.Debian.in 2010-05-01 08:38:55 UTC (rev 12237)
+++ trunk/sun-java6/debian/JB-doc.README.Debian.in 2010-05-01 08:50:35 UTC (rev 12238)
@@ -1,4 +0,0 @@
-This package will install Sun's Documentation for JDK 6, you
-need to download jdk-6u10-docs.zip from
-http://java.sun.com/javase/downloads/ and put it into $TMP
-(with root.root ownership).
Deleted: trunk/sun-java6/debian/JB-doc.doc-base.in
===================================================================
--- trunk/sun-java6/debian/JB-doc.doc-base.in 2010-05-01 08:38:55 UTC (rev 12237)
+++ trunk/sun-java6/debian/JB-doc.doc-base.in 2010-05-01 08:50:35 UTC (rev 12238)
@@ -1,11 +0,0 @@
-Document: @JDK at -doc
-Title: @vendor@ Java(TM) @RELEASE@ JDK, Standard Edition Documentation
-Author: @vendor@
-Abstract: The Java @RELEASE@ Platform Documentation contains API specifications,
- feature descriptions, developer guides, reference pages for JDK tools
- and utilities, demos, and links to related information.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/@basename at -jdk/html/index.html
-Files: /usr/share/doc/@basename at -jdk/html/*/*.html
Deleted: trunk/sun-java6/debian/JB-doc.overrides.in
===================================================================
--- trunk/sun-java6/debian/JB-doc.overrides.in 2010-05-01 08:38:55 UTC (rev 12237)
+++ trunk/sun-java6/debian/JB-doc.overrides.in 2010-05-01 08:50:35 UTC (rev 12238)
@@ -1,5 +0,0 @@
- at basename@-doc: possibly-insecure-handling-of-tmp-files-in-maintainer-script postinst:5
- at basename@-doc: copyright-should-refer-to-common-license-file-for-gpl
- at basename@-doc: package-contains-empty-directory
-# the user needs to download these
- at basename@-doc: doc-base-file-references-missing-file
Deleted: trunk/sun-java6/debian/JB-doc.postinst.in
===================================================================
--- trunk/sun-java6/debian/JB-doc.postinst.in 2010-05-01 08:38:55 UTC (rev 12237)
+++ trunk/sun-java6/debian/JB-doc.postinst.in 2010-05-01 08:50:35 UTC (rev 12238)
@@ -1,103 +0,0 @@
-#! /bin/sh -e
-
-TMP_DIR=${TMP:=/tmp}
-docdir=/usr/share/doc/@basename at -jdk
-tmpdir=${docdir}/tmp
-installdir=${docdir}/html
-url=http://java.sun.com/javase/downloads/
-archives='jdk-6u18-docs.zip jdk-6u18-docs-ja.zip'
-priority=@priority@
-
-
-find_archive()
-{
- archive=does/not/exist
- for a in $archives; do
- if [ -e ${TMP_DIR}/$a ]; then
- archive=$a
- return
- fi
- done
-}
-
-case "$1" in
-configure)
-
- if [ -e $installdir/index.html ]; then
- cat <<-EOF
-
- A current version of the JDK documentation is already installed.
-
- This version will be left in place.
-
- EOF
- exit 0
- fi
- prob=1
- while [ $prob -eq 1 ]; do
- prob=0
- find_archive
- if [ ! -e "${TMP_DIR}/$archive" ]
- then
- cat <<-EOF
- This package is an installer package, it does not actually contain the
- JDK documentation. You will need to go download one of the
- archives:
-
- ${archives}
-
- (choose the non-update version if this is the first installation).
- Please visit
-
- ${url}
-
- now and download. The file should be owned by root.root and be copied
- to ${TMP_DIR}.
- EOF
- prob=1
- elif [ ! -r "${TMP_DIR}/$archive" ]; then
- echo "Error: ${TMP_DIR}/$archive is not readable."
- prob=1
- fi
- if [ $prob -eq 0 ]; then
- rm -rf ${tmpdir}
- mkdir -p ${tmpdir} ${installdir}
- cd ${tmpdir}
- unzip -q -a ${TMP_DIR}/$archive
- dir=`ls | wc -l`
- while [ $dir -eq 1 ]; do
- cd *
- dir=`ls | wc -l`
- done
- mv * ${installdir}
- cd ${installdir}
- rm -rf ${tmpdir}
-# mv ${installdir}/relnotes/demos.html \
-# ${installdir}/relnotes/demos.html.orig
-# sed -e "s:\.\./\.\./demo:/usr/lib/@basename@/demo:g" \
-# ${installdir}/relnotes/demos.html.orig \
-# > ${installdir}/relnotes/demos.html
-# rm ${installdir}/relnotes/demos.html.orig
- chown -R root:root ${installdir}
- chmod -R a=rX,u+w ${installdir}
- fi
- if [ $prob -eq 1 ]; then
- echo ""
- echo -n "[Press RETURN to try again, 'no' + RETURN to abort] "
- read foo
- case "$foo" in [nN]|[nN][oO])
- echo "Abort installation of JDK documentation"
- exit 1
- ;;
- esac
- fi
- done
-
- echo "${TMP_DIR}/$archive has been unpacked and installed."
- echo "You can now delete it, if you wish."
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Deleted: trunk/sun-java6/debian/JB-doc.prerm.in
===================================================================
--- trunk/sun-java6/debian/JB-doc.prerm.in 2010-05-01 08:38:55 UTC (rev 12237)
+++ trunk/sun-java6/debian/JB-doc.prerm.in 2010-05-01 08:50:35 UTC (rev 12238)
@@ -1,10 +0,0 @@
-#! /bin/sh -e
-
-case "$1" in
-remove)
- rm -rf /usr/share/doc/@basename at -jdk/html
- ;;
-
-esac
-
-#DEBHELPER#
Modified: trunk/sun-java6/debian/changelog
===================================================================
--- trunk/sun-java6/debian/changelog 2010-05-01 08:38:55 UTC (rev 12237)
+++ trunk/sun-java6/debian/changelog 2010-05-01 08:50:35 UTC (rev 12238)
@@ -4,8 +4,10 @@
* Update Homepage in d/control.
* Update italian and spanish debconf translation. (Closes: #560354, #570790)
* Switch to source format 3.0.
+ * Remove files for the old -doc package since we Suggests: openjdk-6-doc
+ today.
- -- Torsten Werner <twerner at debian.org> Sat, 01 May 2010 10:38:12 +0200
+ -- Torsten Werner <twerner at debian.org> Sat, 01 May 2010 10:40:32 +0200
sun-java6 (6.20-dlj-1) unstable; urgency=low
Modified: trunk/sun-java6/debian/rules
===================================================================
--- trunk/sun-java6/debian/rules 2010-05-01 08:38:55 UTC (rev 12237)
+++ trunk/sun-java6/debian/rules 2010-05-01 08:50:35 UTC (rev 12238)
@@ -121,7 +121,6 @@
p_src := $(basename)-source
p_fonts := $(basename)-fonts
p_demo := $(basename)-demo
-p_doc := $(basename)-doc
p_plug := $(basename)-plugin
p_javadb := $(basename)-javadb
@@ -131,7 +130,6 @@
d_src := debian/$(p_src)
d_demo := debian/$(p_demo)
d_fonts := debian/$(p_fonts)
-d_doc := debian/$(p_doc)
d_plug := debian/$(p_plug)
d_javadb := debian/$(p_javadb)
@@ -942,25 +940,6 @@
# cat debian/dlj.templates >> $(d_src).templates
-binary-$(p_doc): DH_OPTIONS=-p$(p_doc)
-binary-$(p_doc): build
- dh_testdir
- dh_testroot
- dh_clean -d
- dh_installdirs \
- $(basedir) \
- $(lintian_overrides) \
- usr/share/doc/$(p_jdk)/html
-
- : # add lintian overrides
- cp -p debian/$(p_doc).overrides \
- $(d_doc)/$(lintian_overrides)/$(p_doc)
-
- dh_installdocs
- dh_installchangelogs
- echo "$(doc)/$(p_jdk)/html $(doc)/$(p_doc)/html" > $(d_doc).links
- echo "$(doc)/$(p_jdk)/html $(basedir)/docs" >> $(d_doc).links
-
binary-$(p_javadb): DH_OPTIONS=-p$(p_javadb)
binary-$(p_javadb): build
dh_testdir
More information about the pkg-java-commits
mailing list