[27025] in Source-Commits
/svn/athena r25901 - in trunk/debathena/debathena/config-package-dev: . debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Apr 9 13:11:06 2013
Date: Tue, 9 Apr 2013 13:10:59 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201304091710.r39HAxv6021177@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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),
