Updated debian package config

- Switched to gbp workflow
- binary OSX blobs no longer included
- Install chips definitions in stlink-tools
- Updated symbols files for v1.8.0
- Updated changelog for v1.8.0-1 release

debian/changelog

@@ -1,3 +1,13 @@
+stlink (1.8.0-1) unstable; urgency=medium
+
+  * Switch to gbp workflow, binary OSX blobs no longer included upstream
+  * Merge tag 'upstream/1.8.0' into debian
+  * Drop cross.patch, merged upstream
+  * Install chips definitions in stlink-tools
+  * Update symbols files for 1.8.0
+
+ -- Luca Boccassi <bluca@debian.org>  Thu, 08 Feb 2024 19:28:19 +0000
+
 stlink (1.7.0+ds-1) unstable; urgency=medium
 
   * Merge tag 'v1.7.0' into debian. (Closes: #984356)

debian/control

@@ -1,47 +1,43 @@
 Source: stlink
 Priority: optional
 Maintainer: Luca Boccassi <bluca@debian.org>
-Build-Depends: debhelper-compat (= 13), cmake (>= 3.4.2), libusb-1.0-0-dev, libgtk-3-dev
-Standards-Version: 4.5.1
+Build-Depends: debhelper-compat (= 13), cmake, libusb-1.0-0-dev, libgtk-3-dev, pkgconf, systemd-dev
+Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Section: electronics
 Homepage: https://github.com/stlink-org/stlink
 Vcs-Git: https://github.com/bluca/stlink.git -b debian
 Vcs-Browser: https://github.com/bluca/stlink
 
-Package: stlink-lib-dev
+Package: libstlink-dev
 Section: libdevel
 Architecture: linux-any
 Multi-Arch: same
-Depends: stlink-lib (= ${binary:Version}), ${misc:Depends}
-Replaces: libstlink-dev (<< 1.7.0+ds-1)
-Breaks: libstlink-dev (<< 1.7.0+ds-1)
+Depends: libstlink1 (= ${binary:Version}), ${misc:Depends}
 Description: Open source version of the STMicroelectronics STLINK Tools
  .
- This package contains development files for stlink.
+ This package contains the development files for stlink.
 
-Package: stlink-lib
+Package: libstlink1
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libstlink1 (<< 1.7.0+ds-1)
-Breaks: libstlink1 (<< 1.7.0+ds-1)
 Description: Open source version of the STMicroelectronics STLINK Tools
  .
  This package contains the shared library for stlink.
 
 Package: stlink-tools
 Architecture: linux-any
-Depends: stlink-lib (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libstlink1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: Open source version of the STMicroelectronics STLINK Tools
  .
- This package contains commandline utilities for stlink, as well as modprobe
+ This package contains commandline utilities for stlink, and modprobe
  and udev rules.
 
 Package: stlink-gui
 Architecture: linux-any
-Depends: stlink-lib (= ${binary:Version}), stlink-tools (= ${binary:Version}),
+Depends: libstlink1 (= ${binary:Version}), stlink-tools (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
 Description: Open source version of the STMicroelectronics STLINK Tools
  .

debian/copyright

@@ -2,9 +2,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: stlink
 Upstream-Contact: Nightwalker-87 <15526941+Nightwalker-87@users.noreply.github.com>
 Source: https://github.com/stlink-org/stlink
-Comment: Upstream tarball has been repackaged to remove binary OSX kernel
-         drivers that are of unknown license and of no use to Debian.
-Files-Excluded: stlinkv1_macos_driver
 
 Files: *
 Copyright: 2011-2021 The stlink project maintainers

debian/gbp.conf

@@ -1,7 +1,12 @@
-[buildpackage]
-upstream-tag = %(version)s
+[DEFAULT]
 debian-branch = debian
+upstream-branch = upstream
+pristine-tar = True
+sign-tags = True
+
+[import-orig]
+upstream-vcs-tag = v%(version)s
 
 [dch]
-git-log = --first-parent
 customizations = /usr/share/doc/git-buildpackage/examples/wrap_cl.py
+git-log = --first-parent

debian/rules

@@ -10,12 +10,15 @@ include /usr/share/dpkg/default.mk
 # see FEATURE AREAS in dpkg-buildflags(1)
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+export deb_udevdir = $(shell pkg-config --variable=udevdir udev | sed s,^/,,)
+
 %:
 	dh $@ --buildsystem cmake
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
     -DSTLINK_UDEV_RULES_DIR='/lib/udev/rules.d'
+    -DSTLINK_UDEV_RULES_DIR=/$(deb_udevdir)/rules.d
 
 override_dh_auto_install:
 	dh_auto_install

debian/stlink-lib.symbols

@@ -1,4 +1,4 @@
-stlink-lib.so.1 stlink-lib #MINVER#
+libstlink.so.1 libstlink1 #MINVER#
  Md5Calculate@Base 1.6.1
  Md5Finalise@Base 1.6.1
  Md5Initialise@Base 1.6.1
@@ -62,13 +62,32 @@ stlink-lib.so.1 stlink-lib #MINVER#
  calculate_F7_sectornum@Base 1.5.0
  calculate_H7_sectornum@Base 1.7.0
  calculate_L4_page@Base 1.5.0
+ check_file@Base 1.8.0
+ check_flash_error@Base 1.8.0
+ clear_flash_cr_pg@Base 1.8.0
+ clear_flash_error@Base 1.8.0
+ dump_a_chip@Base 1.8.0
+ get_stm32l0_flash_base@Base 1.8.0
+ init_chipids@Base 1.8.0
 #MISSING: 1.7.0# is_bigendian@Base 1.5.0
+ is_flash_busy@Base 1.8.0
+ lock_flash@Base 1.8.0
+ lock_flash_option@Base 1.8.0
+ map_file@Base 1.8.0
+ md5_calculate@Base 1.8.0
+ process_chipfile@Base 1.8.0
+ read_flash_cr@Base 1.8.0
+ read_flash_sr@Base 1.8.0
  read_uint16@Base 1.5.0
  read_uint32@Base 1.5.0
  send_recv@Base 1.5.0
  send_usb_data_only@Base 1.5.0
  send_usb_mass_storage_command@Base 1.5.0
  stlink_calculate_pagesize@Base 1.5.0
+ stlink_check_address_alignment@Base 1.8.0
+ stlink_check_address_range_validity@Base 1.8.0
+ stlink_check_address_range_validity_otp@Base 1.8.0
+ stlink_checksum@Base 1.8.0
  stlink_chip_id@Base 1.5.0
  stlink_chipid_get_params@Base 1.5.0
  stlink_close@Base 1.5.0
@@ -80,6 +99,7 @@ stlink-lib.so.1 stlink-lib #MINVER#
  stlink_enter_swd_mode@Base 1.5.0
  stlink_erase_flash_mass@Base 1.5.0
  stlink_erase_flash_page@Base 1.5.0
+ stlink_erase_flash_section@Base 1.8.0
  stlink_exit_debug_mode@Base 1.5.0
  stlink_exit_dfu_mode@Base 1.5.0
  stlink_fcheck_flash@Base 1.5.0
@@ -91,6 +111,7 @@ stlink-lib.so.1 stlink-lib #MINVER#
  stlink_flashloader_write@Base 1.7.0
  stlink_force_debug@Base 1.5.0
  stlink_fread@Base 1.5.0
+ stlink_fwrite_finalize@Base 1.8.0
  stlink_fwrite_flash@Base 1.5.0
  stlink_fwrite_option_bytes@Base 1.6.0
 #MISSING: 1.6.1# stlink_fwrite_option_bytes_32bit@Base 1.6.0
@@ -112,20 +133,24 @@ stlink-lib.so.1 stlink-lib #MINVER#
  stlink_read_debug32@Base 1.5.0
  stlink_read_mem32@Base 1.5.0
  stlink_read_option_bytes32@Base 1.6.1
- stlink_read_option_bytes_Gx@Base 1.6.1
+#MISSING: 1.8.0# stlink_read_option_bytes_Gx@Base 1.6.1
  stlink_read_option_bytes_boot_add32@Base 1.7.0
  stlink_read_option_bytes_boot_add_f7@Base 1.7.0
  stlink_read_option_bytes_f2@Base 1.6.0
  stlink_read_option_bytes_f4@Base 1.6.0
  stlink_read_option_bytes_f7@Base 1.7.0
  stlink_read_option_bytes_generic@Base 1.6.1
+ stlink_read_option_bytes_gx@Base 1.8.0
  stlink_read_option_control_register1_32@Base 1.7.0
  stlink_read_option_control_register1_f7@Base 1.7.0
  stlink_read_option_control_register32@Base 1.7.0
- stlink_read_option_control_register_Gx@Base 1.7.0
+#MISSING: 1.8.0# stlink_read_option_control_register_Gx@Base 1.7.0
+ stlink_read_option_control_register_f0@Base 1.8.0
  stlink_read_option_control_register_f2@Base 1.7.0
  stlink_read_option_control_register_f4@Base 1.7.0
  stlink_read_option_control_register_f7@Base 1.7.0
+ stlink_read_option_control_register_gx@Base 1.8.0
+ stlink_read_option_control_register_wb@Base 1.8.0
  stlink_read_reg@Base 1.5.0
  stlink_read_unsupported_reg@Base 1.5.0
  stlink_reset@Base 1.5.0
@@ -140,9 +165,9 @@ stlink-lib.so.1 stlink-lib #MINVER#
  stlink_step@Base 1.5.0
  stlink_target_connect@Base 1.7.0
  stlink_target_voltage@Base 1.5.0
- stlink_trace_disable@Base 1.7.0
- stlink_trace_enable@Base 1.7.0
- stlink_trace_read@Base 1.7.0
+#MISSING: 1.8.0# stlink_trace_disable@Base 1.7.0
+#MISSING: 1.8.0# stlink_trace_enable@Base 1.7.0
+#MISSING: 1.8.0# stlink_trace_read@Base 1.7.0
  stlink_v1_open@Base 1.5.0
  stlink_v1_open_inner@Base 1.5.0
  stlink_verify_write_flash@Base 1.5.0
@@ -157,13 +182,19 @@ stlink-lib.so.1 stlink-lib #MINVER#
  stlink_write_option_bytes_boot_add32@Base 1.7.0
  stlink_write_option_control_register1_32@Base 1.7.0
  stlink_write_option_control_register32@Base 1.7.0
+ stlink_write_otp@Base 1.8.0
  stlink_write_reg@Base 1.5.0
  stlink_write_unsupported_reg@Base 1.5.0
  stm32l1_write_half_pages@Base 1.5.0
  time_ms@Base 1.7.0
  ugly_init@Base 1.5.0
  ugly_libusb_log_level@Base 1.6.1
  ugly_log@Base 1.5.0
+ unlock_flash_if@Base 1.8.0
+ unlock_flash_option_if@Base 1.8.0
+ unmap_file@Base 1.8.0
+ wait_flash_busy@Base 1.8.0
  write_buffer_to_sram@Base 1.5.0
+ write_flash_cr_psiz@Base 1.8.0
  write_uint16@Base 1.5.0
- write_uint32@Base 1.5.0
+ write_uint32@Base 1.5.0

debian/stlink-tools.install

@@ -1,3 +1,4 @@
 /usr/bin/st-*
-lib/udev/rules.d/*.rules
+${env:deb_udevdir}/rules.d/*.rules
 etc/modprobe.d/*.conf
+usr/share/stlink/chips

debian/stlink.pc.in

@@ -3,7 +3,7 @@ includedir=${prefix}/include/stlink
 libdir=${prefix}/lib/@DEB_HOST_MULTIARCH@
 
 Name: stlink
-Description: Open source version of the STMicroelectronics STLINK Tools
+Description: Open source version of the STMicroelectronics Stlink Tools
 Version: @VERSION@
 Requires: libusb-1.0
 Libs: -L${libdir} -lstlink

debian/upstream/metadata

@@ -0,0 +1,4 @@
+---
+Bug-Database: https://github.com/stlink-org/stlink/issues
+Bug-Submit: https://github.com/stlink-org/stlink/issues/new
+Repository-Browse: https://github.com/stlink-org/stlink

debian/watch

@@ -1,3 +1,3 @@
 version=3
-opts=dversionmangle=s/\+ds$//,repacksuffix=+ds,filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/stlink-$1\.tar\.gz/ \
+opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/stlink-$1\.tar\.gz/ \
   https://github.com/stlink-org/stlink/tags .*/v?(\d\S+)\.tar\.gz