[27028] in Source-Commits
Re: /svn/athena r25901 - in trunk/debathena/debathena/config-package-dev:
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Tue Apr 9 14:13:59 2013
Date: Tue, 9 Apr 2013 14:13:50 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201304091710.r39HAxv6021177@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1304091413460.9389@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
ACK.
-Ben
On Tue, 9 Apr 2013, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2013-04-09 13:10:59 -0400 (Tue, 09 Apr 2013)
> New Revision: 25901
>
> Modified:
> trunk/debathena/debathena/config-package-dev/debian/changelog
> trunk/debathena/debathena/config-package-dev/dh_configpackage
> Log:
> Sync 5.1 with Debian unstable, which includes the following:
> * Support the abort-remove invocation of postinst
> * Add the transformed file, not its source, to the list of files to displace
>
>
> Modified: trunk/debathena/debathena/config-package-dev/debian/changelog
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/debian/changelog 2013-04-08 20:08:52 UTC (rev 25900)
> +++ trunk/debathena/debathena/config-package-dev/debian/changelog 2013-04-09 17:10:59 UTC (rev 25901)
> @@ -1,3 +1,11 @@
> +config-package-dev (5.1) unstable; urgency=low
> +
> + [ Team Upload ]
> + * Support the abort-remove invocation of postinst
> + * Add the transformed file, not its source, to the list of files to displace
> +
> + -- Alexander Chernyakhovsky <achernya@mit.edu> Mon, 08 Apr 2013 15:12:32 -0400
> +
> config-package-dev (5.0) unstable; urgency=low
>
> * Add Debhelper support (Debathena: #867) (Closes: #693672). This
>
> Modified: trunk/debathena/debathena/config-package-dev/dh_configpackage
> ===================================================================
> --- trunk/debathena/debathena/config-package-dev/dh_configpackage 2013-04-08 20:08:52 UTC (rev 25900)
> +++ trunk/debathena/debathena/config-package-dev/dh_configpackage 2013-04-09 17:10:59 UTC (rev 25901)
> @@ -392,14 +392,14 @@
> doit("install", "-d", $destdir);
> }
> complex_doit(@$line, "<", $source, ">", "$tmp/$file");
> - push @displacefiles, $source;
> + push @displacefiles, $file;
> }
>
> # Add code to postinst to add/remove diversions as appropriate
> if (! $dh{NOSCRIPTS}) {
> if (@undisplacefiles || @unhidefiles || @displacefiles || @hidefiles) {
> my $postinst = escape_shell(join "\\n", (
> - 'if [ "$1" = "configure" ]; then',
> + 'if [ "$1" = "configure" ] || [ "$1" = "abort-remove" ]; then',
> (map {" check_undisplace_unlink " . displace_files_replace_name($package, $_, " ")} @undisplacefiles),
> (map {" check_undisplace_unhide $_ " . hide_files_name($_, $package)} @unhidefiles),
> (map {" displace_link " . displace_files_replace_name($package, $_, " ")} @displacefiles),
>
>
