diff -Nru dpkg-1.18.10ubuntu1/debian/changelog dpkg-1.18.10ubuntu1.1/debian/changelog --- dpkg-1.18.10ubuntu1/debian/changelog 2016-08-12 19:39:00.000000000 +0200 +++ dpkg-1.18.10ubuntu1.1/debian/changelog 2017-03-17 08:38:08.000000000 +0100 @@ -1,3 +1,12 @@ +dpkg (1.18.10ubuntu1.1) yakkety; urgency=medium + + * src/archives.c: + - handle a conffile moving from pkg-a to pkg-b correctly when + dpkg --root=/dir is used. Thanks to Guillem Jover. + LP: #1673247 + + -- Michael Vogt Fri, 17 Mar 2017 08:38:08 +0100 + dpkg (1.18.10ubuntu1) yakkety; urgency=medium * Merge from Debian testing; remaining Ubuntu changes: diff -Nru dpkg-1.18.10ubuntu1/src/archives.c dpkg-1.18.10ubuntu1.1/src/archives.c --- dpkg-1.18.10ubuntu1/src/archives.c 2016-07-08 01:36:47.000000000 +0200 +++ dpkg-1.18.10ubuntu1.1/src/archives.c 2017-03-17 08:37:54.000000000 +0100 @@ -871,14 +871,7 @@ conff = conff->next) { if (!conff->obsolete) continue; - if (stat(conff->name, &stabtmp)) { - if (errno == ENOENT || errno == ENOTDIR || errno == ELOOP) - continue; - else - ohshite(_("cannot stat file '%s'"), conff->name); - } - if (stabtmp.st_dev == stab.st_dev && - stabtmp.st_ino == stab.st_ino) + if (strcmp(conff->name, nifd->namenode->name) == 0) break; } if (conff) {