From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 20 Jul 2017 12:56:20 +0000 (+0000)
Subject: Manual merge of version 9.9+rpi1 and 10 to produce 10+rpi1
X-Git-Tag: archive/raspbian/10+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a5550333799a8bbc1434273585f6a9bccc403336;p=base-files.git

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

move some changes from direct in source tree to sed commands in debian/rules
to hopefully avoid merge conflicts in future.
---

a5550333799a8bbc1434273585f6a9bccc403336
diff --cc debian/changelog
index 1df7d8f,b66b0fd..2ea2b78
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,22 @@@
- base-files (9.9+rpi1) stretch-staging; urgency=medium
++base-files (10+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 26 Apr 2017 13:26:56 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 01 Jul 2017 21:37:08 +0000
++
+ base-files (10) unstable; urgency=medium
+ 
+   * Change issue, issue.net, debian_version and os-release to read
+     "buster/sid", and drop VERSION and VERSION_ID from os-release.
+   * Fix typo in changelog for version 9.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Mon, 26 Jun 2017 00:19:42 +0200
  
  base-files (9.9) unstable; urgency=medium
  
diff --cc debian/rules
index 38e9635,7f4f799..9b6ab04
--- a/debian/rules
+++ b/debian/rules
@@@ -13,7 -13,7 +13,16 @@@ VENDORFILE = raspbia
  %:
  	dh $@
  
++override_dh_auto_clean:
++	dh_auto_clean
++	sed -i s/Raspbian/Debian/ etc/issue
++	sed -i s/Raspbian/Debian/ etc/issue.net
++	sed -i s/Raspbian/Debian/ etc/os-release
++
  override_dh_auto_build:
++	sed -i s/Debian/Raspbian/ etc/issue
++	sed -i s/Debian/Raspbian/ etc/issue.net
++	sed -i s/Debian/Raspbian/ etc/os-release
  	sh debian/check-md5sum-etc profile
  	sed -e "s&#OSNAME#&$(OSNAME)&g" debian/copyright.in > debian/copyright
  	sed -e "s/#VENDORFILE#/$(VENDORFILE)/g" debian/postinst.in > debian/postinst
diff --cc etc/os-release
index 23df384,7a2f2c2..876c10f
--- a/etc/os-release
+++ b/etc/os-release
@@@ -1,9 -1,6 +1,7 @@@
- PRETTY_NAME="Raspbian #OSNAME# 9 (stretch)"
- NAME="Raspbian #OSNAME#"
- VERSION_ID="9"
- VERSION="9 (stretch)"
+ PRETTY_NAME="Debian #OSNAME# buster/sid"
+ NAME="Debian #OSNAME#"
 -ID=debian
 -HOME_URL="https://www.debian.org/"
 -SUPPORT_URL="https://www.debian.org/support"
 -BUG_REPORT_URL="https://bugs.debian.org/"
 +ID=raspbian
 +ID_LIKE=debian
 +HOME_URL="http://www.raspbian.org/"
- SUPPORT_URL="http://www.raspbian.org/RaspbianForums"
- BUG_REPORT_URL="http://www.raspbian.org/RaspbianBugs"
++SUPPORT_URL="http://www.raspbian.org/DebianForums"
++BUG_REPORT_URL="http://www.raspbian.org/DebianBugs"