Merge branch 'qml' into add-usb-ether-gadget-toggle

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -24,7 +24,8 @@ body:
       label: Version
       description: What version of our software are you running?
       options:
-        - 1.9.0 (Default)
+        - 1.9.2 (Default)
+        - 1.9.0
         - 1.8.5
         - 1.8.4
         - 1.8.3

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -47,7 +47,8 @@ body:
       label: Version
       description: What version of our software did you last run?
       options:
-        - 1.9.0 (Default)
+        - 1.9.2 (Default)
+        - 1.9.0
         - 1.8.5
         - 1.8.4
         - 1.8.3

.gitignore

@@ -5,9 +5,11 @@ src/build/**
 obj-**
 debian/rpi-imager/**
 debian/.debhelper**
+debian/*.debhelper**
 debian/files
 debian/*.substvars
 debian/debhelper**
+debian/tmp
 .DS_Store
 *.DS_Store
 # editor backups

appimagecraft.yml

@@ -2,7 +2,7 @@ version: 1
 
 project:
   name: org.raspberrypi.rpi-imager
-  version: 1.9.1
+  version: 1.9.2
 
 build:
   cmake:

debian/changelog

@@ -1,5 +1,6 @@
-rpi-imager (1.9.1) unstable; urgency=medium
+rpi-imager (1.9.2) unstable; urgency=medium
 
+  * Drive List: Expose only physical devices - not volumes
   * i18n: German, Taiwanese, Catalan, Spanish, Slovak
     translations updated
   * i18n: Added Hebrew translation
@@ -8,7 +9,7 @@ rpi-imager (1.9.1) unstable; urgency=medium
   * qml: MessagePopup: Constrain text, align to the center
   * packaging: debian: Ignore AppImages and ci scripts
 
- -- Tom Dewey <[email protected]>  Wed, 18 Sep 2024 18:57:00 +0000
+ -- Tom Dewey <[email protected]>  Wed, 02 Oct 2024 18:57:00 +0000
 
 rpi-imager (1.9.0) unstable; urgency=medium
 

debian/control

@@ -2,13 +2,13 @@ Source: rpi-imager
 Section: admin
 Priority: optional
 Maintainer: Tom Dewey <[email protected]>
-Build-Depends: debhelper (>= 10), cmake, libgnutls28-dev
+Build-Depends: debhelper (>= 10), cmake, libgnutls28-dev, dh-exec
 Standards-Version: 4.1.2
 Homepage: https://www.raspberrypi.com/software
 
 Package: rpi-imager
 Architecture: arm64
-Depends: ${shlibs:Depends}, ${misc:Depends}, dosfstools, fdisk, fuse, libfuse2
+Depends: ${shlibs:Depends}, ${misc:Depends}, dosfstools, fdisk, fuse, libfuse2, util-linux (>= 2.38)
 Recommends: udisks2
 Description: Raspberry Pi Imaging utility
  A user-friendly tool for creating bootable media for Raspberry Pi Devices.

debian/org.raspberrypi.rpi-imager.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-Version=1.9.0
+Version=1.9.2
 Name=Raspberry Pi Imager
 Name[zh_CN]=树莓派启动盘制作工具
 Comment=Raspberry Pi Imager

debian/postinst

@@ -1,5 +1,9 @@
 #!/bin/sh
 
+set -e
+
 if [ ! -x /usr/bin/rpi-imager ]; then
     chmod +x /usr/bin/rpi-imager
-fi
+fi
+
+#DEBHELPER#

debian/rpi-imager.metainfo.xml

@@ -55,7 +55,7 @@
     <binary>rpi-imager</binary>
   </provides>
   <releases>
-    <release version="1.9.0" />
+    <release version="1.9.2" />
   </releases>
   <content_rating type="oars-1.1">
     <content_attribute id="social-info">moderate</content_attribute>

debian/rules

@@ -6,9 +6,6 @@ export DH_VERBOSE = 1
 %:
 	dh $@
 
-.PHONY: override_dh_usrlocal
-override_dh_usrlocal:
-
 .PHONY: override_dh_strip 
 override_dh_strip: 
-	dh_strip --exclude=AppImage
+	dh_strip --exclude=AppImage --exclude=rpi-imager

src/CMakeLists.txt

@@ -11,8 +11,9 @@ set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "Which macOS architectur
 project(rpi-imager LANGUAGES CXX C)
 set(IMAGER_VERSION_MAJOR 1)
 set(IMAGER_VERSION_MINOR 9)
-set(IMAGER_VERSION_STR "${IMAGER_VERSION_MAJOR}.${IMAGER_VERSION_MINOR}.0")
-set(IMAGER_VERSION_CSV "${IMAGER_VERSION_MAJOR},${IMAGER_VERSION_MINOR},0,0")
+set(IMAGER_VERSION_PATCH 2)
+set(IMAGER_VERSION_STR "${IMAGER_VERSION_MAJOR}.${IMAGER_VERSION_MINOR}.${IMAGER_VERSION_PATCH}")
+set(IMAGER_VERSION_CSV "${IMAGER_VERSION_MAJOR},${IMAGER_VERSION_MINOR},${IMAGER_VERSION_PATCH},0")
 add_definitions(-DIMAGER_VERSION_STR="${IMAGER_VERSION_STR}")
 add_definitions(-DIMAGER_VERSION_CSV=${IMAGER_VERSION_CSV})
 set(CMAKE_INCLUDE_CURRENT_DIR ON)

src/linux/linuxdrivelist.cpp

@@ -52,6 +52,7 @@ namespace Drivelist
             "--bytes",
             "--json",
             "--paths",
+            "--tree",
             "--output", "kname,type,subsystems,ro,rm,hotplug,size,phy-sec,log-sec,label,vendor,model,mountpoint",
             "--exclude", "7"
         };