diff --git a/icu4c/debian/changelog b/icu4c/debian/changelog index 936dca08617..bdf0545b60e 100644 --- a/icu4c/debian/changelog +++ b/icu4c/debian/changelog @@ -1,8 +1,17 @@ +icu (1.6.0.1-20001025-1) unstable; urgency=low + + * Move architecture-dependent files into /usr/lib, instead of + /usr/share. + * Move convrtrs.txt into /etc/icu, make it a conffile, and generate + /usr/lib/icu/1.6.0.1/cnvalias.dat from it at postinst time. + + -- Yves Arrouye Tue, 24 Oct 2000 16:14:22 -0700 + icu (1.6.0.1-20001017-1) unstable; urgency=low * Initial Release. - -- Yves Arrouye Tue, 17 Oct 2000 10:28:17 -0700 + -- Yves Arrouye Tue, 24 Oct 2000 16:14:12 -0700 Local variables: mode: debian-changelog diff --git a/icu4c/debian/icu.postinst.in b/icu4c/debian/icu.postinst.in index 3ae9df789ab..27df64566ed 100644 --- a/icu4c/debian/icu.postinst.in +++ b/icu4c/debian/icu.postinst.in @@ -31,10 +31,10 @@ case "$1" in # use the right directory. But we're not taking chances with the # future :) - ICU_DATA=@datadir@/@PACKAGE@/@VERSION@ + ICU_DATA=@libdir@/@PACKAGE@/@VERSION@ export ICU_DATA - if test ! -f $ICU_DATADIR/cnvalias.dat -o @sysconfdir@/icu/convrtrs.txt -nt $ICU_DATADIR/cnvalias.dat + if test ! -f $ICU_DATA/cnvalias.dat -o @sysconfdir@/icu/convrtrs.txt -nt $ICU_DATA/cnvalias.dat then echo Compiling converters and aliases list from @sysconfdir@/icu/convrtrs.txt /usr/sbin/gencnval @sysconfdir@/icu/convrtrs.txt diff --git a/icu4c/debian/icu.prerm.in b/icu4c/debian/icu.prerm.in new file mode 100644 index 00000000000..150eb200b44 --- /dev/null +++ b/icu4c/debian/icu.prerm.in @@ -0,0 +1,47 @@ +#! /bin/sh +# prerm script for foo +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see /usr/share/doc/packaging-manual/ + +case "$1" in + remove|upgrade|deconfigure) + prefix=@prefix@ + + # Set ICU_DATA for ease of testing files. It is not necessary to + # export it as we are guaranteed that the binaries we invoke will + # use the right directory. But we're not taking chances with the + # future :) + + ICU_DATA=@libdir@/@PACKAGE@/@VERSION@ + export ICU_DATA + + rm -f $ICU_DATA/cnvalias.dat + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + diff --git a/icu4c/debian/rules b/icu4c/debian/rules index b6665091171..878e721b019 100755 --- a/icu4c/debian/rules +++ b/icu4c/debian/rules @@ -16,7 +16,8 @@ srcdir = source # ICU installation directories, w/o the initial slash icudatadir = usr/share/icu/$(version) -datasrcdir = usr/share/icu/$(version)/src +iculibdir = usr/lib/icu/$(version) +datasrcdir = usr/share/icu/$(version)/data # shared library versions, option 1 version:=$(shell sed -n 's/^[ ]*\#[ ]*define[ ]*U_ICU_VERSION[ ]*"\([^"]*\)".*/\1/p' $(srcdir)/common/unicode/utypes.h) @@ -108,19 +109,19 @@ binary-arch: build install debian/icu.conffiles debian/icu.postinst # build icu package by moving files from icu-dev # dh_movefiles -picu \ - etc/icu \ + etc \ usr/sbin \ - $(icudatadir)/*.cnv \ $(icudatadir)/*.txt \ - $(icudatadir)/u*.dat \ - $(icudatadir)/tz.dat \ + $(iculibdir)/*.cnv \ + $(iculibdir)/u*.dat \ + $(iculibdir)/tz.dat \ usr/share/man - rm debian/tmp/$(icudatadir)/cnvalias.dat + rm debian/tmp/$(iculibdir)/cnvalias.dat # # build icu-locales package by moving files from icu-dev # dh_movefiles -picu-locales \ - $(icudatadir) + $(iculibdir) # # build icu-data from the source data # @@ -147,7 +148,7 @@ binary-arch: build install debian/icu.conffiles debian/icu.postinst # # do a bit of cleanup # - rm -rf debian/tmp/usr/sbin \ + rm -rf debian/tmp/etc debian/tmp/usr/sbin \ debian/tmp/usr/share/icu/$(version) \ debian/tmp/usr/share/man #