Updated debian pkg config for distribution

10 files changed, 28 insertions, 158 deletions

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 <andrew@ncrmnt.org>
+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 <agpanarin@gmail.com>
-           2011-2018 Alexey Cherevatenko <alecher@mail.ru>
-           2011-2018 Anatoli <dev@26th.net>
-           2011-2018 Andrea Mucignat <andrea@zulusw.com>
-           2011-2018 Andrew 'Necromant' Andrianov <andrew@ncrmnt.org>
-           2011-2018 Andrey Yurovsky <yurovsky@gmail.com>
-           2011-2018 Andy Isaacson <adi@onbeep.com>
-           2011-2018 Áron RADICS <raronkonektor@gmail.com>
-           2011-2018 A Sheaff <sheaff@traveler.eece.maine.edu>
-           2011-2018 Björn Hauffe <hauffe@gmail.com>
-           2011-2018 bob <bob@eleks.com>
-           2011-2018 Breton M. Saunders <bms20@camvine.com>
-           2011-2018 Bruno Dal Bo <bruno.dalbo@hp.com>
-           2011-2018 Burns <burns@fisher.cc>
-           2011-2018 Chris Dew <cmsdew@gmail.com>
-           2011-2018 Chris Hiszpanski <chiszp@gmail.com>
-           2011-2018 Chris Li <chris@tpx.lan>
-           2011-2018 Chris Samuelson <csamuelson@swingpal.com>
-           2011-2018 Christophe Levantis <Christophe.Levantis@cyantechnology.com>
-           2011-2018 Craig Lilley <cralilley@gmail.com>
-           2011-2018 dandev37 <dandev37@gmail.com>
-           2011-2018 Dan Hepler <dan.hepler@bionic-power.com>
-           2011-2018 Daniel Campoverde [alx741] <alx@sillybytes.net>
-           2011-2018 Daniel O'Connor <doconnor@gsoft.com.au>
-           2011-2018 Dave Flogeras <dflogeras@gmail.com>
-           2011-2018 Dave Murphy <davem@devkitpro.org>
-           2011-2018 Dave Vandervies <dj3vande@terse.ca>
-           2011-2018 Denis Fokin <foks.ua@gmail.com>
-           2011-2018 Denis Osterland <Denis.Osterland@diehl.com>
-           2011-2018 Dmitry Bravikov <bravikov@gmail.com>
-           2011-2018 Efe Can İçöz <efe@debian>
-           2011-2018 Ethan Zonca <ez@ethanzonca.com>
-           2011-2018 Fabien Chouteau <chouteau@adacore.com>
-           2011-2018 Fabien Le Mentec <texane@gmail.com>
-           2011-2018 fhars <fh+github@hars.de>
-           2011-2018 Friedrich Beckmann <friedrich.beckmann@gmx.de>
-           2011-2018 Geoffrey Brown <geoffreymbrown@gmail.com>
-           2011-2018 George Talusan <george.talusan@gmail.com>
-           2011-2018 Georg von Zengen <vonzengen@ibr.cs.tu-bs.de>
-           2011-2018 giuseppe barba <giuseppe.barba@gmail.com>
-           2011-2018 Greg Alexander <gitgreg@galexander.org>
-           2011-2018 Greg Meiste <w30289@motorola.com>
-           2011-2018 Hakkavélin <hakkavelin@braudrist.lan>
-           2011-2018 htk <htk@vdr.fritz.box>
-           2011-2018 Ian Griffiths <6thimage@gmail.com>
-           2011-2018 Jack Peel <jack.peel@synapse.com>
-           2011-2018 Jakub Tyszkowski <tyszja@gmail.com>
-           2011-2018 Jan Sarenik <janko@Lomidrevo.local>
-           2011-2018 Jean-Luc Béchennec <Jean-Luc.Bechennec@irccyn.ec-nantes.fr>
-           2011-2018 Jean-Marie Lemetayer <jeanmarie.lemetayer@gmail.com>
-           2011-2018 Jeff Kent <jakent@gmail.com>
-           2011-2018 Jeffrey Nelson <nelsonjm@macpod.net>
-           2011-2018 Jens Hoffmann <jehoffma@gmail.com>
-           2011-2018 Jerome Lambourg <lambourg@adacore.com>
-           2011-2018 Jerry Jacobs <jerry.jacobs@xor-gate.org>
-           2011-2018 Jim Paris <jim@jtan.com>
-           2011-2018 Jiří Netolický <netolicky@epos.cd.cz>
-           2011-2018 jnosky <codegrinder69@hotmail.com>
-           2011-2018 jnosky <Jerry@CGS_Office.(none)>
-           2011-2018 JohannesTaelman <johannes.taelman@gmail.com>
-           2011-2018 Jonas Danielsson <jonas.danielsson@lundinova.se>
-           2011-2018 Jonas Norling <jonas.norling@gmail.com>
-           2011-2018 Josh Bialkowski <josh@skyd.io>
-           2011-2018 Karl Palsson <karlp@tweak.net.au>
-           2011-2018 kevin <software@klystron.com>
-           2011-2018 Kyle Manna <kyle@kylemanna.com>
-           2011-2018 Lari Lehtomäki <lari@lehtomaki.fi>
-           2011-2018 le mentec fabien <fabien.lementec@imag.fr>
-           2011-2018 Martin Nowak <code@dawg.eu>
-           2011-2018 Matteo Collina <matteo.collina@gmail.com>
-           2011-2018 Max Chen <trlsmax@gmail.com>
-           2011-2018 Maxime Coquelin <mcoquelin.stm32@gmail.com>
-           2011-2018 Maxime Vincent <maxime.vincent@tass.be>
-           2011-2018 Michael Pratt <michael@pratt.im>
-           2011-2018 Michael Sparmann <theseven@gmx.net>
-           2011-2018 Mike Szczys <mike@jumptuck.com>
-           2011-2018 mlundinse <lundin@mlu.mine.nu>
-           2011-2018 mux <freelancer.c@gmail.com>
-           2011-2018 Ned Konz <ned@bike-nomad.com>
-           2011-2018 Nic McDonald <n.mcdonald83@gmail.com>
-           2011-2018 Nicolas Schodet <nico@ni.fr.eu.org>
-           2011-2018 Nikolay <halt.hammerzeit.at@gmail.com>
-           2011-2018 nullsub <chrisudeussen@gmail.com>
-           2011-2018 Olivier Croquette <olivier.croquette@nanotec.de>
-           2011-2018 Olivier Gay <ogay@logitech.com>
-           2011-2018 Onno Kortmann <onno@gmx.net>
-           2011-2018 orangeudav <orangeudav@gmail.com>
-           2011-2018 Pavel Kirienko <pavel.kirienko@gmail.com>
-           2011-2018 Pekka Nikander <pekka.nikander@senseg.com>
-           2011-2018 Pete <petiepooo@gmail.com>
-           2011-2018 Peter Zotov <whitequark@whitequark.org>
-           2011-2018 Petteri Aimonen <jpa@git.mail.kapsi.fi>
-           2011-2018 Piotr Haber <gluedig@gmail.com>
-           2011-2018 Rene Hopf <renehopf@mac.com>
-           2011-2018 Robin Kreis <r.kreis@uni-bremen.de>
-           2011-2018 Rob Spanton <rspanton@zepler.net>
-           2011-2018 Rytis Karpuska <rytis.karpuska@gmail.com>
-           2011-2018 Sean Simmons <sean.b.simmons@gmail.com>
-           2011-2018 Sergey Alirzaev <zl29ah@gmail.com>
-           2011-2018 Simon Wright <simon@pushface.org>
-           2011-2018 Stany MARCEL <stanypub@gmail.com>
-           2011-2018 Stefan Misik <mail@stefanmisik.eu>
-           2011-2018 Sven Wegener <sven.wegener@stealer.net>
-           2011-2018 Tectu <joel@unormal.org>
-           2011-2018 tekaikko <tuomo.kaikkonen@iki.fi>
-           2011-2018 texane <texane@gmail.com>
-           2011-2018 Theodore A. Roth <troth@openavr.org>
-           2011-2018 Thomas Gärtner <der@thotsch.com>
-           2011-2018 Tobias Badertscher <python@baerospace.ch>
-           2011-2018 Tom de Boer <tom@tomdeboer.nl>
-           2011-2018 Tristan Gingold <gingold@adacore.com>
-           2011-2018 Uli Köhler <ulikoehler@online.de>
-           2011-2018 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
-           2011-2018 Vadim Kaushan <admin@disasm.info>
-           2011-2018 Vegard Storheil Eriksen <zyp@jvnv.net>
-           2011-2018 Viacheslav Dobromyslov <viacheslav@dobromyslov.ru>
-           2011-2018 Victor Mayoral Vilches <v.mayoralv@gmail.com>
-           2011-2018 Wojciech A. Koszek <wkoszek@freebsd.czest.pl>
-           2011-2018 Woodrow Douglass <wdouglass@carnegierobotics.com>
-           2011-2018 The "Capt'ns Missing Link" Authors.
+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
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
index 0c3543c..0c3543c 100644
--- a/debian/libstlink-dev.install
+++ b/debian/stlink-lib-dev.install
diff --git a/debian/libstlink1.install b/debian/stlink-lib.install
index 3ddde58..3ddde58 100644
--- a/debian/libstlink1.install
+++ b/debian/stlink-lib.install
diff --git a/debian/libstlink1.symbols b/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)