Merge branch 'sid' (through tag '1.16.0.1')

Conflicts:
	debian/changelog

debian/changelog

@@ -13,6 +13,15 @@ dpkg (1.16.1) UNRELEASED; urgency=low
  
  -- Raphaël Hertzog <hertzog@debian.org>  Sat, 02 Apr 2011 09:21:26 +0200
 
+dpkg (1.16.0.1) unstable; urgency=low
+
+  [ Raphaël Hertzog ]
+  * Fix regression affecting dpkg -R. Closes: #620636
+  * Don't fail during unpack if the system doesn't support changing timestamps
+    of symlinks. Closes: #620679
+
+ -- Guillem Jover <guillem@debian.org>  Tue, 05 Apr 2011 07:28:20 +0200
+
 dpkg (1.16.0) unstable; urgency=low
 
   [ Guillem Jover ]

src/archives.c

@@ -242,7 +242,7 @@ tarobject_set_mtime(struct tar_entry *te, const char *path)
 
   if (te->type == tar_filetype_symlink) {
 #ifdef HAVE_LUTIMES
-    if (lutimes(path, tv))
+    if (lutimes(path, tv) && errno != ENOSYS)
       ohshite(_("error setting timestamps of `%.255s'"), path);
 #endif
   } else {
@@ -1269,7 +1269,7 @@ archivefiles(const char *const *argv)
     arglist= m_malloc(sizeof(char*)*(nfiles+1));
     p = findoutput.buf;
     for (i = 0; i < nfiles; i++) {
-      arglist[i++]= p;
+      arglist[i] = p;
       while (*p++ != '\0') ;
     }
     arglist[i] = NULL;