diff options
| author | Tom Gall <tom.gall@linaro.org> | 2011-03-07 10:01:58 -0600 |
|---|---|---|
| committer | Tom Gall <tom.gall@linaro.org> | 2011-03-07 10:01:58 -0600 |
| commit | 3f7549890ec917feee59ebe9a39d224d45952ec9 (patch) | |
| tree | f9168ddfa737bdc14c7db5121edfed09d7ef7008 | |
| parent | 822a862289a3144aa050c41a31d50bb94d7be094 (diff) | |
address lintial warnings, add tests to preinst and postrm to test for libjpeg62linaroize
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/libjpeg-turbo62.lintian-overrides | 3 | ||||
| -rw-r--r-- | debian/libjpeg-turbo62.postrm | 13 | ||||
| -rw-r--r-- | debian/libjpeg-turbo62.preinst | 19 | ||||
| -rw-r--r-- | debian/libjpeg-turbo62.shlibs | 2 |
5 files changed, 32 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog index 540dceb..1276e38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libjpeg-turbo (6b-git.20101110t043445.8a20111-0linaro4) natty; urgency=low + + * address small set of lintian warnings. + fixup libjpeg-turbo62.shlibs + add override for lintian warning about libjpeg + * add a test to validate libjpeg62 is installed before installing + dpkg-divert + + -- Tom Gall <tom.gall@linaro.org> Mon, 07 Mar 2011 09:54:57 -0600 + libjpeg-turbo (6b-git.20101110t043445.8a20111-0linaro3) natty; urgency=low * Change name of built packages to libjpeg-turbo62 and libjpeg-turbo-progs diff --git a/debian/libjpeg-turbo62.lintian-overrides b/debian/libjpeg-turbo62.lintian-overrides index d8349f2..bdc88c2 100644 --- a/debian/libjpeg-turbo62.lintian-overrides +++ b/debian/libjpeg-turbo62.lintian-overrides @@ -1,2 +1,3 @@ # yes, we specifically want linkers to depends on the standard libjpeg name -libturbojpeg62: shlibs-declares-dependency-on-other-package libjpeg62 (>=6b1) +libjpeg-turbo62: shlibs-declares-dependency-on-other-package libjpeg62 (>=6b1) +libjpeg-turbo62: package-name-doesnt-match-sonames libjpeg62 diff --git a/debian/libjpeg-turbo62.postrm b/debian/libjpeg-turbo62.postrm index d700ea9..639868e 100644 --- a/debian/libjpeg-turbo62.postrm +++ b/debian/libjpeg-turbo62.postrm @@ -4,11 +4,14 @@ set -e if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" ]; then - 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 + if [ -d /usr/lib/libjpeg-divert ] + then + 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 fi #DEBHELPER# diff --git a/debian/libjpeg-turbo62.preinst b/debian/libjpeg-turbo62.preinst index 81a6b33..ec6db64 100644 --- a/debian/libjpeg-turbo62.preinst +++ b/debian/libjpeg-turbo62.preinst @@ -3,14 +3,17 @@ set -e if [ install = "$1" ] || dpkg --compare-versions "$2" lt 6b-git.20101110t043445.8a20111-0linaro2; then - if [ ! -d /usr/lib/libjpeg-divert ] - then - mkdir -p /usr/lib/libjpeg-divert - fi - 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 + if [ -f /usr/lib/libjpeg.so.62.0.0 ] + then + if [ ! -d /usr/lib/libjpeg-divert ] + then + mkdir -p /usr/lib/libjpeg-divert + fi + 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 fi #DEBHELPER# diff --git a/debian/libjpeg-turbo62.shlibs b/debian/libjpeg-turbo62.shlibs index 113927b..22165ff 100644 --- a/debian/libjpeg-turbo62.shlibs +++ b/debian/libjpeg-turbo62.shlibs @@ -1 +1 @@ -libjpeg 62 libjpeg62 (>=6b1) +libjpeg 62 libjpeg62 (>=6b1) |