This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository openjdk-8.
commit 9a076db14122810b0108937b2cb61825f1463331 Author: Emmanuel Bourg <[email protected]> Date: Mon Mar 31 00:39:39 2014 +0200 Removed the transitional Cacao package --- debian/control.cacao-trans | 11 ----------- debian/rules | 12 ------------ 2 files changed, 23 deletions(-) diff --git a/debian/control.cacao-trans b/debian/control.cacao-trans deleted file mode 100644 index 27e3e6c..0000000 --- a/debian/control.cacao-trans +++ /dev/null @@ -1,11 +0,0 @@ - -Package: icedtea-7-jre-cacao -Architecture: alpha amd64 armel armhf i386 lpia powerpc powerpcspe m68k mips mipsel s390 -Multi-Arch: same -Priority: extra -Pre-Depends: ${dpkg:Depends} -Depends: @basename@-jre-headless (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Description: Transitional package for obsolete Cacao JVM for OpenJDK - Cacao support was removed for recent versions of OpenJDK 7. - . - This is a transitional package which can be safely removed. diff --git a/debian/rules b/debian/rules index 87cf5ba..bbc6150 100755 --- a/debian/rules +++ b/debian/rules @@ -134,9 +134,6 @@ endif cacao_archs = alpha amd64 armel armhf i386 lpia powerpc powerpcspe m68k mips mipsel s390 # TODO kfreebsd porting for cacao vm cacao_archs = -ifneq (,$(filter $(distrel),wheezy precise quantal)) - transitional_cacao_pkg = yes -endif jamvm_archs = amd64 armel armhf i386 lpia mips mipsel powerpc kfreebsd-i386 kfreebsd-amd64 ifeq (,$(filter $(distrel),wheezy)) @@ -765,7 +762,6 @@ debian/control: debian/templates/control.in debian/rules -e 's/@lib_arch@/$(p_lib_arch)/g' \ debian/templates/control.in \ $(if $(cacao_archs), debian/control.cacao-jre) \ - $(if $(transitional_cacao_pkg), debian/control.cacao-trans) \ $(if $(jamvm_archs), debian/control.jamvm-jre) \ $(if $(altzero_archs), debian/control.zero-jre) \ $(if $(DEB_HOST_MULTIARCH),,| grep -v '^Multi-Arch') \ @@ -1698,10 +1694,6 @@ nojrec = $(if $(filter cacao, $(alternate_vms)),,-N$(p_jrec)) nojrej = $(if $(filter jamvm, $(alternate_vms)),,-N$(p_jrej)) nojrez = $(if $(filter shark zero, $(alternate_vms)),,-N$(p_jrez)) -ifeq ($(transitional_cacao_pkg),yes) - nojrec = -endif - # Build architecture independant packages binary-indep: build install dh_testdir @@ -1766,10 +1758,6 @@ ifneq (,$(filter cacao, $(alternate_vms))) dh_installdocs -p$(p_jrec) $(call install_test_results,cacao) endif -ifeq ($(transitional_cacao_pkg),yes) - dh_installchangelogs -p$(p_jrec) - dh_installdocs -p$(p_jrec) -endif ifneq (,$(filter jamvm, $(alternate_vms))) dh_installchangelogs -p$(p_jrej) dh_installdocs -p$(p_jrej) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
