Hi Gonéri, On Sun, Jan 27, 2013 at 22:58:42 +0100, Gonéri Le Bouder wrote:
> diff -u fusioninventory-agent-2.2.3/debian/fusioninventory-agent.postrm > fusioninventory-agent-2.2.3/debian/fusioninventory-agent.postrm > --- fusioninventory-agent-2.2.3/debian/fusioninventory-agent.postrm > +++ fusioninventory-agent-2.2.3/debian/fusioninventory-agent.postrm > @@ -1,44 +1,29 @@ This is still full of comment change noise; that doesn't really help spot the actual functional changes. Looks ok though. > -#!/bin/sh > -# postrm script for fusioninventory-agent > -# > -# see: dh_installdeb(1) > - > +#! /bin/sh > set -e > > -# 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 > - > +#DEBHELPER# > > case "$1" in > - purge) > - ucf --purge /etc/fusioninventory/agent.cfg > - rm -rf /var/lib/fusioninventory-agent > - ;; > - > - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) > - ;; > + purge) > + for ext in '~' '%' .bak .ucf-new .ucf-old .ucf-dist; do > + rm -f /etc/fusioninventory/agent.cfg$ext > + done > + > + # remove the configuration file itself > + rm -f /etc/fusioninventory/agent.cfg > + rm -r /etc/fusioninventory if you're going to rm -r then the rm's before are kind of useless... Oh well, probably not a major issue. > + > + # and finally clear it out from the ucf database > + if which ucf >/dev/null; then > + ucf --purge /etc/fusioninventory/agent.cfg > + fi > + if which ucfr >/dev/null; then > + ucfr --purge fusioninventory-agent /etc/fusioninventory/agent.cfg > + fi > > - *) > - echo "postrm called with unknown argument \`$1'" >&2 > - exit 1 > ;; > + *) > + exit 0;; > esac > > -# dh_installdeb will replace this with shell code automatically > -# generated by other debhelper scripts. > - > -#DEBHELPER# > - > exit 0 > - > - > diff -u fusioninventory-agent-2.2.3/debian/control > fusioninventory-agent-2.2.3/debian/control > --- fusioninventory-agent-2.2.3/debian/control > +++ fusioninventory-agent-2.2.3/debian/control > @@ -4,14 +4,14 @@ > Maintainer: Gonéri Le Bouder <gon...@rulezlan.org> > Build-Depends: debhelper (>= 7.0.50~), > libnet-ip-perl, libwww-perl, quilt, > - libnet-ssleay-perl, perl, > - libuniversal-require-perl, libtest-compile-perl, > + perl, libuniversal-require-perl, libtest-compile-perl, > libtest-exception-perl, libhttp-server-simple-perl, > libfile-which-perl, libxml-treepp-perl, libyaml-perl, > libipc-run-perl, libhttp-proxy-perl, libtext-template-perl, > libjson-perl, libio-capture-perl, > libtest-simple-perl, libtest-mockmodule-perl, > - libhttp-server-simple-authen-perl, libhttp-daemon-perl > + libhttp-server-simple-authen-perl, libhttp-daemon-perl, > + libio-socket-ssl-perl > Standards-Version: 3.9.3 > Homepage: http://fusioninventory.org/ > Vcs-Browser: > http://git.debian.org/?p=users/goneri/fusioninventory-agent.git;a=summary not the most readable hunk ever, but ok. > @@ -20,7 +20,7 @@ > Package: fusioninventory-agent > Architecture: any > Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, > - ucf, libnet-ip-perl, libwww-perl, libnet-ssleay-perl, > + ucf, libnet-ip-perl, libwww-perl, libio-socket-ssl-perl, > libproc-daemon-perl, dmidecode [i386-any amd64-any ia64], > libuniversal-require-perl, libproc-pid-file-perl, hdparm [linux-any], > libfile-which-perl, libxml-treepp-perl, libyaml-perl, libtext-template-perl, [...] > --- fusioninventory-agent-2.2.3.orig/debian/fusioninventory-agent.postinst > +++ fusioninventory-agent-2.2.3/debian/fusioninventory-agent.postinst > @@ -0,0 +1,13 @@ > +#! /bin/sh > +set -e > + > +#DEBHELPER# > + > +case "$1" in > + configure) > + [ -d "/etc/fusioninventory" ] || mkdir "/etc/fusioninventory" That's going to depend on umask. Can the package deal with whatever permissions this can end up with? > + ucf /usr/share/fusioninventory/etc/agent.cfg > /etc/fusioninventory/agent.cfg > + ucfr fusioninventory-agent /etc/fusioninventory/agent.cfg > +esac > + > +exit 0 > only in patch2: > unchanged: > --- fusioninventory-agent-2.2.3.orig/debian/tools/prepare-bpo.pl > +++ fusioninventory-agent-2.2.3/debian/tools/prepare-bpo.pl more noise :( > --- fusioninventory-agent-2.2.3.orig/debian/patches/upstream-fix-backport.diff > +++ fusioninventory-agent-2.2.3/debian/patches/upstream-fix-backport.diff what specifically does that fix? I'm not keen on reading a 1000 line diff without knowing what it's supposed to do. At this stage we should only be fixing RC bugs, not random other stuff. Cheers, Julien
signature.asc
Description: Digital signature
