aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gall <tom.gall@linaro.org>2011-03-04 22:05:44 -0600
committerTom Gall <tom.gall@linaro.org>2011-03-04 22:05:44 -0600
commit8ce55b2bebd53f2075f631d5f4308f6f846fb837 (patch)
tree0fa22642a7f35662c2f7722454f2bacdeef6e5e8
parent66387fea10036094ac478b0c16b4a58b419dde69 (diff)
adjust dpkg-divert params and move to a directory located in /usr/lib
-rw-r--r--debian/libturbojpeg62.postrm7
-rw-r--r--debian/libturbojpeg62.preinst12
2 files changed, 12 insertions, 7 deletions
diff --git a/debian/libturbojpeg62.postrm b/debian/libturbojpeg62.postrm
index 38aeef0..d700ea9 100644
--- a/debian/libturbojpeg62.postrm
+++ b/debian/libturbojpeg62.postrm
@@ -4,8 +4,11 @@ set -e
if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" ];
then
- dpkg-divert --package libjpegturbo62 --remove --rename --divert \
- /usr/share/libjpeg-divert/libjpeg.so.62.0.0.orig /usr/lib/libjpeg.so.62.0.0
+ dpkg-divert --package libturbojpeg62 --rename \
+ --remove /usr/lib/libjpeg.so.62.0.0
+ dpkg-divert --package libturbojpeg62 --rename \
+ --remove /usr/lib/libjpeg.so.62
+ rmdir /usr/lib/libjpeg-divert
fi
#DEBHELPER#
diff --git a/debian/libturbojpeg62.preinst b/debian/libturbojpeg62.preinst
index 5a8633f..81a6b33 100644
--- a/debian/libturbojpeg62.preinst
+++ b/debian/libturbojpeg62.preinst
@@ -1,14 +1,16 @@
-#!/bin/sh
+#!/bin/sh -x
set -e
if [ install = "$1" ] || dpkg --compare-versions "$2" lt 6b-git.20101110t043445.8a20111-0linaro2; then
- if [ ! -d /usr/share/libjpeg-divert]
+ if [ ! -d /usr/lib/libjpeg-divert ]
then
- mkdir -p /usr/share/libjpeg-divert
+ mkdir -p /usr/lib/libjpeg-divert
fi
- dpkg-divert --package libjpegturbo62 --add --rename --divert \
- /usr/share/libjpeg-divert/libjpeg.so.62.0.0.orig /usr/lib/libjpeg.so.62.0.0
+ dpkg-divert --package libturbojpeg62 --rename --divert /usr/lib/libjpeg-divert/libjpeg.so.62.0.0 \
+ --add /usr/lib/libjpeg.so.62.0.0
+ dpkg-divert --package libturbojpeg62 --rename --divert /usr/lib/libjpeg-divert/libjpeg.so.62 \
+ --add /usr/lib/libjpeg.so.62
fi
#DEBHELPER#