From ea5dff5a3b79ff1c277f7bcc428a10aec5921b64 Mon Sep 17 00:00:00 2001
From: Serge Schneider <serge@raspberrypi.org>
Date: Thu, 4 Jun 2020 00:40:56 +0100
Subject: [PATCH] 7.2-1 release

---
 debian/changelog                              | 23 +++++++++++++++++++
 debian/control                                | 11 ++++++---
 debian/rpi-eeprom-images.install              |  4 ----
 ...rpi-eeprom-images.docs => rpi-eeprom.docs} |  0
 debian/rpi-eeprom.install                     |  5 ++++
 5 files changed, 36 insertions(+), 7 deletions(-)
 delete mode 100644 debian/rpi-eeprom-images.install
 rename debian/{rpi-eeprom-images.docs => rpi-eeprom.docs} (100%)

diff --git a/debian/changelog b/debian/changelog
index 784f2b9..2678f26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+rpi-eeprom (7.2-1) buster; urgency=medium
+
+  [ MilhouseVH ]
+  * include vl805 eeprom presence in machine output
+
+  [ Andrew Scheller ]
+  * small typos
+
+  [ Tim Gover ]
+  * Create releases.md
+  * pieeprom-2020-06-03: Bootmode tweaks and fix issue with > 4TB drives - BETA
+  * rpi-eeprom-update: Remove warning in -f section
+
+  [ andrum99 ]
+  * rpi-eeprom-update - fix description of -d flag
+  * Clarify -d option when EEPROM update not needed
+  * reword
+
+  [ Serge Schneider ]
+  * Merge rpi-eeprom-images into rpi-eeprom package
+
+ -- Serge Schneider <serge@raspberrypi.org>  Thu, 04 Jun 2020 00:40:45 +0100
+
 rpi-eeprom (7.1-1) buster; urgency=medium
 
   [ Tim Gover ]
diff --git a/debian/control b/debian/control
index 6b5bc49..0b6391b 100644
--- a/debian/control
+++ b/debian/control
@@ -12,13 +12,18 @@ Package: rpi-eeprom
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, rpi-eeprom-images, libraspberrypi-bin,
  python, binutils, raspberrypi-bootloader (>= 1.20190819), pciutils
+Breaks: rpi-eeprom-images (<<7.2)
+Replaces: rpi-eeprom-images (<<7.2)
 Recommends: flashrom
+Provides: rpi-eeprom-images
 Description: Raspberry Pi 4 boot EEPROM updater
  Checks whether the Raspberry Pi bootloader EEPROM is up-to-date and updates
  the EEPROM.
 
 Package: rpi-eeprom-images
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Raspberry Pi 4 boot EEPROM images
- This package contains the bootloader EEPROM images for Raspberry Pi 4
+Depends: rpi-eeprom (>=7.2)
+Priority: optional
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed.
diff --git a/debian/rpi-eeprom-images.install b/debian/rpi-eeprom-images.install
deleted file mode 100644
index 74c5fa3..0000000
--- a/debian/rpi-eeprom-images.install
+++ /dev/null
@@ -1,4 +0,0 @@
-firmware/critical lib/firmware/raspberrypi/bootloader/
-firmware/stable lib/firmware/raspberrypi/bootloader/
-firmware/beta lib/firmware/raspberrypi/bootloader/
-firmware/release-notes.md lib/firmware/raspberrypi/bootloader/
diff --git a/debian/rpi-eeprom-images.docs b/debian/rpi-eeprom.docs
similarity index 100%
rename from debian/rpi-eeprom-images.docs
rename to debian/rpi-eeprom.docs
diff --git a/debian/rpi-eeprom.install b/debian/rpi-eeprom.install
index 7094e22..dc4bfc3 100644
--- a/debian/rpi-eeprom.install
+++ b/debian/rpi-eeprom.install
@@ -1,3 +1,8 @@
 rpi-eeprom-config usr/bin/
 rpi-eeprom-update usr/bin/
 debian/default/ etc/
+
+firmware/critical lib/firmware/raspberrypi/bootloader/
+firmware/stable lib/firmware/raspberrypi/bootloader/
+firmware/beta lib/firmware/raspberrypi/bootloader/
+firmware/release-notes.md lib/firmware/raspberrypi/bootloader/