Updated debian pkg config for distribution

debian/.gitignore

@@ -1,8 +1,8 @@
 .debhelper
-files
-debhelper-build-stamp
 *.log
 *.substvars
+debhelper-build-stamp
+files
 libstlink-dev
 libstlink
 stlink-gui

debian/control

@@ -9,44 +9,40 @@ 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
+Package: stlink-lib-dev
 Section: libdevel
 Architecture: linux-any
 Multi-Arch: same
-Depends: libstlink1 (= ${binary:Version}), ${misc:Depends}
-Description: OpenSource ST-Link tools replacement.
- Flashing tools for STMicroelectronics STM32VL and STM32L. The transport layers
- STLINKv1 and STLINKv2 are supported.
+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 the development files for stlink.
+ This package contains development files for stlink.
 
-Package: libstlink1
+Package: stlink-lib
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenSource ST-Link tools replacement.
- Flashing tools for STMicroelectronics STM32VL and STM32L. The transport layers
- STLINKv1 and STLINKv2 are supported.
+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: libstlink1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: OpenSource ST-Link tools replacement.
- Flashing tools for STMicroelectronics STM32VL and STM32L. The transport layers
- STLINKv1 and STLINKv2 are supported.
+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, and modprobe and
- udev rules.
+ This package contains commandline utilities for stlink, as well as modprobe
+ and udev rules.
 
 Package: stlink-gui
 Architecture: linux-any
