← Back to branch summary

~ubuntu-branches/ubuntu/precise/openjdk-7/precise-security

« back to all changes in this revision

Viewing changes to debian/JB-jre-headless.postinst.in

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2011-09-01 21:08:45 UTC
  • Revision ID: package-import@ubuntu.com-20110901210845-wp1e8zje0bd3we5h
Tags: 7~b147-2.0~pre3-3ubuntu2
http://bugs.debian.org/639883
* Merge debian packaging r491 from openjdk-6:
  - Move the -lib files into a different location so that the java-7-openjdk
    name can be used as a symlink.
  - Symlink the jre/cmm directory, instead of the files inside. Closes: #639883.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/JB-jre-headless.postinst.in
73
73
            $basedir/jre/lib/jar.binfmt
74
74
    fi # update alternatives
75
75
 
 
76
    if [ -n "$multiarch" ] && [ -n "$2" ] && dpkg --compare-versions "$2" lt 7~b147-2.0~pre3-3ubuntu2~; then
 
77
        for d in cmm; do
 
78
            if [ -d $basedir/jre/lib/$d ] && [ ! -h $basedir/jre/lib/$d ]; then
 
79
                rm -rf $basedir/jre/lib/$d
 
80
                ln -s ../../../java-6-openjdk-common/jre/lib/$d $basedir/jre/lib/$d
 
81
            fi
 
82
        done
 
83
    fi
 
84
 
76
85
    # register binfmt; ignore errors, the alternative may already be
77
86
    # registered by another JRE.
78
87
    if which update-binfmts >/dev/null && [ -r /usr/share/binfmts/jar ]; then