Merge pull request #1004 from stlink-org/debian

Corrected file paths and settings for Debian package distribution

cmake/packaging/deb/changelog

@@ -1,5 +1,5 @@
-stlink (1.6.1+ds-1) unstable; urgency=medium
+stlink (1.6.1) unstable; urgency=medium
 
   * Initial cpack-based package release for Debian/Ubuntu
 
- -- Nightwalker-87 <stlink-org>  Sat, 06 Jun 2020 00:00:00 +0100
+ -- Nightwalker-87 <stlink-org>  Mon, 01 Jun 2020 00:00:00 +0100

cmake/packaging/deb/control

@@ -1,9 +1,10 @@
 Source: stlink
+Priority: optional
 Maintainer: stlink-org
 Build-Depends: cmake, dh-cmake, debhelper (>= 9), libusb-1.0-0-dev, libgtk-3-dev
 Standards-Version: 4.5.0
+Rules-Requires-Root: no
 Section: electronics
-Priority: optional
 Homepage: https://github.com/stlink-org/stlink
 Vcs-Git: https://github.com/stlink-org/stlink.git
 Vcs-Browser: https://github.com/stlink-org/stlink

cmake/packaging/deb/copyright

@@ -1,7 +1,8 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: stlink
-Upstream-Contact: stlink-org
+Upstream-Contact: Nightwalker-87 <stlink-org>
 Source: https://github.com/stlink-org/stlink
+Files-Excluded: stlinkv1_macos_driver
 
 Files: *
 Copyright: 2011-2020 stlink-org
@@ -10,7 +11,7 @@ Copyright: 2011-2020 stlink-org
     Jerry Jacobs [xor-gate]
     [Nightwalker-87]
     and many others...
-    A list of contributors can be found in "contributors.txt".
+    An extended list of contributors can be found in "contributors.txt".
 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:

debian/.gitignore

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

debian/changelog

