From: Keith Packard Date: Tue, 24 Nov 2015 05:09:58 +0000 (-0800) Subject: Merge branch 'upstream' into debian X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=9a1b32d9f7b2a15263428dc757fc3ac052736a22;hp=f290f65c7473f73a5672c332a5a04432a2db8dbb;p=fw%2Fstlink Merge branch 'upstream' into debian --- diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..7cafa00 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,7 @@ +stlink for Debian +----------------- + +The manual pages are just stubs at this point; other than st-flash, +the programs don't have any usage help. + + -- Keith Packard Sat, 14 Dec 2013 11:55:43 -0800 diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..ff89692 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,10 @@ +stlink for Debian +----------------- + + + + + + -- Keith Packard Sat, 14 Dec 2013 11:55:43 -0800 + diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..2bd1fba --- /dev/null +++ b/debian/changelog @@ -0,0 +1,6 @@ +stlink (0.5.6-1) unstable; urgency=low + + * Initial release + * Add man pages + + -- Keith Packard Sat, 14 Dec 2013 11:55:43 -0800 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..8a569eb --- /dev/null +++ b/debian/control @@ -0,0 +1,18 @@ +Source: stlink +Section: devel +Priority: optional +Maintainer: Keith Packard +Build-Depends: debhelper (>= 9.0.0), + autotools-dev, autoconf, automake, dh-autoreconf, + libusb-1.0-0-dev, pkg-config +Standards-Version: 3.9.4 +Homepage: https://github.com/texane/stlink +Vcs-Git: git://git.debian.org/collab-maint/stlink.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/stlink.git;a=summary + +Package: stlink +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: stm32 discovery line linux programmer + STM32 command line utilities using the STlink-v1/v2 protocols + Includes flash loader, GDB server and query utilities. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..cafdb9c --- /dev/null +++ b/debian/copyright @@ -0,0 +1,38 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: stlink +Source: https://github.com/texane/stlink + +Files: * +Copyright: 2010, 2011 The "Capt'ns Missing Link" Authors +License: BSD-3-Clause + +Files: debian/* +Copyright: 2013 Keith Packard +License: BSD-3-Clause + +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 Martin Capitanio 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. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..5502ed8 --- /dev/null +++ b/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +TODO diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..168bced --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +debian-branch = debian \ No newline at end of file diff --git a/debian/patches/0001-Add-man-pages.patch b/debian/patches/0001-Add-man-pages.patch new file mode 100644 index 0000000..f5bf970 --- /dev/null +++ b/debian/patches/0001-Add-man-pages.patch @@ -0,0 +1,224 @@ +From: Keith Packard +Date: Sat, 14 Dec 2013 12:49:35 -0800 +Subject: Add man pages + +--- + Makefile.am | 2 ++ + st-flash.1 | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ + st-info.1 | 41 +++++++++++++++++++++++++++++++++++++++++ + st-term.1 | 40 ++++++++++++++++++++++++++++++++++++++++ + st-util.1 | 38 ++++++++++++++++++++++++++++++++++++++ + 5 files changed, 171 insertions(+) + create mode 100644 st-flash.1 + create mode 100644 st-info.1 + create mode 100644 st-term.1 + create mode 100644 st-util.1 + +diff --git a/Makefile.am b/Makefile.am +index 2ddbf47..2733fa9 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -6,8 +6,10 @@ AUTOMAKE_OPTIONS = subdir-objects + + if MINGW + bin_PROGRAMS = st-flash st-util st-info ++man_MANS = st-flash.1 st-util.1 st-info.1 + else + bin_PROGRAMS = st-flash st-util st-term st-info ++man_MANS = st-flash.1 st-util.1 st-term.1 st-info.1 + endif + + noinst_LIBRARIES = libstlink.a +diff --git a/st-flash.1 b/st-flash.1 +new file mode 100644 +index 0000000..ee1130e +--- /dev/null ++++ b/st-flash.1 +@@ -0,0 +1,50 @@ ++.\" (C) Copyright 2013 Keith Packard , ++.\" ++.\"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 Martin Capitanio 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. ++.\" ++.TH ST-FLASH 1 "st-flash" "" ++.SH NAME ++st-flash \- flash STM devices via STlink ++.SH SYNOPSIS ++.B st-flash ++.RI (v1 devices) [--reset] {read|write} " /dev/sgX path addr " ++.br ++.B st-flash ++.RI (v1 devices) " /dev/sgX erase" ++.br ++.B st-flash ++.RI (v2 devices) [--reset] {read|write} " path addr " ++.br ++.B st-flash ++.RI (v2 devices) [--reset] {read|write} " erase" ++.SH DESCRIPTION ++This manual page documents briefly the ++st-flash command ++.SH SEE ALSO ++.BR st-util (1), ++.BR st-term (1), ++.BR st-info (1). +diff --git a/st-info.1 b/st-info.1 +new file mode 100644 +index 0000000..4fe2182 +--- /dev/null ++++ b/st-info.1 +@@ -0,0 +1,41 @@ ++.\" (C) Copyright 2013 Keith Packard , ++.\" ++.\"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 Martin Capitanio 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. ++.\" ++.TH ST-INFO 1 "st-info" "" ++.SH NAME ++st-info \- get information about STM cpu via STlink device ++.SH SYNOPSIS ++.B st-info ++.RI [--flash] [--sram] [--descr] [--pagesize] [--chipid] ++.SH DESCRIPTION ++This manual page documents briefly the ++st-info command ++.SH SEE ALSO ++.BR st-flash (1), ++.BR st-util (1), ++.BR st-term (1). +diff --git a/st-term.1 b/st-term.1 +new file mode 100644 +index 0000000..1b1f1d7 +--- /dev/null ++++ b/st-term.1 +@@ -0,0 +1,40 @@ ++.\" (C) Copyright 2013 Keith Packard , ++.\" ++.\"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 Martin Capitanio 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. ++.\" ++.TH ST-TERM 1 "st-term" "" ++.SH NAME ++st-term \- ST-link terminal ++.SH SYNOPSIS ++.B st-term ++.SH DESCRIPTION ++This manual page documents briefly the ++st-term command ++.SH SEE ALSO ++.BR st-flash (1), ++.BR st-util (1), ++.BR st-info (1). +diff --git a/st-util.1 b/st-util.1 +new file mode 100644 +index 0000000..b661aa1 +--- /dev/null ++++ b/st-util.1 +@@ -0,0 +1,38 @@ ++.\" (C) Copyright 2013 Keith Packard ++.\" ++.\"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 Martin Capitanio 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. ++.\" ++.TH ST-UTIL 1 "st-util" "" ++.SH NAME ++st-util \- GDB server for STM devices via STlink ++.SH DESCRIPTION ++This manual page documents briefly the ++st-util command ++.SH SEE ALSO ++.BR st-flash (1), ++.BR st-term (1), ++.BR st-info (1). diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..abe7f23 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Add-man-pages.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..ef2935e --- /dev/null +++ b/debian/rules @@ -0,0 +1,12 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +export DH_VERBOSE=1 + +%: + dh $@ --with autotools-dev --with autoreconf + +override_dh_installudev: + cat *.rules > debian/stlink.udev + dh_installudev --priority=60 diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt)