diff -Nru valinor-1.1.4/debian/changelog valinor-1.1.4/debian/changelog --- valinor-1.1.4/debian/changelog 2020-06-19 02:29:36.000000000 +0000 +++ valinor-1.1.4/debian/changelog 2020-07-31 19:22:31.000000000 +0000 @@ -1,3 +1,13 @@ +valinor (1.1.4-5) unstable; urgency=medium + + * d/manpages: + - Improve formatting of custom manpage + * d/patches: + - Add patch soften-progen-dependency + - Refresh patches (fuzz) + + -- Nick Morrott Fri, 31 Jul 2020 20:22:31 +0100 + valinor (1.1.4-4) unstable; urgency=medium * d/control: diff -Nru valinor-1.1.4/debian/patches/series valinor-1.1.4/debian/patches/series --- valinor-1.1.4/debian/patches/series 2020-06-19 02:29:36.000000000 +0000 +++ valinor-1.1.4/debian/patches/series 2020-07-31 19:22:31.000000000 +0000 @@ -1,5 +1,6 @@ use-gdb-multiarch soften-elftools-dependency +soften-progen-dependency update-pyocd-module-references ignore-windows-debug-tools drop-unused-setuptools-install-requires diff -Nru valinor-1.1.4/debian/patches/soften-colorama-dependency valinor-1.1.4/debian/patches/soften-colorama-dependency --- valinor-1.1.4/debian/patches/soften-colorama-dependency 2020-06-19 02:29:36.000000000 +0000 +++ valinor-1.1.4/debian/patches/soften-colorama-dependency 2020-07-31 19:22:31.000000000 +0000 @@ -13,5 +13,5 @@ - 'colorama>=0.3,<0.4', + 'colorama>=0.3', 'pyocd', - 'project_generator>=0.8.0,<0.10.0', + 'project_generator>=0.8.0', 'pyelftools>=0.23', diff -Nru valinor-1.1.4/debian/patches/soften-elftools-dependency valinor-1.1.4/debian/patches/soften-elftools-dependency --- valinor-1.1.4/debian/patches/soften-elftools-dependency 2020-06-19 02:29:36.000000000 +0000 +++ valinor-1.1.4/debian/patches/soften-elftools-dependency 2020-07-31 19:22:31.000000000 +0000 @@ -1,17 +1,15 @@ Description: Soften version dependency of pyelftools -Author: Nick Morrott +Author: Nick Morrott Forwarded: not-needed -Last-Update: 2018-12-27 +Last-Update: 2020-07-31 --- --- a/setup.py +++ b/setup.py -@@ -42,8 +42,8 @@ - 'setuptools', +@@ -43,7 +43,7 @@ 'colorama>=0.3,<0.4', 'pyOCD>=0.3,<1.0', -- 'project_generator>=0.8.0,<0.9.0', + 'project_generator>=0.8.0,<0.9.0', - 'pyelftools==0.23', -+ 'project_generator>=0.8.0,<0.10.0', + 'pyelftools>=0.23', ], tests_require=[ diff -Nru valinor-1.1.4/debian/patches/soften-progen-dependency valinor-1.1.4/debian/patches/soften-progen-dependency --- valinor-1.1.4/debian/patches/soften-progen-dependency 1970-01-01 00:00:00.000000000 +0000 +++ valinor-1.1.4/debian/patches/soften-progen-dependency 2020-07-31 19:22:31.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Soften version dependency of project_generator +Author: Nick Morrott +Forwarded: not-needed +Last-Update: 2020-07-31 +--- +--- a/setup.py ++++ b/setup.py +@@ -42,7 +42,7 @@ + 'setuptools', + 'colorama>=0.3,<0.4', + 'pyOCD>=0.3,<1.0', +- 'project_generator>=0.8.0,<0.9.0', ++ 'project_generator>=0.8.0', + 'pyelftools>=0.23', + ], + tests_require=[ diff -Nru valinor-1.1.4/debian/patches/update-egg-info valinor-1.1.4/debian/patches/update-egg-info --- valinor-1.1.4/debian/patches/update-egg-info 2020-06-19 02:29:36.000000000 +0000 +++ valinor-1.1.4/debian/patches/update-egg-info 2020-07-31 19:22:31.000000000 +0000 @@ -1,7 +1,7 @@ Description: Remove/soften dependencies in egg where appropriate Author: Nick Morrott Forwarded: not-needed -Last-Update: 2019-11-10 +Last-Update: 2020-07-31 --- --- a/valinor.egg-info/requires.txt +++ b/valinor.egg-info/requires.txt @@ -14,5 +14,5 @@ pyOCD<1.0,>=0.3 -project_generator<0.9.0,>=0.8.0 -pyelftools==0.23 -+project_generator<0.10.0,>=0.8.0 ++project_generator>=0.8.0 +pyelftools>=0.23 diff -Nru valinor-1.1.4/debian/patches/update-pyocd-module-references valinor-1.1.4/debian/patches/update-pyocd-module-references --- valinor-1.1.4/debian/patches/update-pyocd-module-references 2020-06-19 02:29:36.000000000 +0000 +++ valinor-1.1.4/debian/patches/update-pyocd-module-references 2020-07-31 19:22:31.000000000 +0000 @@ -1,7 +1,7 @@ Description: Change name of pyOCD to pyocd -Author: Nick Morrott +Author: Nick Morrott Forwarded: not-needed -Last-Update: 2018-12-27 +Last-Update: 2020-07-31 --- --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ 'colorama>=0.3,<0.4', - 'pyOCD>=0.3,<1.0', + 'pyocd', - 'project_generator>=0.8.0,<0.10.0', + 'project_generator>=0.8.0', 'pyelftools>=0.23', ], --- a/valinor/gdb.py diff -Nru valinor-1.1.4/debian/valinor.1.md.in valinor-1.1.4/debian/valinor.1.md.in --- valinor-1.1.4/debian/valinor.1.md.in 2020-06-19 02:29:36.000000000 +0000 +++ valinor-1.1.4/debian/valinor.1.md.in 2020-07-31 19:22:31.000000000 +0000 @@ -8,9 +8,9 @@ # SYNOPSIS -| **valinor** \[**\-\-tool** _TOOL_] \[**\-\-project\-dir** _PROJECT_DIR_] \[**\-\-no\-open**] **-–target** _TARGET_ **executable** +| **valinor** \[**\-\-tool** _TOOL_\] \[**\-\-project\-dir** _PROJECT\_DIR_\] \[**\-\-no\-open**\] **\-\–target** _TARGET_ **executable** -| **valinor** **–-version** +| **valinor** **\–\-version** # DESCRIPTION @@ -28,14 +28,14 @@ : do not open debug session (generate the necessary files to enable debugging and print command to proceed) \-\–target _TARGET_ -: target board to generate project file for (e.g. K64F) (this name is passed to project_generator - any name it accepts will work) +: target board to generate project file for (e.g. K64F) (this name is passed to project\_generator - any name it accepts will work) \-\-version : print version and exit # YOTTA TARGET DEFINITIONS -To use valinor to add debug support to a yotta target description, add the following to your target.json file (replacing K64F with the project_generator target ID for the chip/board on your target): +To use valinor to add debug support to a yotta target description, add the following to your target.json file (replacing K64F with the project\_generator target ID for the chip/board on your target): ``` "scripts":{ @@ -57,4 +57,4 @@ # SEE ALSO -**yotta(1)**, **progen(1)**, **progendef(1)** +**yotta**(1), **progen**(1), **progendef**(1)