[openjdk-8] 03/10: Removed the openjdk-8-jre-lib package

[Emmanuel Bourg]

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 856145f64e6fb547fb10bb38bce62db60cb48e4c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Mar 28 23:37:45 2014 +0100

    Removed the openjdk-8-jre-lib package
---
 debian/JB-jre-lib.overrides.in |  2 --
 debian/JB-jre-lib.postinst.in  | 15 ---------------
 debian/JB-jre-lib.preinst.in   |  7 -------
 debian/control                 | 15 ---------------
 debian/control.in              | 15 ---------------
 debian/rules                   |  5 -----
 6 files changed, 59 deletions(-)

diff --git a/debian/JB-jre-lib.overrides.in b/debian/JB-jre-lib.overrides.in
deleted file mode 100644
index d9a9a70..0000000
--- a/debian/JB-jre-lib.overrides.in
+++ /dev/null
@@ -1,2 +0,0 @@
-# no separate directory for image files
- at basename@-jre-lib binary: image-file-in-usr-lib
diff --git a/debian/JB-jre-lib.postinst.in b/debian/JB-jre-lib.postinst.in
deleted file mode 100644
index baab740..0000000
--- a/debian/JB-jre-lib.postinst.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh
-
-set -e
-
-multiarch=@multiarch@
-with_tzdata=@with_tzdata@
-
-if [ "$with_tzdata" = yes ] && [ -z "$multiarch" ]; then
-    if [ ! -h /@basedir@/jre/lib/zi ] && [ -d /@basedir@/jre/lib/zi ]; then
-	rm -rf /@basedir@/jre/lib/zi
-	ln -s ../../../../../share/javazi /@basedir@/jre/lib/zi
-    fi
-fi
-
-#DEBHELPER#
diff --git a/debian/JB-jre-lib.preinst.in b/debian/JB-jre-lib.preinst.in
deleted file mode 100644
index aa762ef..0000000
--- a/debian/JB-jre-lib.preinst.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ -h /usr/share/doc/@basename at -jre-lib ]; then
-        rm -f /usr/share/doc/@basename at -jre-lib
-fi
diff --git a/debian/control b/debian/control
index 405c5e4..c205cd1 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,6 @@ Depends: ${jredefault:Depends}, ${cacert:Depends}, ${tzdata:Depends}, ${jcommon:
 Recommends: ${dlopenhl:Recommends}, ${jamvm:Recommends}
 Suggests: ${cacao:Recommends}, libnss-mdns, sun-java6-fonts, fonts-dejavu-extra, fonts-ipafont-gothic, fonts-ipafont-mincho, ttf-wqy-microhei | ttf-wqy-zenhei, ttf-indic-fonts,
 Provides: java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless, java7-runtime-headless, ${defaultvm:Provides}, ${jvm:Provides}
-Replaces: openjdk-8-jre-lib (<< 7u45-2.4.3-1)
 Conflicts: ${multiarch:Conflicts}
 Breaks: icedtea-netx (<< 1.4-2)
 Built-Using: ${rhino:Source}
@@ -59,20 +58,6 @@ Description: OpenJDK Java runtime, using ${vm:Name}
  The packages are built using the IcedTea build support and patches
  from the IcedTea project.
 
-Package: openjdk-8-jre-lib
-Architecture: all
-Multi-Arch: foreign
-Pre-Depends: ${dpkg:Depends}
-Depends: ${misc:Depends}
-Breaks: openjdk-8-jre-headless (<< 7u45-2.4.3-1)
-Description: OpenJDK Java runtime (architecture independent libraries)
- OpenJDK Java runtime, using ${vm:Name}.
- .
- The packages are built using the IcedTea build support and patches
- from the IcedTea project.
- .
- This is a transitional package. You can safely remove it.
-
 Package: openjdk-8-demo
 Architecture: alpha amd64 armel armhf arm64 i386 ia64 lpia mips mipsel powerpc powerpcspe ppc64 ppc64el m68k sh4 sparc sparc64 s390x x32 kfreebsd-i386 kfreebsd-amd64
 Priority: extra
diff --git a/debian/control.in b/debian/control.in
index a8f8991..0ebfd26 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -32,7 +32,6 @@ Depends: ${jredefault:Depends}, ${cacert:Depends}, ${tzdata:Depends}, ${jcommon:
 Recommends: ${dlopenhl:Recommends}, ${jamvm:Recommends}
 Suggests: ${cacao:Recommends}, libnss-mdns, sun-java6-fonts, @core_fonts@, @cjk_fonts@
 Provides: java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless, java7-runtime-headless, ${defaultvm:Provides}, ${jvm:Provides}
-Replaces: @basename at -jre-lib (<< 7u45-2.4.3-1)
 Conflicts: ${multiarch:Conflicts}
 Breaks: icedtea-netx (<< 1.4-2)
 Built-Using: ${rhino:Source}
@@ -59,20 +58,6 @@ Description: OpenJDK Java runtime, using ${vm:Name}
  The packages are built using the IcedTea build support and patches
  from the IcedTea project.
 
-Package: @basename at -jre-lib
-Architecture: @lib_arch@
-Multi-Arch: foreign
-Pre-Depends: ${dpkg:Depends}
-Depends: ${misc:Depends}
-Breaks: @basename at -jre-headless (<< 7u45-2.4.3-1)
-Description: OpenJDK Java runtime (architecture independent libraries)
- OpenJDK Java runtime, using ${vm:Name}.
- .
- The packages are built using the IcedTea build support and patches
- from the IcedTea project.
- .
- This is a transitional package. You can safely remove it.
-
 Package: @basename at -demo
 Architecture: @any_archs@
 Priority: extra
diff --git a/debian/rules b/debian/rules
index 729c20a..8dbba76 100755
--- a/debian/rules
+++ b/debian/rules
@@ -866,7 +866,6 @@ p_jrehl	= $(basename)-jre-headless
 p_jrec	= icedtea-$(shortver)-jre-cacao
 p_jrej	= icedtea-$(shortver)-jre-jamvm
 p_jrez	= $(basename)-jre-zero
-p_lib	= $(basename)-jre-lib
 p_lib	= $(p_jrehl)
 p_jdk	= $(basename)-jdk
 p_demo	= $(basename)-demo
@@ -1956,10 +1955,6 @@ endif
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-ifeq ($(p_lib),$(p_jrehl))
-	dh_installchangelogs -p$(basename)-jre-lib
-	dh_installdocs -p$(basename)-jre-lib
-endif
 ifeq ($(with_docs),yes)
 	dh_installchangelogs -p$(p_doc)
 	dh_installdocs -p$(p_doc)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git