This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository java-policy.
commit e9ed17dc23fb310aeeb2c1b89b64c39f2abd3c9e Author: Emmanuel Bourg <[email protected]> Date: Tue Sep 22 23:17:34 2015 +0200 Moved the Java policy to a separate package --- Makefile | 17 +- debian/README.Debian | 14 +- debian/README.gcj-native-transition | 30 ---- debian/changelog | 4 +- debian/control | 82 +--------- debian/default-jre-headless.lintian-overrides | 1 - debian/java-common.dirs | 1 - debian/java-common.docs | 1 - debian/java-common.examples | 1 - debian/java-common.lintian-overrides | 1 - debian/java-common.postinst | 21 --- debian/java-common.postrm | 13 -- ...ommon.doc-base.faq => java-policy.doc-base.faq} | 4 +- ...doc-base.policy => java-policy.doc-base.policy} | 6 +- debian/java_defaults.mk | 30 ---- debian/rules | 181 +-------------------- dummy/README | 2 - dummy/java-compiler-dummy.control | 12 -- dummy/java-virtual-machine-dummy.control | 13 -- dummy/java1-runtime-dummy.control | 13 -- dummy/java2-compiler-dummy.control | 12 -- dummy/java2-runtime-dummy.control | 13 -- examples/classpath-from-jars-1 | 12 -- scripts/update-java-alternatives | 158 ------------------ scripts/update-java-alternatives.8 | 58 ------- 25 files changed, 21 insertions(+), 679 deletions(-) diff --git a/Makefile b/Makefile index 515a599..655efde 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ # Some default variables DOC = usr/share/doc DVIPS=dvips -PUBLISHDIR=$(DESTDIR)/$(DOC)/java-common +PUBLISHDIR=$(DESTDIR)/$(DOC)/java-policy #DSLF=work.dsl #DSL=-d $(DSLF) # Default language to use @@ -53,23 +53,12 @@ policy.txt: policy.xml #-rm -f dump.html jw -b txt $(DSL) $< -install: debian-java-policy-install debian-java-faq-install dummy-install script-install - -dummy-install: - mkdir -p $(PUBLISHDIR)/dummy-packages - cp dummy/README $(PUBLISHDIR)/dummy-packages - cp dummy/*.control $(PUBLISHDIR)/dummy-packages - -script-install: - mkdir -p $(DESTDIR)/usr/sbin - install -m 755 scripts/update-java-alternatives $(DESTDIR)/usr/sbin/ - mkdir -p $(DESTDIR)/usr/share/man/man8 - install -m 755 scripts/update-java-alternatives.8 $(DESTDIR)/usr/share/man/man8/ +install: debian-java-policy-install debian-java-faq-install debian-java-policy-install: + mkdir -p $(PUBLISHDIR) install -m 0444 $(OUTPUTS) $(PUBLISHDIR) cp -a debian-java-policy $(PUBLISHDIR) - ln -s debian-java-policy $(PUBLISHDIR)/html clean: debian-java-faq -rm -Rf debian-java-policy diff --git a/debian/README.Debian b/debian/README.Debian index 07af622..a007af6 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,15 +1,7 @@ -This package contains information about how to make your java environment -work. The package contains the Proposed Debian Java Policy and +This package contains the Proposed Debian Java Policy and the Debian Java FAQ. It should probably be enough to get things going. They can be found at -/usr/share/doc/java-common/debian-java-faq/index.html +/usr/share/doc/java-policy/debian-java-faq/index.html and -/usr/share/doc/java-common/debian-java-policy/index.html - -Previously it existed a bunch of *-dummy packages. They have now been -removed from the archive. If you need to fulfill the dependencies you have -to make your own dummy package. The equivs package might help you with -this. - - Ola Lundqvist <[email protected]> +/usr/share/doc/java-policy/debian-java-policy/index.html diff --git a/debian/README.gcj-native-transition b/debian/README.gcj-native-transition deleted file mode 100644 index d32c1b4..0000000 --- a/debian/README.gcj-native-transition +++ /dev/null @@ -1,30 +0,0 @@ -default-jdk-builddep transition -=============================== - -default-jdk-builddep was a package to provide helpers to compile -class/jar files into native code, unfortunately its poorly chosen -name lead to people thinking it was the "Right Thing" to -Build-Depend on when maintaining a Java Package. This -misunderstanding even got into the templates for AMs for reviewing -New Maintainers (The T&SII follow up). - -These helper tools requires a special Java Development Kit and -therefore on many architectures default-jdk-builddep would pull two -full JDK. - -In order to end this confusion once and for all the Debian Java team -decided to rename default-jdk-builddep to gcj-native-helper and -reduce it to only pull the special JDK needed for native compilation. - -The replacement for default-jdk-builddep falls into one of two cases. -If you create "gcj" packages (which contains jar files compiled into -native shared libraries), default-jdk-builddep should be replaced by -default-jdk AND gcj-native-helper. Otherwise you should replace it by -default-jdk. - -If you are interested in the debate to do this rename, please have a -look at: - * http://lists.debian.org/debian-java/2010/04/msg00070.html - - -- Niels Thykier <[email protected]> Wed, 30 Jun 2010 22:55:00 +0200 - diff --git a/debian/changelog b/debian/changelog index 846c771..7f9251e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ -java-common (0.54) UNRELEASED; urgency=medium +java-policy (0.54) UNRELEASED; urgency=medium * Team upload. - * Use OpenJDK 8 on mips, mipsel and mips64el. + * Moved the Java policy to a separate package. -- Emmanuel Bourg <[email protected]> Tue, 22 Sep 2015 09:23:34 +0200 diff --git a/debian/control b/debian/control index 36e0bab..6650d43 100644 --- a/debian/control +++ b/debian/control @@ -1,91 +1,21 @@ -Source: java-common +Source: java-policy Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Matthias Klose <[email protected]>, Torsten Werner <[email protected]>, -Build-Depends: debhelper (>= 9) -Build-Depends-Indep: debiandoc-sgml, docbook-utils, docbook-xml, lynx +Uploaders: Torsten Werner <[email protected]> +Build-Depends: debhelper (>= 9), debiandoc-sgml, docbook-utils, docbook-xml, lynx Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-java/java-common.git Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/java-common.git Homepage: https://wiki.debian.org/Java/ -Package: java-common +Package: java-policy Architecture: all -Multi-Arch: foreign Depends: ${misc:Depends} -Suggests: default-jre, equivs -Description: Base of all Java packages - This package must be installed in the system if a Java environment - is desired. It covers useful information for Java users in - Debian GNU/Linux, including: +Description: Debian Java Policy + This package contains: * The Java policy document which describes the layout of Java support in Debian and how Java packages should behave. * The Debian-Java-FAQ which provides information on the status of Java support in Debian, available compilers, virtual machines, Java programs and libraries as well as on legal issues. - * Information on how to create dummy packages to fulfill java2 - requirements. - -Package: default-jre -Architecture: any -Depends: default-jre-headless (= ${binary:Version}), ${jre}${jre:version}, - ${misc:Depends} -Provides: ${jre:provides} -Description: Standard Java or Java compatible Runtime - This dependency package points to the Java runtime, or Java compatible - runtime recommended for the ${jre:arch} architecture, - which is ${jre} for ${jre:arch}. - -Package: default-jre-headless -Architecture: any -Depends: ${jhl}${jre:version}, java-common, ${misc:Depends} -Suggests: default-jre -Provides: ${jhl:provides} -Replaces: openjdk-6-jre-headless (<< 6b23~pre8-2~) -Description: Standard Java or Java compatible Runtime (headless) - This package points to the Java runtime, or Java compatible - runtime recommended for this architecture, which is - ${jhl} for ${jre:arch}. - . - The package is used as dependency for packages not needing a - graphical display during runtime. - -Package: default-jdk -Architecture: any -Depends: default-jre (= ${binary:Version}), ${jdk}${jdk:version}, - ${misc:Depends} -Provides: ${jdk:provides} -Description: Standard Java or Java compatible Development Kit - This dependency package points to the Java runtime, or Java compatible - development kit recommended for this architecture, which is - ${jdk} for ${jre:arch}. - -Package: default-jdk-doc -Architecture: all -Section: doc -Depends: ${doc}, ${misc:Depends} -Suggests: default-jdk -Description: Standard Java or Java compatible Development Kit (documentation) - This package points to the documentation for the Java development kit, - or Java compatible development kit recommended for Debian, which is - ${doc}. - -Package: gcj-native-helper -Architecture: any -Depends: default-jdk (= ${binary:Version}), ${jdk:builddep}, ${misc:Depends} -Provides: default-jdk-builddep -Conflicts: default-jdk-builddep -Replaces: default-jdk-builddep -Description: Standard helper tools for creating gcj native packages - This dependency package points to the build dependencies used to build - gcj native packages. - . - Unlike default-jdk-builddep, this package only provides the - helpers to compile jar/class files into native code and not - a Java Development Kit (JDK). You do not need this package - unless you are compiling jar/class files to native code. - . - Note: During the transition from default-jdk-builddep to - gcj-native-helper, this package will also depend on - default-jdk to avoid breakage. diff --git a/debian/default-jre-headless.lintian-overrides b/debian/default-jre-headless.lintian-overrides deleted file mode 100644 index ff1bc22..0000000 --- a/debian/default-jre-headless.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -default-jre-headless: debian-changelog-file-missing-or-wrong-name diff --git a/debian/java-common.dirs b/debian/java-common.dirs deleted file mode 100644 index 13c9f03..0000000 --- a/debian/java-common.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/java diff --git a/debian/java-common.docs b/debian/java-common.docs deleted file mode 100644 index 1f359fe..0000000 --- a/debian/java-common.docs +++ /dev/null @@ -1 +0,0 @@ -debian/README.gcj-native-transition diff --git a/debian/java-common.examples b/debian/java-common.examples deleted file mode 100644 index e39721e..0000000 --- a/debian/java-common.examples +++ /dev/null @@ -1 +0,0 @@ -examples/* diff --git a/debian/java-common.lintian-overrides b/debian/java-common.lintian-overrides deleted file mode 100644 index a107fa8..0000000 --- a/debian/java-common.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -java-common: package-contains-empty-directory usr/share/java/ diff --git a/debian/java-common.postinst b/debian/java-common.postinst deleted file mode 100644 index b46c84f..0000000 --- a/debian/java-common.postinst +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -set -e - -case "$1" in -configure) - [ -d /etc/.java ] || mkdir -m 755 /etc/.java - [ -d /etc/.java/.systemPrefs ] || mkdir -m 755 /etc/.java/.systemPrefs - if [ ! -f /etc/.java/.systemPrefs/.system.lock ]; then - touch /etc/.java/.systemPrefs/.system.lock - chmod 644 /etc/.java/.systemPrefs/.system.lock - fi - if [ ! -f /etc/.java/.systemPrefs/.systemRootModFile ]; then - touch /etc/.java/.systemPrefs/.systemRootModFile - chmod 644 /etc/.java/.systemPrefs/.systemRootModFile - fi -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/java-common.postrm b/debian/java-common.postrm deleted file mode 100644 index 5f7f974..0000000 --- a/debian/java-common.postrm +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -set -e - -case "$1" in -purge) - rm -rf /etc/.java - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/java-common.doc-base.faq b/debian/java-policy.doc-base.faq similarity index 76% rename from debian/java-common.doc-base.faq rename to debian/java-policy.doc-base.faq index b7a4771..fe503b0 100644 --- a/debian/java-common.doc-base.faq +++ b/debian/java-policy.doc-base.faq @@ -9,5 +9,5 @@ Abstract: The Debian Java FAQ provide answers to many Section: Debian Format: HTML -Index: /usr/share/doc/java-common/debian-java-faq/index.html -Files: /usr/share/doc/java-common/debian-java-faq/*.html +Index: /usr/share/doc/java-policy/debian-java-faq/index.html +Files: /usr/share/doc/java-policy/debian-java-faq/*.html diff --git a/debian/java-common.doc-base.policy b/debian/java-policy.doc-base.policy similarity index 57% rename from debian/java-common.doc-base.policy rename to debian/java-policy.doc-base.policy index 70bc900..0d71b30 100644 --- a/debian/java-common.doc-base.policy +++ b/debian/java-policy.doc-base.policy @@ -6,8 +6,8 @@ Abstract: The Debian Java Policy (currently a proposal) Section: Debian Format: text -Files: /usr/share/doc/java-common/policy.txt.gz +Files: /usr/share/doc/java-policy/policy.txt.gz Format: HTML -Index: /usr/share/doc/java-common/debian-java-policy/index.html -Files: /usr/share/doc/java-common/debian-java-policy/*.html +Index: /usr/share/doc/java-policy/debian-java-policy/index.html +Files: /usr/share/doc/java-policy/debian-java-policy/*.html diff --git a/debian/java_defaults.mk b/debian/java_defaults.mk deleted file mode 100644 index dc20ecc..0000000 --- a/debian/java_defaults.mk +++ /dev/null @@ -1,30 +0,0 @@ - -# makefile fragment to define the macros java_default_version, -# java{,5,6,7,8,9}_architectures - -java9_architectures = -java8_architectures = $(java9_architectures) \ - amd64 arm64 armel armhf i386 \ - mips mipsel mips64el \ - powerpc powerpcspe ppc64 ppc64el \ - s390x x32 -java7_architectures = $(java8_architectures) \ - alpha lpia sh4 -java6_architectures = $(java7_architectures) -java5_architectures = $(java6_architectures) \ - hppa ia64 m68k s390 sparc sparc64 \ - kfreebsd-amd64 kfreebsd-i386 hurd-i386 -java_architectures = $(java5_architectures) - -_java_host_arch := $(if $(DEB_HOST_ARCH),$(DEB_HOST_ARCH),$(shell dpkg-architecture -qDEB_HOST_ARCH)) -ifneq (,$(filter $(_java_host_arch),$(java9_architectures))) - java_default_version = 9 -else ifneq (,$(filter $(_java_host_arch),$(java8_architectures))) - java_default_version = 8 -else ifneq (,$(filter $(_java_host_arch),$(java6_architectures))) - java_default_version = 7 -else ifneq (,$(filter $(_java_host_arch),$(java6_architectures))) - java_default_version = 6 -else ifneq (,$(filter $(_java_host_arch),$(java5_architectures))) - java_default_version = 5 -endif diff --git a/debian/rules b/debian/rules index fa6d935..2d33f6a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,181 +1,4 @@ #!/usr/bin/make -f -# Made with the aid of dh_make, by Craig Small -# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. -# Some lines taken from debmake, by Cristoph Lameter. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -, = , -S = $(EMPTY) $(EMPTY) -mk_cslist = $(subst $(S),$(,)$(S),$(foreach v,$(1),$(v)-$(2))) -vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1))) -jrel = $(shell dpkg-parsechangelog | grep -E ^Version: | sed "s/Version: 0.//") - -DPKG_VARS := $(shell dpkg-architecture) -DEB_HOST_ARCH ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH) -DEB_HOST_MULTIARCH ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_MULTIARCH) - -p_jre = gcj-jre -p_jhl = gcj-jre-headless -p_jdk = gcj-jdk -jdk_build_dep = -v_jre = -v_jdk = $(v_jre) -provides = java java2 java5 -dversion = 2:1.5-$(jrel) -jvmdir = java-gcj - -p_doc = openjdk-7-doc - -include debian/java_defaults.mk - -ifneq (,$(filter $(DEB_HOST_ARCH),$(java9_architectures))) - p_jre = openjdk-9-jre - p_jhl = openjdk-9-jre-headless - p_jdk = openjdk-9-jdk - jdk_build_dep = openjdk-8-jdk - v_jre = $(S)(>= 9~b74-1) - v_jdk = $(v_jre) - provides = java java2 java5 java6 java7 java8 java9 - dversion = 2:1.9-$(jrel) - jvmdir = java-1.9.0-openjdk$(if $(DEB_HOST_MULTIARCH),-$(DEB_HOST_ARCH)) - p_doc = openjdk-9-doc -else ifneq (,$(filter $(DEB_HOST_ARCH),$(java8_architectures))) - p_jre = openjdk-8-jre - p_jhl = openjdk-8-jre-headless - p_jdk = openjdk-8-jdk - jdk_build_dep = openjdk-7-jdk - v_jre = $(S)(>= 8~b132-1) - v_jdk = $(v_jre) - provides = java java2 java5 java6 java7 java8 - dversion = 2:1.8-$(jrel) - jvmdir = java-1.8.0-openjdk$(if $(DEB_HOST_MULTIARCH),-$(DEB_HOST_ARCH)) - p_doc = openjdk-8-doc -else ifneq (,$(filter $(DEB_HOST_ARCH),$(java7_architectures))) - p_jre = openjdk-7-jre - p_jhl = openjdk-7-jre-headless - p_jdk = openjdk-7-jdk - jdk_build_dep = gcj-jdk - v_jre = $(S)(>= 7~u3-2.1.1) - v_jdk = $(v_jre) - provides = java java2 java5 java6 java7 - dversion = 2:1.7-$(jrel) - jvmdir = java-1.7.0-openjdk$(if $(DEB_HOST_MULTIARCH),-$(DEB_HOST_ARCH)) -else ifneq (,$(filter $(DEB_HOST_ARCH),$(java6_architectures))) - p_jre = openjdk-6-jre - p_jhl = openjdk-6-jre-headless - p_jdk = openjdk-6-jdk - jdk_build_dep = gcj-jdk - v_jre = $(S)(>= 6b23~pre8-2~) - v_jdk = $(v_jre) - provides = java java2 java5 java6 - dversion = 2:1.6-$(jrel) - jvmdir = java-1.6.0-openjdk$(if $(DEB_HOST_MULTIARCH),-$(DEB_HOST_ARCH)) - p_doc = openjdk-6-doc -endif - -jre_provides = $(call mk_cslist,$(provides),runtime) -jhl_provides = $(call mk_cslist,$(provides),runtime-headless) -jdk_provides = $(call mk_cslist,$(provides),sdk) - -build: build-arch -build-arch: - # Do nothing :) - -build-indep: build-stamp -build-stamp: - dh_testdir - - $(MAKE) - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp install-stamp - $(MAKE) clean - - dh_clean - -install-indep: install-stamp -install-stamp: build-indep - dh_testdir - dh_testroot - dh_prep -i - dh_installdirs -i - - dh_installdocs -i - $(MAKE) install DESTDIR=$(CURDIR)/debian/java-common - - touch install-stamp - -install-arch: build-arch - dh_testdir - dh_testroot - dh_prep -a - - -binary-arch: install-arch -ifneq (,$(p_jre)) - dh_testdir -a - dh_testroot -a - dh_install -a - dh_installdocs -pdefault-jre-headless - dh_installchangelogs -pdefault-jre-headless - dh_link -pdefault-jre-headless \ - usr/lib/jvm/$(jvmdir) usr/lib/jvm/default-java - for p in default-jre-headless default-jre default-jdk gcj-native-helper; do \ - [ -z "$$t" ] && t=$$p && continue; \ - mkdir -p debian/$$p/usr/share/doc; \ - ln -sf $$t debian/$$p/usr/share/doc/$$p; \ - t=$$p; \ - done - dh_lintian -a - dh_compress -a - dh_fixperms -a - dh_installdeb -a - dh_gencontrol -a -- \ - -v$(dversion) \ - '-Vjre=$(p_jre)' \ - '-Vjhl=$(p_jhl)' \ - '-Vjdk=$(p_jdk)' \ - '-Vjdk:builddep=$(jdk_build_dep)' \ - '-Vjre:arch=$(DEB_HOST_ARCH)' \ - '-Vjre:version=$(v_jre)' \ - '-Vjdk:version=$(v_jdk)' \ - '-Vjre:provides=$(jre_provides)' \ - '-Vjhl:provides=$(jhl_provides)' \ - '-Vjdk:provides=$(jdk_provides)' \ - - dh_md5sums -a - dh_builddeb -a -endif - -# Build architecture-independent files here. -binary-indep: build-indep install-indep - dh_testdir -i - dh_testroot -i - dh_install -i - mkdir -p debian/java-common/usr/share/java - cp debian/java_defaults.mk debian/java-common/usr/share/java/. - mkdir -p debian/default-jdk-doc/usr/share/doc/default-jre-headless - ln -sf ../$(p_doc)/api debian/default-jdk-doc/usr/share/doc/default-jre-headless/api - ln -sf ../$(p_doc)/api debian/default-jdk-doc/usr/share/doc/default-jdk-doc/api - dh_installexamples -i - dh_installmenu -i - dh_installman -i - dh_installchangelogs -i - dh_link -i - dh_lintian -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i -- \ - '-Vdoc=$(p_doc)' \ - '-Vjdk=$(p_jdk)' - dh_md5sums -i - dh_builddeb -i - -binary: binary-indep binary-arch -.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install configure +%: + dh $@ diff --git a/dummy/README b/dummy/README deleted file mode 100644 index 9f760eb..0000000 --- a/dummy/README +++ /dev/null @@ -1,2 +0,0 @@ -Those control files can be used to create dummy packages of needed components. -Install "equivs" package and use "equivs-build" build needed dummy packages. diff --git a/dummy/java-compiler-dummy.control b/dummy/java-compiler-dummy.control deleted file mode 100644 index 8dc8e62..0000000 --- a/dummy/java-compiler-dummy.control +++ /dev/null @@ -1,12 +0,0 @@ -Package: java-compiler-dummy -Architecture: all -Section: misc -Priority: optional -Depends: java-common, java1-runtime | java2-runtime -Provides: java-compiler -Description: Dummy package providing java-compiler - This package does NOT provide java compiler binary, it is here only to fulfill - dependencies of other packages. - . - You probably will want to use this package if you have installed the compiler - "by hand" or from package that does not provide java-compiler dependency. diff --git a/dummy/java-virtual-machine-dummy.control b/dummy/java-virtual-machine-dummy.control deleted file mode 100644 index 8e8938e..0000000 --- a/dummy/java-virtual-machine-dummy.control +++ /dev/null @@ -1,13 +0,0 @@ -Package: java-virtual-machine-dummy -Architecture: all -Section: misc -Priority: optional -Depends: java-common, java1-runtime | java2-runtime -Provides: java-virtual-machine -Description: Dummy package providing java-virtual-machine - This package does NOT provide java virtual machine binary, it is here only - to fulfill dependencies of other packages. - . - You probably will want to use this package if you have installed JVM - "by hand" or from package that does not provide java-virtual-machine - dependency. diff --git a/dummy/java1-runtime-dummy.control b/dummy/java1-runtime-dummy.control deleted file mode 100644 index 73fa334..0000000 --- a/dummy/java1-runtime-dummy.control +++ /dev/null @@ -1,13 +0,0 @@ -Package: java1-runtime-dummy -Architecture: all -Section: misc -Priority: optional -Depends: java-common -Provides: java1-runtime -Description: Dummy package providing java1-runtime - This package does NOT provide java1 runtime environment, it is here only to - fulfill dependencies of other packages. - . - You probably will want to use this package if you have installed the - environment "by hand" or from package that does not provide java1-runtime - dependency. diff --git a/dummy/java2-compiler-dummy.control b/dummy/java2-compiler-dummy.control deleted file mode 100644 index c7509b8..0000000 --- a/dummy/java2-compiler-dummy.control +++ /dev/null @@ -1,12 +0,0 @@ -Package: java2-compiler-dummy -Architecture: all -Section: misc -Priority: optional -Depends: java-common, java2-runtime -Provides: java2-compiler -Description: Dummy package providing java2-compiler - This package does NOT provide java2 compiler binary, it is here only to - fulfill dependencies of other packages. - . - You probably will want to use this package if you have installed the compiler - "by hand" or from package that does not provide java2-compiler dependency. diff --git a/dummy/java2-runtime-dummy.control b/dummy/java2-runtime-dummy.control deleted file mode 100644 index 3d5cdff..0000000 --- a/dummy/java2-runtime-dummy.control +++ /dev/null @@ -1,13 +0,0 @@ -Package: java2-runtime-dummy -Architecture: all -Section: misc -Priority: optional -Depends: java-common -Provides: java2-runtime -Description: Dummy package providing java2-runtime - This package does NOT provide java2 runtime environment, it is here only to - fulfill dependencies of other packages. - . - You probably will want to use this package if you have installed the - environment "by hand" or from package that does not provide java2-runtime - dependency. diff --git a/examples/classpath-from-jars-1 b/examples/classpath-from-jars-1 deleted file mode 100644 index bea5802..0000000 --- a/examples/classpath-from-jars-1 +++ /dev/null @@ -1,12 +0,0 @@ -# No shebang here: you have to source this file or to include -# it into a shell startup file, since it changes the environment. -# Bourne shell syntax. - -# From: Aaron Brashears <[email protected]> - -for jar in /usr/share/java/*.jar ; do - CLASSPATH=${CLASSPATH}:$jar -done - - - diff --git a/scripts/update-java-alternatives b/scripts/update-java-alternatives deleted file mode 100755 index 5e31a68..0000000 --- a/scripts/update-java-alternatives +++ /dev/null @@ -1,158 +0,0 @@ -#! /bin/bash - -shopt -s dotglob - -prog=$(basename $0) - -usage() -{ - rv=$1 - cat >&2 <<-EOF - usage: $prog [--jre-headless] [--jre] [--plugin] [ -t|--test|-v|--verbose] - -l|--list [<jname>] - -s|--set <jname> - -a|--auto - -h|-?|--help - EOF - exit $rv -} - -action= -uaopts='--quiet' - -while [ "$#" -gt 0 ]; do - case "$1" in - -a|--auto) - [ -z "$action" ] || usage 1 - action=auto;; - -hl|--jre-headless) - hlonly=yes;; - -j|--jre) - jreonly=yes;; - --plugin) - pluginonly=yes;; - -l|--list) - [ -z "$action" ] || usage 1 - action=list - if [ "$#" -gt 0 ]; then - shift - jname=$1 - fi - ;; - -s|--set) - [ -z "$action" ] || usage 1 - action=set - shift - [ "$#" -gt 0 ] || usage 1 - jname=$1 - ;; - -t|--test) - dryrun=yes - uaopts="$uaopts --test";; - -v|--verbose) - verbose=yes - uaopts="${uaopts/--quiet/}";; - -h|-?|--help) - usage 0;; - -*) - echo "X: $1" - usage 1;; - *) - break;; - esac - shift -done - -[ "$#" -eq 0 ] || usage 1 -[ -n "$action" ] || usage 1 - -which='^(hl|jre|jdk|plugin|DUMMY) ' -if [ -n "$hlonly$jreonly$pluginonly" ]; then - which='^(' - [ -n "$hlonly" ] && which="${which}hl|" - [ -n "$jreonly" ] && [ -n "$hlonly" ] && which="${which}jre|" - [ -n "$jreonly" ] && [ -z "$hlonly" ] && which="${which}hl|jre|" - [ -n "$pluginonly" ] && which="${which}plugin|" - which="${which}DUMMY) " -fi - -top=/usr/lib/jvm - -if [ -n "$jname" ]; then - arch=$(dpkg --print-architecture) - if [ ! -x $top/$jname/bin/java ] && [ -x $top/$jname-$arch/bin/java ]; then - echo >&2 "$prog: obsolete <jname>, please use $jname-$arch instead" - jname=$jname-$arch - fi - case "$jname" in - /*) jdir=$jname; jname=$(basename $jdir);; - *) jdir=$top/$jname - esac - if [ ! -d $jdir ]; then - echo >&2 "$prog: directory does not exist: $jdir" - exit 1 - fi - if [ -f $top/.$jname.jinfo ]; then - jinfo=$top/.$jname.jinfo - elif [ -f $top/$jname.jinfo ]; then - jinfo=$top/$jname.jinfo - else - echo >&2 "$prog: file does not exist: $top/.$jname.jinfo" - exit 1 - fi -fi - -vecho() -{ - [ -z "$verbose" ] || echo >&2 "$@" -} - -jinfo_files= - -do_auto() -{ - vecho "resetting java alternatives" - awk "/$which/ {print \$2}" $top/*.jinfo | sort -u \ - | \ - while read name; do - update-alternatives $uaopts --auto $name - done -} - -do_list() -{ - vecho "listing java alternatives:" - for i in ${jinfo:-$top/*.jinfo}; do - alias=$(basename ${i%.jinfo}) - alias=${alias#.} - prio=$(awk -F= '/priority=/ {print $2}' $i) - echo $alias $prio $top/$alias - [ -n "$verbose" ] && egrep "$which" $i - done -} - -do_set() -{ - do_auto - - awk "/$which/ {print}" $jinfo | sort -u \ - | \ - while read type name location; do - if [ $type = jdk -a -z "$hlonly$jreonly$pluginonly" -a ! -f $location ]; then - echo >&2 "$prog: jdk alternative does not exist: $location" - continue - fi - if [ $type = plugin -a -z "$hlonly$jreonly" -a ! -f $location ]; then - echo >&2 "$prog: plugin alternative does not exist: $location" - continue - fi - update-alternatives $uaopts --set $name $location - done -} - -if [ "$action" != list ] && [ "$(id -u)" -ne 0 ]; then - echo >&2 "$prog: no root privileges" - exit 1 -fi - -do_$action diff --git a/scripts/update-java-alternatives.8 b/scripts/update-java-alternatives.8 deleted file mode 100644 index 07c4bcf..0000000 --- a/scripts/update-java-alternatives.8 +++ /dev/null @@ -1,58 +0,0 @@ -.TH UPDATE-JAVA-ALTERNATIVES "8" "May 2006" -.SH NAME -update-java-alternatives \- update alternatives for jre/sdk installations -.SH SYNOPSIS -.B update-java-alternatives [--jre] [--plugin] [-t|--test|-v|--verbose] - \-l|--list [<jname>] - \-s|--set <jname> - \-a|--auto - \-h|\-?|--help -.SH DESCRIPTION -update-java-alternatives updates all alternatives belonging to one runtime -or development kit for the Java language. A package does provide these -information of it's alternatives in /usr/lib/jvm/.<jname>.jinfo. -.SH OPTIONS -.TP -\fB\-l|\-\-list [<jname>]\fR -List all installed packages (or just <jname>) providing information to set -a bunch of java alternatives. Verbose output shows each alternative -provided by the packages. -.TP -\fB\-a|\-\-auto\fR -Switch all alternatives of registered jre/sdk installations to automatic mode. -.TP -\fB\-s|\-\-set <jname>\fR -Set all alternatives of the registered jre/sdk installation to the program -path provided by the <jname> installation. -.TP -\fB\-\-jre\fR -Limit the actions to alternatives belong to a runtime environment, -not a development kit. -.TP -\fB\-\-jre\-headless\fR -Limit the actions to alternatives belong to the headless part of a runtime environment. -.TP -\fB\-\-plugin\fR -Limit the actions to alternatives providing browser plugins. -.TP -\fB\-h|\-\-help\fR -Display a help message. -.TP -\fB\-t|\-\-test\fR -Don't actually do anything, just say what would be done. The implementation -status of this option is the same as for update-alternatives (not implemented). -.TP -\fB\-v|\-\-verbose\fR -Verbose output. - -.SH FILES -.TP -.I /usr/lib/jvm/.*.jinfo -A text file describing a jre/sdk installation. Consists of some -variables of the form <var>=<value> and a list of alternatives of the form -jre|jdk <name> <path>. - -.PP -.SH AUTHOR -update-java-alternatives and this manual page was written by Matthias -Klose <[email protected]>. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/java-policy.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