@@ -0,0 +1,74 @@
+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/stlink-org/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.4.0) unstable; urgency=low
+
+ -- Andrew 'Necromant' Andrianov <andrew@ncrmnt.org>  Sat, 01 Jul 2017 00:00:00 +0000
+
+stlink (1.3.1) unstable; urgency=low
+
+ -- Andrew 'Necromant' Andrianov <andrew@ncrmnt.org>  Sat, 25 Feb 2017 00:00:00 +0000
+
+stlink (1.3.0) unstable; urgency=low
+
+ -- Andrew 'Necromant' Andrianov <andrew@ncrmnt.org>  Sat, 28 Jan 2017 00:00:00 +0000
+
+stlink (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,44 @@
+Source: stlink
+Priority: optional
+Maintainer: Luca Boccassi <bluca@debian.org>
+Build-Depends: debhelper-compat (= 12), cmake (>= 3.4.2), libusb-1.0-0-dev, libgtk-3-dev
+Standards-Version: 4.5.0
+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: libstlink-dev
+Section: libdevel
+Architecture: linux-any
+Multi-Arch: same
+Depends: libstlink1 (= ${binary:Version}), ${misc:Depends}
+Description: Open source STM32 MCU programming toolset.
+ .
+ This package contains the development files for stlink.
+
+Package: libstlink1
+Section: libs
+Architecture: linux-any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Open source STM32 MCU programming toolset.
+ .
+ This package contains the shared library for stlink.
+
+Package: stlink-tools
+Architecture: linux-any
+Depends: libstlink1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: Open source STM32 MCU programming toolset.
+ .
+ This package contains commandline utilities for stlink, modprobe- and
+ udev-rules.
+
+Package: stlink-gui
+Architecture: linux-any
+Depends: libstlink1 (= ${binary:Version}), stlink-tools (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Description: Open source STM32 MCU programming toolset.
+ .
+ This package contains a GUI for stlink.

debian/copyright

@@ -0,0 +1,37 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: stlink
+Upstream-Contact: Luca Boccassi <bluca@debian.org>
+Source: https://github.com/stlink-org/stlink
+Files-Excluded: stlinkv1_macos_driver
+
+Files: *
+Copyright: 2011-2020 stlink-org
+    Martin Capitanio [capnm]
+    Fabien Le Mentec [texane]
+    Jerry Jacobs [xor-gate]
+    [Nightwalker-87]
+    and many others...
+    An extended list of contributors can be found in "contributors.txt".
+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:
+    .
+    1. Redistributions of source code must retain the above copyright notice, this
+       list of conditions and the following disclaimer.
+    2. 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.
+    3. Neither the name of the copyright holder 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 HOLDER 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/libstlink-dev.install

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

debian/libstlink1.install

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

debian/libstlink1.symbols

@@ -0,0 +1,141 @@
+libstlink.so.1 libstlink1 #MINVER#
+ Md5Calculate@Base 1.6.1
+ Md5Finalise@Base 1.6.1
+ Md5Initialise@Base 1.6.1
+ Md5Update@Base 1.6.1
+ _parse_version@Base 1.5.0
+ _stlink_sg_close@Base 1.5.0
+ _stlink_sg_core_id@Base 1.5.0
+ _stlink_sg_current_mode@Base 1.5.0
+ _stlink_sg_enter_jtag_mode@Base 1.5.0
+ _stlink_sg_enter_swd_mode@Base 1.5.0
+ _stlink_sg_exit_debug_mode@Base 1.5.0
+ _stlink_sg_exit_dfu_mode@Base 1.5.0
+ _stlink_sg_force_debug@Base 1.5.0
+ _stlink_sg_jtag_reset@Base 1.5.0
+ _stlink_sg_read_all_regs@Base 1.5.0
+ _stlink_sg_read_debug32@Base 1.5.0
+ _stlink_sg_read_mem32@Base 1.5.0
+ _stlink_sg_read_reg@Base 1.5.0
+ _stlink_sg_reset@Base 1.5.0
+ _stlink_sg_run@Base 1.5.0
+ _stlink_sg_status@Base 1.5.0
+ _stlink_sg_step@Base 1.5.0
+ _stlink_sg_version@Base 1.5.0
+ _stlink_sg_write_debug32@Base 1.5.0
+ _stlink_sg_write_mem32@Base 1.5.0
+ _stlink_sg_write_mem8@Base 1.5.0
+ _stlink_sg_write_reg@Base 1.5.0
+ _stlink_usb_close@Base 1.5.0
+ _stlink_usb_core_id@Base 1.5.0
+ _stlink_usb_current_mode@Base 1.5.0
+ _stlink_usb_enter_swd_mode@Base 1.5.0
+ _stlink_usb_exit_debug_mode@Base 1.5.0
+ _stlink_usb_exit_dfu_mode@Base 1.5.0
+ _stlink_usb_force_debug@Base 1.5.0
+ _stlink_usb_get_rw_status@Base 1.6.1
+ _stlink_usb_jtag_reset@Base 1.5.0
+ _stlink_usb_read_all_regs@Base 1.5.0
+ _stlink_usb_read_all_unsupported_regs@Base 1.5.0
+ _stlink_usb_read_debug32@Base 1.5.0
+ _stlink_usb_read_mem32@Base 1.5.0
+ _stlink_usb_read_reg@Base 1.5.0
+ _stlink_usb_read_unsupported_reg@Base 1.5.0
+ _stlink_usb_reset@Base 1.5.0
+ _stlink_usb_run@Base 1.5.0
+ _stlink_usb_set_swdclk@Base 1.5.0
+ _stlink_usb_status@Base 1.5.0
+ _stlink_usb_status_v2@Base 1.6.1
+ _stlink_usb_step@Base 1.5.0
+ _stlink_usb_target_voltage@Base 1.5.0
+ _stlink_usb_version@Base 1.5.0
+ _stlink_usb_write_debug32@Base 1.5.0
+ _stlink_usb_write_mem32@Base 1.5.0
+ _stlink_usb_write_mem8@Base 1.5.0
+ _stlink_usb_write_reg@Base 1.5.0
+ _stlink_usb_write_unsupported_reg@Base 1.5.0
+ calculate_F4_sectornum@Base 1.5.0
+ calculate_F7_sectornum@Base 1.5.0
+ calculate_L4_page@Base 1.5.0
+ is_bigendian@Base 1.5.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_chip_id@Base 1.5.0
+ stlink_chipid_get_params@Base 1.5.0
+ stlink_close@Base 1.5.0
+ stlink_clr_hw_bp@Base 1.5.0
+ stlink_core_id@Base 1.5.0
+ stlink_core_stat@Base 1.5.0
+ stlink_cpu_id@Base 1.5.0
+ stlink_current_mode@Base 1.5.0
+ 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_exit_debug_mode@Base 1.5.0
+ stlink_exit_dfu_mode@Base 1.5.0
+ stlink_fcheck_flash@Base 1.5.0
+ stlink_flash_loader_init@Base 1.5.0
+ stlink_flash_loader_run@Base 1.5.0
+ stlink_flash_loader_write_to_sram@Base 1.5.0
+ stlink_force_debug@Base 1.5.0
+ stlink_fread@Base 1.5.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
+ stlink_fwrite_sram@Base 1.5.0
+ stlink_get_erased_pattern@Base 1.5.0
+ stlink_is_core_halted@Base 1.5.0
+ stlink_jtag_reset@Base 1.5.0
+ stlink_load_device_params@Base 1.5.0
+ stlink_mwrite_flash@Base 1.5.0
+ stlink_mwrite_sram@Base 1.5.0
+ stlink_open_usb@Base 1.5.0
+ stlink_parse_ihex@Base 1.5.0
+ stlink_print_data@Base 1.5.0
+ stlink_probe_usb@Base 1.5.0
+ stlink_probe_usb_free@Base 1.5.0
+ stlink_q@Base 1.5.0
+ stlink_read_all_regs@Base 1.5.0
+ stlink_read_all_unsupported_regs@Base 1.5.0
+ 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
+ stlink_read_option_bytes_f2@Base 1.6.0
+ stlink_read_option_bytes_f4@Base 1.6.0
+ stlink_read_option_bytes_generic@Base 1.6.1
+ stlink_read_reg@Base 1.5.0
+ stlink_read_unsupported_reg@Base 1.5.0
+ stlink_reset@Base 1.5.0
+ stlink_run@Base 1.5.0
+ stlink_run_at@Base 1.5.0
+ stlink_set_hw_bp@Base 1.5.0
+ stlink_set_swdclk@Base 1.5.0
+ stlink_stat@Base 1.5.0
+ stlink_status@Base 1.5.0
+ stlink_step@Base 1.5.0
+ stlink_target_voltage@Base 1.5.0
+ stlink_v1_open@Base 1.5.0
+ stlink_v1_open_inner@Base 1.5.0
+ stlink_verify_write_flash@Base 1.5.0
+ stlink_version@Base 1.5.0
+ stlink_write_debug32@Base 1.5.0
+ stlink_write_dreg@Base 1.5.0
+ stlink_write_flash@Base 1.5.0
+ stlink_write_mem32@Base 1.5.0
+ stlink_write_mem8@Base 1.5.0
+ stlink_write_option_bytes32@Base 1.6.1
+ stlink_write_option_bytes@Base 1.6.0
+ stlink_write_reg@Base 1.5.0
+ stlink_write_unsupported_reg@Base 1.5.0
+ stm32l1_write_half_pages@Base 1.5.0
+ ugly_init@Base 1.5.0
+ ugly_libusb_log_level@Base 1.6.1
+ ugly_log@Base 1.5.0
+ write_buffer_to_sram@Base 1.5.0
+ write_uint16@Base 1.5.0
+ write_uint32@Base 1.5.0

debian/patches/guipath.patch

@@ -0,0 +1,11 @@
+--- a/src/stlink-gui/CMakeLists.txt
++++ b/src/stlink-gui/CMakeLists.txt
+@@ -32,7 +32,7 @@
+         add_executable(stlink-gui ${GUI_SOURCES})
+         install(FILES stlink-gui.ui DESTINATION ${CMAKE_INSTALL_BINDIR})
+         set_target_properties(stlink-gui PROPERTIES
+-                COMPILE_DEFINITIONS STLINK_UI_DIR="${CMAKE_INSTALL_PREFIX}/bin")
++                COMPILE_DEFINITIONS STLINK_UI_DIR="/usr/share/stlink")
+         target_link_libraries(stlink-gui ${STLINK_LIB_SHARED} ${SSP_LIB} ${GTK3_LDFLAGS})
+         install(TARGETS stlink-gui DESTINATION ${CMAKE_INSTALL_BINDIR})
+

debian/patches/series

@@ -0,0 +1 @@
+guipath.patch