Merge branch 'master' into develop

Author: Nightwalker-87

debian/.gitignore

@@ -0,0 +1,10 @@
+.debhelper
+*.log
+*.substvars
+debhelper-build-stamp
+files
+libstlink-dev
+libstlink
+stlink-gui
+stlink-tools
+tmp

debian/changelog

@@ -0,0 +1,203 @@
+stlink (1.7.0+ds-1) unstable; urgency=medium
+
+  * Merge tag 'v1.7.0' into debian. (Closes: #984356)
+  * Bump Standards-Version to 4.5.1, no changes.
+  * Bump debhelper-compat to 13, no changes.
+  * Update install files, paths have been fixed upstream.
+  * Update symbols file for 1.7.0.
+
+ -- Luca Boccassi <bluca@debian.org>  Sun, 15 Aug 2021 14:23:25 +0100
+
+stlink (1.6.1+ds-3) unstable; urgency=medium
+
+  * Add cross.patch to fix cross-compilation. Thanks Helmut! (Closes:
+    #973339)
+
+ -- Luca Boccassi <bluca@debian.org>  Thu, 29 Oct 2020 18:06:39 +0000
+
+stlink (1.6.1+ds-2) unstable; urgency=medium
+
+  * Update d/copyright to remove GPL-2+ stanza about flashloaders
+  * Update upstream URLs for new Github org
+  * Patch CMake's hard-coded define of XML gui file location (Closes:
+    #963219)
+
+ -- Luca Boccassi <bluca@debian.org>  Sun, 21 Jun 2020 13:41:37 +0100
+
+stlink (1.6.1+ds-1) unstable; urgency=medium
+
+  * Merge tag 'v1.6.1' into debian
+  * Update Files-Excluded in d/copyright for new layout
+  * Fix d/watch intermediary file name
+  * Drop cross.patch, merged upstream in v1.6.1
+  * Bump Build-Depends to cmake >= 3.4.2
+  * Add new symbols from upstream version 1.6.1
+  * Adjust install files, some files moved
+  * Remove unused variable from d/rules
+  * Generate pkgconfig file from d/rules, upstream doesn't do it
+  * Switch to debhelper-compat 12
+
+ -- Luca Boccassi <bluca@debian.org>  Sat, 06 Jun 2020 14:44:54 +0100
+
+stlink (1.6.0+ds-1) unstable; urgency=medium
+
+  * Merge tag 'v1.6.0' into debian
+  * Bump Standards-Version to 4.5.0, no changes.
+  * Update libstlink1 symbols file for 1.6.0.
+
+ -- Luca Boccassi <bluca@debian.org>  Tue, 25 Feb 2020 22:08:33 +0000
+
+stlink (1.5.1+ds-2) unstable; urgency=medium
+
+  * Mark library packages as Multi-Arch: same.
+  * Apply cross.patch to fix cross-compiling the GUI. Thanks Helmut for
+    the patch! (Closes: #941320)
+  * Vcs-Git: add -b debian
+  * Set Rules-Requires-Root: no
+  * Bump Standards-Version to 4.4.0
+
+ -- Luca Boccassi <bluca@debian.org>  Sun, 29 Sep 2019 12:50:58 +0100
+
+stlink (1.5.1+ds-1) unstable; urgency=medium
+
+  * Merge tag 'v1.5.1' into debian. See upstream changelog for info:
+    https://github.com/texane/stlink/releases/tag/v1.5.1
+  * Mark packages as linux-any, other systems not supported.
+
+ -- Luca Boccassi <bluca@debian.org>  Fri, 28 Sep 2018 10:26:39 +0100
+
+stlink (1.5.0+ds-1) unstable; urgency=medium
+
+  * Upload to unstable. (Closes: #869421)
+
+ -- Luca Boccassi <bluca@debian.org>  Fri, 16 Mar 2018 16:56:17 +0000
+
+stlink (1.5.0) unstable; urgency=medium
+
+  [ Jerry Jacobs ]
+  * README.md: Update version badge to v1.4.0
+
+  [ Viallard Anthony ]
+  * Add support of STM32L496xx/4A6xx devices (#615)
+
+  [ rdlim ]
+  * Fix verification of flash error for STM32L496x device (#617) (#618)
+
+  [ dflogeras ]
+  * Add note about availability in Gentoo package manager (#622)
+
+  [ yaofei zheng ]
+  * update debian package version (#630)
+
+  [ Lyle Cheatham ]
+  * Minor formatting fix in FAQ section of README.md (#631)
+
+  [ Vasiliy Glazov ]
+  * README.md: Added information about Fedora and RedHat/CentOS packages.
+    (#635)
+  * Added LIB_INSTALL_DIR to correct libs install on 64-bit systems (#636)
+
+  [ Gwenhael Goavec-Merou ]
+  * fix write for microcontroler with RAM size less or equal to 32K (#637)
+
+  [ Mateusz Krawiec ]
+  * Fix memory map for stm32l496xx boards. (#639)
+
+  [ Rüdiger Fortanier ]
+  * Add unknown chip output (#641)
+
+  [ Slyshyk Oleksiy ]
+  * fix __FILE__ base name extraction,  #628 (#648)
+
+  [ texane ]
+  * STM32F72xx73xx support, from bob.feretich@rafresearch.com
+
+  [ Kirill Kolyshkin ]
+  * debian/triggers: add (to run ldconfig) (#664)
+
+  [ Slyshyk Oleksiy ]
+  * Try to fix #666 issue (#667)
+  * Try to fix 666 issue (#668)
+
+  [ Jerry Jacobs ]
+  * Update ChangeLog.md
+  * Update README.md
+
+  [ texane ]
+  * STM32F042K6 Nucleo-32 Board reported to work, by frank@bauernoeppel.de
+
+  [ Anatol Pomozov ]
+  * Update .version file to match release number (#670)
+
+ -- Anatol Pomozov <anatol.pomozov@gmail.com>  Mon, 19 Feb 2018 11:00:29 -0800
+
+libstlink (1.4.0) unstable; urgency=low
+
+  * Major changes and added features
+    - Add support for STM32L452 target (#608)
+    - Initial support to compile with Microsoft Visual Studio 2017 (#602)
+    - Added support for flashing second bank on STM32F10x_XL (#592)
+    - Add support for STM32L011 target (#572)
+    - Allow building of debian package with CPack (@xor-gate)
+  * Updates and fixes
+    - Fix compilation with GCC 7 (#590)
+    - Skip GTK detection if we're cross-compiling (#588)
+    - Fix possible memory leak (#570)
+    - Fix building with mingw64 (#569, #610)
+    - Update libusb to 1.0.21 for Windows (#562)
+    - Fixing low-voltage flashing on STM32F7 parts. (#567)
+    - Update libusb to 1.0.21 for Windows (#562)
+
+ -- Andrew 'Necromant' Andrianov <andrew@ncrmnt.org>  Sat, 01 Jul 2017 00:00:00 +0000
+
+libstlink (1.3.1) unstable; urgency=low
+
+  * Major changes and added features:
+    - Add preliminary support for STM32L011 to see it after probe (chipid 0x457) (@xor-gate)
+    - Strip full paths to source files in log (commit #2c0ab7f)
+    - Add support for STM32F413 target (#549)
+    - Add support for Semihosting SYS_READC (#546)
+  * Updates and fixes:
+    - Update documentation markdown files
+    - Compilation fixes (#552)
+    - Fix compilation when path includes spaces (#561)
+
+ -- Andrew 'Necromant' Andrianov <andrew@ncrmnt.org>  Sat, 25 Feb 2017 00:00:00 +0000
+
+libstlink (1.3.0) unstable; urgency=low
+
+  * Major changes and added features:
+    - Deprecation of autotools (autoconf, automake) (@xor-gate)
+    - Removal of undocumented st-term utility, which is now replaced by st-util ARM semihosting feature (#3fd0f09)
+    - Add support for native debian packaging (#444, #485)
+    - Add intel hex file reading for st-flash (#459)
+    - Add --reset command to st-flash (#505)
+    - Support serial numbers argument for st-util and st-flash for multi-programmer setups (#541)
+    - Add kill ('k') command to gdb-server for st-util (#9804416)
+    - Add manpages (generated with pandoc from Markdown) (#464)
+    - Rewrite commandline parsing for st-flash (#459)
+    - Add support for ARM semihosting to st-util (#454, #455)
+  * Chip support added for:
+    - STM32L432 (#501)
+    - STM32F412 (#538)
+    - STM32F410 (#9c635e4)
+    - Add memory map for STM32F401XE (#460)
+    - L0x Category 5 devices (#406)
+    - Add L0 Category 2 device (chip id: 0x425) (#72b8e5e)
+  * Updates and fixes:
+    - Fixed STM32F030 erase error (#442)
+    - Fixed Cygwin build (#68b0f3b)
+    - Reset flash mass erase (MER) bit after mass erase for safety (#489)
+    - Fix memory map for STM32F4 (@zulusw)
+    - Fix STM32L-problem with flash loader (issue #390) (Tom de Boer)
+    - st-util don't read target voltage on startup as it crashes STM32F100 (probably stlink/v1) (Greg Alexander)
+    - Do a JTAG reset prior to reading CPU information when processor is in deep sleep (@andyg24)
+    - Redesign of st-flash commandline options parsing (pull-request #459) (@dev26th)
+
+ -- Andrew 'Necromant' Andrianov <andrew@ncrmnt.org>  Sat, 28 Jan 2017 00:00:00 +0000
+
+libstlink (1.2.1) unstable; urgency=low
+
+  * Initial Debian-Packaged Release.
+
+ -- Andrew 'Necromant' Andrianov <andrew@ncrmnt.org>  Sat, 09 Jul 2016 23:16:07 +0300

debian/control

@@ -0,0 +1,48 @@
+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
+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
+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)
+Description: Open source version of the STMicroelectronics STLINK Tools
+ .
+ This package contains development files for stlink.
+
+Package: stlink-lib
+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}
+Description: Open source version of the STMicroelectronics STLINK Tools
+ .
+ This package contains commandline utilities for stlink, as well as modprobe
+ and udev rules.
+
+Package: stlink-gui
+Architecture: linux-any
+Depends: stlink-lib (= ${binary:Version}), stlink-tools (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Description: Open source version of the STMicroelectronics STLINK Tools
+ .
+ This package contains a GUI tool for stlink.

debian/copyright

@@ -0,0 +1,41 @@
+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
+           Martin Capitanio <capnm@capitanio.org>
+           Fabien Lementec <texane@gmail.com>
+           Jerry Jacobs <jerry.jacobs@xor-gate.org>
+           Nightwalker-87 <15526941+Nightwalker-87@users.noreply.github.com>
+           and many other contributors...      
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+ * Neither the name of Intel Corporation nor the names of its
+   contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

debian/gbp.conf

@@ -0,0 +1,7 @@
+[buildpackage]
+upstream-tag = %(version)s
+debian-branch = debian
+
+[dch]
+git-log = --first-parent
+customizations = /usr/share/doc/git-buildpackage/examples/wrap_cl.py

debian/rules

@@ -0,0 +1,23 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#DH_VERBOSE = 1
+
+# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/default.mk
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
+	dh $@ --buildsystem cmake
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+    -DSTLINK_UDEV_RULES_DIR='/lib/udev/rules.d'
+
+override_dh_auto_install:
+	dh_auto_install
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+	sed -e "s/@VERSION@/$(DEB_VERSION_UPSTREAM)/" -e "s/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/" $(CURDIR)/debian/stlink.pc.in > $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/stlink.pc

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/source/options

@@ -0,0 +1 @@
+extend-diff-ignore=stlinkv1_macos_driver

debian/stlink-gui.install

@@ -0,0 +1,4 @@
+/usr/bin/stlink-gui
+/usr/share/applications/stlink-gui.desktop
+/usr/share/icons/hicolor/scalable/apps/stlink-gui.svg
+/usr/share/stlink/stlink-gui.ui

debian/stlink-lib-dev.install

@@ -0,0 +1,5 @@
+usr/include/*
+usr/lib/*/lib*.a
+usr/lib/*/pkgconfig/*
+usr/lib/*/lib*.so
+

debian/stlink-lib.install

@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*