-Depends: libstlink1 (= ${binary:Version}), stlink-tools (= ${binary:Version}),
+Depends: stlink-lib (= ${binary:Version}), stlink-tools (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
-Description: OpenSource ST-Link tools replacement.
- Flashing tools for STMicroelectronics STM32VL and STM32L. The transport layers
- STLINKv1 and STLINKv2 are supported.
+Description: Open source version of the STMicroelectronics STLINK Tools
  .
  This package contains a GUI tool for stlink.

debian/copyright

@@ -1,132 +1,18 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: stlink
-Upstream-Contact: Andrew 'Necromant' Andrianov <[email protected]>
+Upstream-Contact: Nightwalker-87 <[email protected]>
 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-2018 agpanarin <[email protected]>
-           2011-2018 Alexey Cherevatenko <[email protected]>
-           2011-2018 Anatoli <[email protected]>
-           2011-2018 Andrea Mucignat <[email protected]>
-           2011-2018 Andrew 'Necromant' Andrianov <[email protected]>
-           2011-2018 Andrey Yurovsky <[email protected]>
-           2011-2018 Andy Isaacson <[email protected]>
-           2011-2018 Áron RADICS <[email protected]>
-           2011-2018 A Sheaff <[email protected]>
-           2011-2018 Björn Hauffe <[email protected]>
-           2011-2018 bob <[email protected]>
-           2011-2018 Breton M. Saunders <[email protected]>
-           2011-2018 Bruno Dal Bo <[email protected]>
-           2011-2018 Burns <[email protected]>
-           2011-2018 Chris Dew <[email protected]>
-           2011-2018 Chris Hiszpanski <[email protected]>
-           2011-2018 Chris Li <[email protected]>
-           2011-2018 Chris Samuelson <[email protected]>
-           2011-2018 Christophe Levantis <[email protected]>
-           2011-2018 Craig Lilley <[email protected]>
-           2011-2018 dandev37 <[email protected]>
-           2011-2018 Dan Hepler <[email protected]>
-           2011-2018 Daniel Campoverde [alx741] <[email protected]>
-           2011-2018 Daniel O'Connor <[email protected]>
-           2011-2018 Dave Flogeras <[email protected]>
-           2011-2018 Dave Murphy <[email protected]>
-           2011-2018 Dave Vandervies <[email protected]>
-           2011-2018 Denis Fokin <[email protected]>
-           2011-2018 Denis Osterland <[email protected]>
-           2011-2018 Dmitry Bravikov <[email protected]>
-           2011-2018 Efe Can İçöz <efe@debian>
-           2011-2018 Ethan Zonca <[email protected]>
-           2011-2018 Fabien Chouteau <[email protected]>
-           2011-2018 Fabien Le Mentec <[email protected]>
-           2011-2018 fhars <[email protected]>
-           2011-2018 Friedrich Beckmann <[email protected]>
-           2011-2018 Geoffrey Brown <[email protected]>
-           2011-2018 George Talusan <[email protected]>
-           2011-2018 Georg von Zengen <[email protected]>
-           2011-2018 giuseppe barba <[email protected]>
-           2011-2018 Greg Alexander <[email protected]>
-           2011-2018 Greg Meiste <[email protected]>
-           2011-2018 Hakkavélin <[email protected]>
-           2011-2018 htk <[email protected]>
-           2011-2018 Ian Griffiths <[email protected]>
-           2011-2018 Jack Peel <[email protected]>
-           2011-2018 Jakub Tyszkowski <[email protected]>
-           2011-2018 Jan Sarenik <[email protected]>
-           2011-2018 Jean-Luc Béchennec <[email protected]>
-           2011-2018 Jean-Marie Lemetayer <[email protected]>
-           2011-2018 Jeff Kent <[email protected]>
-           2011-2018 Jeffrey Nelson <[email protected]>
-           2011-2018 Jens Hoffmann <[email protected]>
-           2011-2018 Jerome Lambourg <[email protected]>
-           2011-2018 Jerry Jacobs <[email protected]>
-           2011-2018 Jim Paris <[email protected]>
-           2011-2018 Jiří Netolický <[email protected]>
-           2011-2018 jnosky <[email protected]>
-           2011-2018 jnosky <Jerry@CGS_Office.(none)>
-           2011-2018 JohannesTaelman <[email protected]>
-           2011-2018 Jonas Danielsson <[email protected]>
-           2011-2018 Jonas Norling <[email protected]>
-           2011-2018 Josh Bialkowski <[email protected]>
-           2011-2018 Karl Palsson <[email protected]>
-           2011-2018 kevin <[email protected]>
-           2011-2018 Kyle Manna <[email protected]>
-           2011-2018 Lari Lehtomäki <[email protected]>
-           2011-2018 le mentec fabien <[email protected]>
-           2011-2018 Martin Nowak <[email protected]>
-           2011-2018 Matteo Collina <[email protected]>
-           2011-2018 Max Chen <[email protected]>
-           2011-2018 Maxime Coquelin <[email protected]>
-           2011-2018 Maxime Vincent <[email protected]>
-           2011-2018 Michael Pratt <[email protected]>
-           2011-2018 Michael Sparmann <[email protected]>
-           2011-2018 Mike Szczys <[email protected]>
-           2011-2018 mlundinse <[email protected]>
-           2011-2018 mux <[email protected]>
-           2011-2018 Ned Konz <[email protected]>
-           2011-2018 Nic McDonald <[email protected]>
-           2011-2018 Nicolas Schodet <[email protected]>
-           2011-2018 Nikolay <[email protected]>
-           2011-2018 nullsub <[email protected]>
-           2011-2018 Olivier Croquette <[email protected]>
-           2011-2018 Olivier Gay <[email protected]>
-           2011-2018 Onno Kortmann <[email protected]>
-           2011-2018 orangeudav <[email protected]>
-           2011-2018 Pavel Kirienko <[email protected]>
-           2011-2018 Pekka Nikander <[email protected]>
-           2011-2018 Pete <[email protected]>
-           2011-2018 Peter Zotov <[email protected]>
-           2011-2018 Petteri Aimonen <[email protected]>
-           2011-2018 Piotr Haber <[email protected]>
-           2011-2018 Rene Hopf <[email protected]>
-           2011-2018 Robin Kreis <[email protected]>
-           2011-2018 Rob Spanton <[email protected]>
-           2011-2018 Rytis Karpuska <[email protected]>
-           2011-2018 Sean Simmons <[email protected]>
-           2011-2018 Sergey Alirzaev <[email protected]>
-           2011-2018 Simon Wright <[email protected]>
-           2011-2018 Stany MARCEL <[email protected]>
-           2011-2018 Stefan Misik <[email protected]>
-           2011-2018 Sven Wegener <[email protected]>
-           2011-2018 Tectu <[email protected]>
-           2011-2018 tekaikko <[email protected]>
-           2011-2018 texane <[email protected]>
-           2011-2018 Theodore A. Roth <[email protected]>
-           2011-2018 Thomas Gärtner <[email protected]>
-           2011-2018 Tobias Badertscher <[email protected]>
-           2011-2018 Tom de Boer <[email protected]>
-           2011-2018 Tristan Gingold <[email protected]>
-           2011-2018 Uli Köhler <[email protected]>
-           2011-2018 Uwe Bonnes <[email protected]>
-           2011-2018 Vadim Kaushan <[email protected]>
-           2011-2018 Vegard Storheil Eriksen <[email protected]>
-           2011-2018 Viacheslav Dobromyslov <[email protected]>
-           2011-2018 Victor Mayoral Vilches <[email protected]>
-           2011-2018 Wojciech A. Koszek <[email protected]>
-           2011-2018 Woodrow Douglass <[email protected]>
-           2011-2018 The "Capt'ns Missing Link" Authors.
+Copyright: 2011-2021 The stlink project maintainers
+           Martin Capitanio <[email protected]>
+           Fabien Lementec <[email protected]>
+           Jerry Jacobs <[email protected]>
+           Nightwalker-87 <[email protected]>
+           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

debian/libstlink1.symbols → debian/stlink-lib.symbols

@@ -1,4 +1,4 @@
-libstlink.so.1 libstlink1 #MINVER#
+stlink-lib.so.1 stlink-lib #MINVER#
  Md5Calculate@Base 1.6.1
  Md5Finalise@Base 1.6.1
  Md5Initialise@Base 1.6.1

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

src/stlink-gui/CMakeLists.txt

@@ -2,7 +2,7 @@
 # Build GUI
 ###
 
-if (NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
+if (NOT WIN32)
     find_package(PkgConfig)
     pkg_check_modules(GTK3 gtk+-3.0)