Manual merge of version 10+rpi1 and 10.1 to produce 10.1+rpi1

diff --cc debian/changelog
index 2ea2b7836f08ab40c818aa83c579aababf07bdbd,22d295331eb6eedc0c378c4e1e8cad18db50dab8..9d5d6ef553912f64569d3c61ad141d15be841f7a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,18 +1,30 @@@
- base-files (10+rpi1) buster-staging; urgency=medium
++base-files (10.1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 8+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 07 Jan 2015 02:03:42 +0000]
 +  * Modify default vendor etc for raspbian.
 +  * Modify maintainer scripts so default will be set to raspbian even when
 +    upgrading
 +  [changes introduced in 10+rpi1 by Peter Michael Green]
 +  * Make some changes using sed in debian/rules rather than directly in source
 +    package to avoid merge conflicts.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 01 Jul 2017 21:37:08 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Wed, 24 Jan 2018 07:50:05 +0000
++
+ base-files (10.1) unstable; urgency=medium
+ 
+   * Add CC0-1.0 to common-licenses. Closes: #859649, #882628.
+     Source: https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt.
+   * Simplify debian/rules a little bit by dropping install target
+     and using override_dh_auto_install instead. Closes: #886901.
+     Package should now build from source again in every supported way.
+     Thanks to Daniel Schepler for the report and to Niels Thykier for
+     clarifying the true nature of this bug.
+   * Do not create /etc/staff-group-for-usr-local on new installs anymore.
+     Do not create it on upgrades either, as we don't support upgrades
+     skipping stable releases, and even less skipping several releases.
+   * Standards-Version: 4.1.3.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Sun, 14 Jan 2018 00:36:34 +0100
  
  base-files (10) unstable; urgency=medium
  

diff --cc debian/postinst.in
index ca91fd34a6bf92daddbfc678a26af259a58a451e,1d35ee1e89175f91da42cbbb7d7ebc7fb5632e41..df788ed856a900d64e7eef135cadb6ad67c89a0b
--- 1/debian/postinst.in
--- 2/debian/postinst.in
+++ b/debian/postinst.in
@@@ -48,11 -48,9 +48,9 @@@ update_to_current_default() 
    if [ -e /etc/dpkg/origins/#VENDORFILE# ]; then
      ln -sf #VENDORFILE# /etc/dpkg/origins/default
    fi
 -fi
 +#fi
  
  if [ "$1" = "configure" ] && [ "$2" = "" ]; then
-   install_from_default staff-group-for-usr-local \
-                                      /etc/staff-group-for-usr-local
    install_from_default dot.profile   /root/.profile
    install_from_default dot.bashrc    /root/.bashrc
    install_from_default profile       /etc/profile

diff --cc debian/rules
index 9b6ab04c9a47b2d7bf60456a585822b6ded2a91d,88db04b665da501c1254c4b5a80ac299ef21258d..30382449d1ed2d0ce02a0afeabbcaa98017ca0f1
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -8,7 -8,8 +8,8 @@@ ifeq ($(DEB_HOST_GNU_SYSTEM),gnu
    OSNAME=GNU/Hurd
  endif
  
 -VENDORFILE = debian
 +VENDORFILE = raspbian
+ DESTDIR = debian/base-files
  
  %:
        dh $@