Skip to content

Commit 092e59e

Browse files
authored
Merge branch 'qml' into add-usb-ether-gadget-toggle
2 parents cb733d3 + 879b89c commit 092e59e

16 files changed

+24
-119
lines changed

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ body:
2424
label: Version
2525
description: What version of our software are you running?
2626
options:
27-
- 1.9.0 (Default)
27+
- 1.9.2 (Default)
28+
- 1.9.0
2829
- 1.8.5
2930
- 1.8.4
3031
- 1.8.3

.github/ISSUE_TEMPLATE/feature-request.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ body:
4747
label: Version
4848
description: What version of our software did you last run?
4949
options:
50-
- 1.9.0 (Default)
50+
- 1.9.2 (Default)
51+
- 1.9.0
5152
- 1.8.5
5253
- 1.8.4
5354
- 1.8.3

.github/workflows/build-macos.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

.github/workflows/build-ubuntu-deb.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/workflows/codeql.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ src/build/**
55
obj-**
66
debian/rpi-imager/**
77
debian/.debhelper**
8+
debian/*.debhelper**
89
debian/files
910
debian/*.substvars
1011
debian/debhelper**
12+
debian/tmp
1113
.DS_Store
1214
*.DS_Store
1315
# editor backups

appimagecraft.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 1
22

33
project:
44
name: org.raspberrypi.rpi-imager
5-
version: 1.9.1
5+
version: 1.9.2
66

77
build:
88
cmake:

debian/changelog

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
rpi-imager (1.9.1) unstable; urgency=medium
1+
rpi-imager (1.9.2) unstable; urgency=medium
22

3+
* Drive List: Expose only physical devices - not volumes
34
* i18n: German, Taiwanese, Catalan, Spanish, Slovak
45
translations updated
56
* i18n: Added Hebrew translation
@@ -8,7 +9,7 @@ rpi-imager (1.9.1) unstable; urgency=medium
89
* qml: MessagePopup: Constrain text, align to the center
910
* packaging: debian: Ignore AppImages and ci scripts
1011

11-
-- Tom Dewey <[email protected]> Wed, 18 Sep 2024 18:57:00 +0000
12+
-- Tom Dewey <[email protected]> Wed, 02 Oct 2024 18:57:00 +0000
1213

1314
rpi-imager (1.9.0) unstable; urgency=medium
1415

debian/control

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ Source: rpi-imager
22
Section: admin
33
Priority: optional
44
Maintainer: Tom Dewey <[email protected]>
5-
Build-Depends: debhelper (>= 10), cmake, libgnutls28-dev
5+
Build-Depends: debhelper (>= 10), cmake, libgnutls28-dev, dh-exec
66
Standards-Version: 4.1.2
77
Homepage: https://www.raspberrypi.com/software
88

99
Package: rpi-imager
1010
Architecture: arm64
11-
Depends: ${shlibs:Depends}, ${misc:Depends}, dosfstools, fdisk, fuse, libfuse2
11+
Depends: ${shlibs:Depends}, ${misc:Depends}, dosfstools, fdisk, fuse, libfuse2, util-linux (>= 2.38)
1212
Recommends: udisks2
1313
Description: Raspberry Pi Imaging utility
1414
A user-friendly tool for creating bootable media for Raspberry Pi Devices.

debian/org.raspberrypi.rpi-imager.desktop

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[Desktop Entry]
22
Type=Application
3-
Version=1.9.0
3+
Version=1.9.2
44
Name=Raspberry Pi Imager
55
Name[zh_CN]=树莓派启动盘制作工具
66
Comment=Raspberry Pi Imager

debian/postinst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#!/bin/sh
22

3+
set -e
4+
35
if [ ! -x /usr/bin/rpi-imager ]; then
46
chmod +x /usr/bin/rpi-imager
5-
fi
7+
fi
8+
9+
#DEBHELPER#

debian/rpi-imager.install

100644100755
File mode changed.

debian/rpi-imager.metainfo.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<binary>rpi-imager</binary>
5656
</provides>
5757
<releases>
58-
<release version="1.9.0" />
58+
<release version="1.9.2" />
5959
</releases>
6060
<content_rating type="oars-1.1">
6161
<content_attribute id="social-info">moderate</content_attribute>

debian/rules

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ export DH_VERBOSE = 1
66
%:
77
dh $@
88

9-
.PHONY: override_dh_usrlocal
10-
override_dh_usrlocal:
11-
129
.PHONY: override_dh_strip
1310
override_dh_strip:
14-
dh_strip --exclude=AppImage
11+
dh_strip --exclude=AppImage --exclude=rpi-imager

src/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "Which macOS architectur
1111
project(rpi-imager LANGUAGES CXX C)
1212
set(IMAGER_VERSION_MAJOR 1)
1313
set(IMAGER_VERSION_MINOR 9)
14-
set(IMAGER_VERSION_STR "${IMAGER_VERSION_MAJOR}.${IMAGER_VERSION_MINOR}.0")
15-
set(IMAGER_VERSION_CSV "${IMAGER_VERSION_MAJOR},${IMAGER_VERSION_MINOR},0,0")
14+
set(IMAGER_VERSION_PATCH 2)
15+
set(IMAGER_VERSION_STR "${IMAGER_VERSION_MAJOR}.${IMAGER_VERSION_MINOR}.${IMAGER_VERSION_PATCH}")
16+
set(IMAGER_VERSION_CSV "${IMAGER_VERSION_MAJOR},${IMAGER_VERSION_MINOR},${IMAGER_VERSION_PATCH},0")
1617
add_definitions(-DIMAGER_VERSION_STR="${IMAGER_VERSION_STR}")
1718
add_definitions(-DIMAGER_VERSION_CSV=${IMAGER_VERSION_CSV})
1819
set(CMAKE_INCLUDE_CURRENT_DIR ON)

src/linux/linuxdrivelist.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ namespace Drivelist
5252
"--bytes",
5353
"--json",
5454
"--paths",
55+
"--tree",
5556
"--output", "kname,type,subsystems,ro,rm,hotplug,size,phy-sec,log-sec,label,vendor,model,mountpoint",
5657
"--exclude", "7"
5758
};

0 commit comments

Comments
 (0)