From e662da00ca294c874655c65cffae3edde97343e5 Mon Sep 17 00:00:00 2001 From: nightwalker-87 <15526941+Nightwalker-87@users.noreply.github.com> Date: Sun, 22 Aug 2021 12:44:01 +0200 Subject: [PATCH] Updated debian pkg config for distribution --- debian/.gitignore | 4 +- debian/control | 36 +++-- debian/copyright | 128 +----------------- debian/patches/cross.patch | 11 -- debian/patches/series | 1 - ...ink-dev.install => stlink-lib-dev.install} | 0 ...{libstlink1.install => stlink-lib.install} | 0 ...{libstlink1.symbols => stlink-lib.symbols} | 2 +- debian/stlink.pc.in | 2 +- src/stlink-gui/CMakeLists.txt | 2 +- 10 files changed, 28 insertions(+), 158 deletions(-) delete mode 100644 debian/patches/cross.patch delete mode 100644 debian/patches/series rename debian/{libstlink-dev.install => stlink-lib-dev.install} (100%) rename debian/{libstlink1.install => stlink-lib.install} (100%) rename debian/{libstlink1.symbols => stlink-lib.symbols} (99%) diff --git a/debian/.gitignore b/debian/.gitignore index 7624d1c..6531851 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,8 +1,8 @@ .debhelper -files -debhelper-build-stamp *.log *.substvars +debhelper-build-stamp +files libstlink-dev libstlink stlink-gui diff --git a/debian/control b/debian/control index faed030..c3e654e 100644 --- a/debian/control +++ b/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. diff --git a/debian/copyright b/debian/copyright index 1a0febd..b7f9c31 100644 --- a/debian/copyright +++ b/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 +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-2018 agpanarin - 2011-2018 Alexey Cherevatenko - 2011-2018 Anatoli - 2011-2018 Andrea Mucignat - 2011-2018 Andrew 'Necromant' Andrianov - 2011-2018 Andrey Yurovsky - 2011-2018 Andy Isaacson - 2011-2018 Áron RADICS - 2011-2018 A Sheaff - 2011-2018 Björn Hauffe - 2011-2018 bob - 2011-2018 Breton M. Saunders - 2011-2018 Bruno Dal Bo - 2011-2018 Burns - 2011-2018 Chris Dew - 2011-2018 Chris Hiszpanski - 2011-2018 Chris Li - 2011-2018 Chris Samuelson - 2011-2018 Christophe Levantis - 2011-2018 Craig Lilley - 2011-2018 dandev37 - 2011-2018 Dan Hepler - 2011-2018 Daniel Campoverde [alx741] - 2011-2018 Daniel O'Connor - 2011-2018 Dave Flogeras - 2011-2018 Dave Murphy - 2011-2018 Dave Vandervies - 2011-2018 Denis Fokin - 2011-2018 Denis Osterland - 2011-2018 Dmitry Bravikov - 2011-2018 Efe Can İçöz - 2011-2018 Ethan Zonca - 2011-2018 Fabien Chouteau - 2011-2018 Fabien Le Mentec - 2011-2018 fhars - 2011-2018 Friedrich Beckmann - 2011-2018 Geoffrey Brown - 2011-2018 George Talusan - 2011-2018 Georg von Zengen - 2011-2018 giuseppe barba - 2011-2018 Greg Alexander - 2011-2018 Greg Meiste - 2011-2018 Hakkavélin - 2011-2018 htk - 2011-2018 Ian Griffiths <6thimage@gmail.com> - 2011-2018 Jack Peel - 2011-2018 Jakub Tyszkowski - 2011-2018 Jan Sarenik - 2011-2018 Jean-Luc Béchennec - 2011-2018 Jean-Marie Lemetayer - 2011-2018 Jeff Kent - 2011-2018 Jeffrey Nelson - 2011-2018 Jens Hoffmann - 2011-2018 Jerome Lambourg - 2011-2018 Jerry Jacobs - 2011-2018 Jim Paris - 2011-2018 Jiří Netolický - 2011-2018 jnosky - 2011-2018 jnosky - 2011-2018 JohannesTaelman - 2011-2018 Jonas Danielsson - 2011-2018 Jonas Norling - 2011-2018 Josh Bialkowski - 2011-2018 Karl Palsson - 2011-2018 kevin - 2011-2018 Kyle Manna - 2011-2018 Lari Lehtomäki - 2011-2018 le mentec fabien - 2011-2018 Martin Nowak - 2011-2018 Matteo Collina - 2011-2018 Max Chen - 2011-2018 Maxime Coquelin - 2011-2018 Maxime Vincent - 2011-2018 Michael Pratt - 2011-2018 Michael Sparmann - 2011-2018 Mike Szczys - 2011-2018 mlundinse - 2011-2018 mux - 2011-2018 Ned Konz - 2011-2018 Nic McDonald - 2011-2018 Nicolas Schodet - 2011-2018 Nikolay - 2011-2018 nullsub - 2011-2018 Olivier Croquette - 2011-2018 Olivier Gay - 2011-2018 Onno Kortmann - 2011-2018 orangeudav - 2011-2018 Pavel Kirienko - 2011-2018 Pekka Nikander - 2011-2018 Pete - 2011-2018 Peter Zotov - 2011-2018 Petteri Aimonen - 2011-2018 Piotr Haber - 2011-2018 Rene Hopf - 2011-2018 Robin Kreis - 2011-2018 Rob Spanton - 2011-2018 Rytis Karpuska - 2011-2018 Sean Simmons - 2011-2018 Sergey Alirzaev - 2011-2018 Simon Wright - 2011-2018 Stany MARCEL - 2011-2018 Stefan Misik - 2011-2018 Sven Wegener - 2011-2018 Tectu - 2011-2018 tekaikko - 2011-2018 texane - 2011-2018 Theodore A. Roth - 2011-2018 Thomas Gärtner - 2011-2018 Tobias Badertscher - 2011-2018 Tom de Boer - 2011-2018 Tristan Gingold - 2011-2018 Uli Köhler - 2011-2018 Uwe Bonnes - 2011-2018 Vadim Kaushan - 2011-2018 Vegard Storheil Eriksen - 2011-2018 Viacheslav Dobromyslov - 2011-2018 Victor Mayoral Vilches - 2011-2018 Wojciech A. Koszek - 2011-2018 Woodrow Douglass - 2011-2018 The "Capt'ns Missing Link" Authors. +Copyright: 2011-2021 The stlink project maintainers + Martin Capitanio + Fabien Lementec + Jerry Jacobs + 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 diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch deleted file mode 100644 index d55e9f9..0000000 --- a/debian/patches/cross.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/stlink-gui/CMakeLists.txt -+++ b/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) - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index def274a..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -cross.patch diff --git a/debian/libstlink-dev.install b/debian/stlink-lib-dev.install similarity index 100% rename from debian/libstlink-dev.install rename to debian/stlink-lib-dev.install diff --git a/debian/libstlink1.install b/debian/stlink-lib.install similarity index 100% rename from debian/libstlink1.install rename to debian/stlink-lib.install diff --git a/debian/libstlink1.symbols b/debian/stlink-lib.symbols similarity index 99% rename from debian/libstlink1.symbols rename to debian/stlink-lib.symbols index bc4e62f..9fb371d 100644 --- a/debian/libstlink1.symbols +++ b/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 diff --git a/debian/stlink.pc.in b/debian/stlink.pc.in index 7fde2d9..b5f994b 100644 --- a/debian/stlink.pc.in +++ b/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 diff --git a/src/stlink-gui/CMakeLists.txt b/src/stlink-gui/CMakeLists.txt index 22a22f5..80e3762 100644 --- a/src/stlink-gui/CMakeLists.txt +++ b/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)