From 67f5cd8dd4ee0fab66f36ea53663fad37ec7883c Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 14 Dec 2013 13:18:54 -0800 Subject: [PATCH] merge patches --- debian/patches/0001-Add-man-pages.patch | 140 +++++++++++++++++++++--- 1 file changed, 126 insertions(+), 14 deletions(-) diff --git a/debian/patches/0001-Add-man-pages.patch b/debian/patches/0001-Add-man-pages.patch index a27283b..f5bf970 100644 --- a/debian/patches/0001-Add-man-pages.patch +++ b/debian/patches/0001-Add-man-pages.patch @@ -4,11 +4,11 @@ Subject: Add man pages --- Makefile.am | 2 ++ - st-flash.1 | 22 ++++++++++++++++++++++ - st-info.1 | 13 +++++++++++++ - st-term.1 | 12 ++++++++++++ - st-util.1 | 10 ++++++++++ - 5 files changed, 59 insertions(+) + 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 @@ -31,11 +31,39 @@ index 2ddbf47..2733fa9 100644 noinst_LIBRARIES = libstlink.a diff --git a/st-flash.1 b/st-flash.1 new file mode 100644 -index 0000000..0ff7ae6 +index 0000000..ee1130e --- /dev/null +++ b/st-flash.1 -@@ -0,0 +1,22 @@ +@@ -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 @@ -59,11 +87,39 @@ index 0000000..0ff7ae6 +.BR st-info (1). diff --git a/st-info.1 b/st-info.1 new file mode 100644 -index 0000000..80fa82e +index 0000000..4fe2182 --- /dev/null +++ b/st-info.1 -@@ -0,0 +1,13 @@ +@@ -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 @@ -78,11 +134,39 @@ index 0000000..80fa82e +.BR st-term (1). diff --git a/st-term.1 b/st-term.1 new file mode 100644 -index 0000000..3703077 +index 0000000..1b1f1d7 --- /dev/null +++ b/st-term.1 -@@ -0,0 +1,12 @@ +@@ -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 @@ -96,11 +180,39 @@ index 0000000..3703077 +.BR st-info (1). diff --git a/st-util.1 b/st-util.1 new file mode 100644 -index 0000000..6331321 +index 0000000..b661aa1 --- /dev/null +++ b/st-util.1 -@@ -0,0 +1,10 @@ -+.\" (C) Copyright 2013 Keith Packard , +@@ -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 -- 2.30.2