Hi, On Mon, 1 Mar 2010 22:54:39 +0100 Gerfried Fuchs <rho...@deb.at> wrote: > Please try though to settle for ther former suggestion of coordinating > updates through volatile, and use the dpkg-divert approach only as last > ressort. Also, what are your suggestions to fix the issue in stable?
Yes, dpkg-divert is smart way. I've tried to fix this with attached patch. Could you check it, please? -- Regards, Hideki Yamane henrich @ debian.or.jp/iijmio-mail.jp http://wiki.debian.org/HidekiYamane
diff -Nru tz-brasil-0.10/debian/changelog tz-brasil-0.10+nmu1/debian/changelog --- tz-brasil-0.10/debian/changelog 2008-04-23 20:57:09.000000000 +0900 +++ tz-brasil-0.10+nmu1/debian/changelog 2010-04-14 20:58:45.000000000 +0900 @@ -1,3 +1,21 @@ +tz-brasil (0.10+nmu1) unstable; urgency=low + + * Non-maintainer upload. + * debian/preinst,postrm + use dpkg-divert to avoid modifying files from another package + (Closes: #572108) + * use dpkg-source v3.0 format + * debian/control + - Bump up "Standards-Version: 3.8.4" + - set "Build-Depends: debhelper (>= 5.0.0)" + - add "Depends: {misc:Depends}" + - set "Depends: bsd-mailx" from mailx + * set debian/compat to 5 + * debian/postinst + - fix "command-with-path-in-maintainer-script" + + -- Hideki Yamane (Debian-JP) <henr...@debian.or.jp> Wed, 14 Apr 2010 20:58:29 +0900 + tz-brasil (0.10) unstable; urgency=low * removed +x permissions from conf-file in postinst. thanks to Nelson A diff -Nru tz-brasil-0.10/debian/compat tz-brasil-0.10+nmu1/debian/compat --- tz-brasil-0.10/debian/compat 2008-04-21 08:21:40.000000000 +0900 +++ tz-brasil-0.10+nmu1/debian/compat 2010-04-14 20:53:28.000000000 +0900 @@ -1 +1 @@ -4 +5 diff -Nru tz-brasil-0.10/debian/control tz-brasil-0.10+nmu1/debian/control --- tz-brasil-0.10/debian/control 2008-04-21 08:22:25.000000000 +0900 +++ tz-brasil-0.10+nmu1/debian/control 2010-04-14 20:57:06.000000000 +0900 @@ -2,12 +2,12 @@ Section: admin Priority: optional Maintainer: Pedro Zorzenon Neto <p...@debian.org> -Build-Depends: debhelper (>> 3.0.0) -Standards-Version: 3.7.3 +Build-Depends: debhelper (>= 5.0.0) +Standards-Version: 3.8.4 Package: tz-brasil Architecture: all -Depends: wget, fping, mailx +Depends: wget, fping, bsd-mailx, ${misc:Depends} Recommends: cron Description: timezone autoconfiguration for Brazil This package is intended for use in Brazil only. It automatically diff -Nru tz-brasil-0.10/debian/postinst tz-brasil-0.10+nmu1/debian/postinst --- tz-brasil-0.10/debian/postinst 2008-04-23 21:01:03.000000000 +0900 +++ tz-brasil-0.10+nmu1/debian/postinst 2010-04-14 20:54:55.000000000 +0900 @@ -54,7 +54,7 @@ set -e if [ "$R" = "0" ]; then echo "ok. updating tz-brasil database" - /usr/sbin/tz-brasil || true + tz-brasil || true else echo "internet is not available." echo " * will update tz-brasil database later, when you are online" @@ -67,7 +67,7 @@ echo "" echo "Running tz-brasil-restart..." - /usr/sbin/tz-brasil-restart + tz-brasil-restart ;; abort-upgrade|abort-remove|abort-deconfigure) diff -Nru tz-brasil-0.10/debian/postrm tz-brasil-0.10+nmu1/debian/postrm --- tz-brasil-0.10/debian/postrm 1970-01-01 09:00:00.000000000 +0900 +++ tz-brasil-0.10+nmu1/debian/postrm 2010-04-14 21:31:12.000000000 +0900 @@ -0,0 +1,69 @@ +#!/bin/sh +# postrm script for tz-brazil +# +# see: dh_installdeb(1) + +set -e + +PKGNAME=tz-brazil +CITYLIST="\ + /usr/share/zoneinfo/America/Araguaina \ + /usr/share/zoneinfo/America/Bahia \ + /usr/share/zoneinfo/America/Belem \ + /usr/share/zoneinfo/America/Boa_Vista \ + /usr/share/zoneinfo/America/Campo_Grande \ + /usr/share/zoneinfo/America/Cuiaba \ + /usr/share/zoneinfo/America/Eirunepe \ + /usr/share/zoneinfo/America/Fortaleza \ + /usr/share/zoneinfo/America/Maceio \ + /usr/share/zoneinfo/America/Manaus \ + /usr/share/zoneinfo/America/Noronha \ + /usr/share/zoneinfo/America/Porto_Acre \ + /usr/share/zoneinfo/America/Porto_Velho \ + /usr/share/zoneinfo/America/Recife \ + /usr/share/zoneinfo/America/Rio_Branco \ + /usr/share/zoneinfo/America/Santarem \ + /usr/share/zoneinfo/America/Sao_Paulo \ + /usr/share/zoneinfo/Brazil/Acre \ + /usr/share/zoneinfo/Brazil/DeNoronha \ + /usr/share/zoneinfo/Brazil/East \ + /usr/share/zoneinfo/Brazil/West" + +# summary of how this script can be called: +# * <postrm> `remove' +# * <postrm> `purge' +# * <old-postrm> `upgrade' <new-version> +# * <new-postrm> `failed-upgrade' <old-version> +# * <new-postrm> `abort-install' +# * <new-postrm> `abort-install' <old-version> +# * <new-postrm> `abort-upgrade' <old-version> +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + for CITY in $CITYLIST + do + dpkg-divert --package $PKGNAME --rename --remove $CITY + done + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + diff -Nru tz-brasil-0.10/debian/preinst tz-brasil-0.10+nmu1/debian/preinst --- tz-brasil-0.10/debian/preinst 1970-01-01 09:00:00.000000000 +0900 +++ tz-brasil-0.10+nmu1/debian/preinst 2010-04-14 21:50:11.000000000 +0900 @@ -0,0 +1,62 @@ +#!/bin/sh +# preinst script for tz-brazil +# + +PKGNAME=tz-brazil +CITYLIST="\ + /usr/share/zoneinfo/America/Araguaina \ + /usr/share/zoneinfo/America/Bahia \ + /usr/share/zoneinfo/America/Belem \ + /usr/share/zoneinfo/America/Boa_Vista \ + /usr/share/zoneinfo/America/Campo_Grande \ + /usr/share/zoneinfo/America/Cuiaba \ + /usr/share/zoneinfo/America/Eirunepe \ + /usr/share/zoneinfo/America/Fortaleza \ + /usr/share/zoneinfo/America/Maceio \ + /usr/share/zoneinfo/America/Manaus \ + /usr/share/zoneinfo/America/Noronha \ + /usr/share/zoneinfo/America/Porto_Acre \ + /usr/share/zoneinfo/America/Porto_Velho \ + /usr/share/zoneinfo/America/Recife \ + /usr/share/zoneinfo/America/Rio_Branco \ + /usr/share/zoneinfo/America/Santarem \ + /usr/share/zoneinfo/America/Sao_Paulo \ + /usr/share/zoneinfo/Brazil/Acre \ + /usr/share/zoneinfo/Brazil/DeNoronha \ + /usr/share/zoneinfo/Brazil/East \ + /usr/share/zoneinfo/Brazil/West" + +set -e + +# summary of how this script can be called: +# * <new-preinst> `install' +# * <new-preinst> `install' <old-version> +# * <new-preinst> `upgrade' <old-version> +# * <old-preinst> `abort-upgrade' <new-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + install|upgrade) + for CITY in $CITYLIST + do + dpkg-divert --package $PKGNAME --rename --divert $CITY.$PKGNAME $CITY + done + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff -Nru tz-brasil-0.10/debian/source/format tz-brasil-0.10+nmu1/debian/source/format --- tz-brasil-0.10/debian/source/format 1970-01-01 09:00:00.000000000 +0900 +++ tz-brasil-0.10+nmu1/debian/source/format 2010-04-14 21:50:54.909194876 +0900 @@ -0,0 +1 @@ +3.0 (native)