From ef3431de546eea90f626a4cffdfb874f41b4ad40 Mon Sep 17 00:00:00 2001
From: Jens John <2ion@users.noreply.github.com>
Date: Sat, 27 Jul 2019 13:03:16 +0200
Subject: [PATCH] os-release, lsb-release: Fix os-release diversion and drop
 obsolete lsb-release files

 * os-release: Divert /usr/lib/os-release instead of /etc/os-release in order
    to accommodate particularities in the lsb-release code of Debian.
    Normally, /etc/os-release should override /usr/lib/os-release, but the
    mentioned Debian code does not respect that unless extra environment
    variables are set.
  * /etc/lsb-release is not needed anymore on Buster and not used by lsb-release; drop it.
  * Document a harmless warning occurring at install time from dpkg-divert.
 * Bump package version.
---
 KNOWN_ISSUES.md                   |  4 ++++
 bunsen-os-release.5.mkd           |  4 ++--
 config.mk                         | 11 +----------
 debian/bunsen-os-release.displace |  3 +--
 debian/bunsen-os-release.install  |  3 +--
 debian/changelog                  | 11 +++++++++++
 6 files changed, 20 insertions(+), 16 deletions(-)
 create mode 100644 KNOWN_ISSUES.md

diff --git a/KNOWN_ISSUES.md b/KNOWN_ISSUES.md
new file mode 100644
index 0000000..58a0cd8
--- /dev/null
+++ b/KNOWN_ISSUES.md
@@ -0,0 +1,4 @@
+* dpkg-divert will complain `'dpkg-divert: warning: diverting file
+  '/usr/lib/os-release' from an Essential package with rename is dangerous, use
+  --no-rename'`. This is a bug or missing feature in the package
+  config-package-dev. It is harmless on Debian Buster.
diff --git a/bunsen-os-release.5.mkd b/bunsen-os-release.5.mkd
index 36e06c6..fe7564c 100644
--- a/bunsen-os-release.5.mkd
+++ b/bunsen-os-release.5.mkd
@@ -8,9 +8,9 @@ bunsen-os-release - Operating system and vendor identification
 
 # SYNOPSIS
 
-/etc/os/release 
+/etc/os-release (symlink)
 
-/etc/lsb-release
+/usr/lib/os-release
 
 /etc/dpkg/origins/bunsenlabs
 
diff --git a/config.mk b/config.mk
index 1c16847..1707a6c 100644
--- a/config.mk
+++ b/config.mk
@@ -32,16 +32,7 @@ endef
 export OS_RELEASE_FILE
 OS_RELEASE_FILE_TARGET = os-release.bunsen
 
-define LSB_RELEASE_FILE
-DISTRIB_ID="$(OS_PRETTY_ID)"
-DISTRIB_DESCRIPTION="$(OS_LONGNAME)"
-DISTRIB_RELEASE="$(OS_VERSION_ID)"
-DISTRIB_CODENAME="$(call lc,$(OS_CODENAME))"
-endef
-export LSB_RELEASE_FILE
-LSB_RELEASE_FILE_TARGET = lsb-release.bunsen
-
-RELEASE_FILE_TARGETS = $(LSB_RELEASE_FILE_TARGET) $(OS_RELEASE_FILE_TARGET)
+RELEASE_FILE_TARGETS = $(OS_RELEASE_FILE_TARGET)
 
 #
 # man page generator
diff --git a/debian/bunsen-os-release.displace b/debian/bunsen-os-release.displace
index 394995e..3abd3fc 100644
--- a/debian/bunsen-os-release.displace
+++ b/debian/bunsen-os-release.displace
@@ -1,3 +1,2 @@
-/etc/os-release.bunsen
-/etc/lsb-release.bunsen
+/usr/lib/os-release.bunsen
 /etc/dpkg/origins/default.bunsen
diff --git a/debian/bunsen-os-release.install b/debian/bunsen-os-release.install
index fbefbef..5e35725 100644
--- a/debian/bunsen-os-release.install
+++ b/debian/bunsen-os-release.install
@@ -1,4 +1,3 @@
-os-release.bunsen etc/
-lsb-release.bunsen etc/
+os-release.bunsen usr/lib/
 dpkg/origins/default.bunsen etc/dpkg/origins/
 dpkg/origins/bunsenlabs etc/dpkg/origins/
diff --git a/debian/changelog b/debian/changelog
index 9240d5d..147e239 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+bunsen-os-release (10.0.1-1) lithium; urgency=medium
+
+  * os-release: Divert /usr/lib/os-release instead of /etc/os-release in order
+    to accommodate particularities in the lsb-release code of Debian.
+    Normally, /etc/os-release should override /usr/lib/os-release, but the
+    mentioned Debian code does not respect that unless extra environment
+    variables are set.
+  * Document a harmless warning occurring at install time from dpkg-divert.
+
+ -- Jens John <dev@2ion.de>  Thu, 31 Jan 2019 11:39:04 +0100
+
 bunsen-os-release (10.0-1) lithium; urgency=medium
 
   * Point release 10.0.