diff options
Diffstat (limited to 'debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian')
19 files changed, 0 insertions, 1079 deletions
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/TODO b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/TODO deleted file mode 100644 index 9b800ac4..00000000 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/TODO +++ /dev/null @@ -1,3 +0,0 @@ -TODO list: - -* Convert copyright file to machine-readable format. diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/changelog b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/changelog deleted file mode 100644 index de5b18ae..00000000 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/changelog +++ /dev/null @@ -1,310 +0,0 @@ -uncrustify-trinity (0.72.0-0debian11.0.0+8) unstable; urgency=medium - - * Switch to build using ninja-build - - -- Slávek Banko <slavek.banko@axis.cz> Tue, 18 May 2021 19:30:49 +0200 - -uncrustify-trinity (0.72.0-0debian11.0.0+7) unstable; urgency=medium - - * TDE version 0.72-0+7 - * Backported commits 5f3f392a and fb66774e from upstream. - - -- Michele Calgaro <michele.calgaro@yahoo.it> Thu, 05 Jan 2021 11:08:00 +0900 - -uncrustify-trinity (0.72.0-0debian11.0.0+6) unstable; urgency=medium - - * TDE version 0.72-0+6 - * Backported commits 45681e88 and 64d93e3fb from upstream. - - -- Michele Calgaro <michele.calgaro@yahoo.it> Thu, 24 Dec 2020 20:14:00 +0900 - -uncrustify-trinity (0.72.0-0debian11.0.0+0) unstable; urgency=medium - - * TDE version of upstream 0.72.0 - - -- Michele Calgaro <michele.calgaro@yahoo.it> Thu, 20 Dec 2020 17:52:23 +0900 - -uncrustify (0.72.0) unstable; urgency=medium - - * New upstream version 0.72.0 - - -- Alexander GQ Gerasiov <gq@debian.org> Thu, 20 Dec 2020 17:34:01 +0900 - -uncrustify (0.71.0+dfsg1-1) unstable; urgency=medium - - * New upstream version 0.71.0 - * d/control: Use debhelper-compat syntax, switch to level 12. - * d/control: Use python3 in B-D (Closes: #943295). - * d/control: Bump Standards-Version, no more changes needed. - * d/control: Remove unnnecessary --parallel. - - -- Alexander GQ Gerasiov <gq@debian.org> Thu, 27 Aug 2020 17:12:57 +0300 - -uncrustify (0.69.0+dfsg1-1) unstable; urgency=medium - - * New upstream version 0.69.0 - * Remove fix_parallel_test.patch: Fixed upstream. - - -- Alexander GQ Gerasiov <gq@debian.org> Tue, 02 Jul 2019 19:00:32 +0300 - -uncrustify (0.68.1+dfsg1-2) unstable; urgency=medium - - * Add d/patches/fix_parallel_test.patch: Fix test failure on parallel run. - - -- Alexander GQ Gerasiov <gq@debian.org> Mon, 10 Dec 2018 02:36:22 +0300 - -uncrustify (0.68.1+dfsg1-1) unstable; urgency=medium - - * New upstream version 0.68.1 - * d/control: Add python-all to Build-Depensds. - * d/rules: Run all tests (now disabled by default by upstream). - - -- Alexander GQ Gerasiov <gq@debian.org> Sun, 02 Dec 2018 16:19:42 +0300 - -uncrustify (0.67+dfsg1-1) unstable; urgency=medium - - * New upstream version 0.67 - * debian/control: Move git to salsa. - * Add docs-remove-remote-images.patch: Remove remote images from docs. - - -- Alexander GQ Gerasiov <gq@debian.org> Mon, 18 Jun 2018 01:13:56 +0300 - -uncrustify (0.66.1+dfsg1-1) unstable; urgency=medium - - * Add debian/gbp.conf. - * New upstream version 0.66.1 Fixed FTBFS on some arches (Closes: #881249) - * Bump Standards-Version to 4.1.2 (no additional changes needed). - - -- Alexander GQ Gerasiov <gq@debian.org> Sun, 17 Dec 2017 18:49:06 +0300 - -uncrustify (0.66+dfsg1-1) unstable; urgency=medium - - * debian/control: Remove Fathi Boudra <fabo@debian.org> from uploaders. - (Closes: #879444.) Thanks for your job. - * New upstream version 0.66 - * Bump Standards-Version to 4.1.1 (no additional changes needed). - * debian/control: Add more languages to short description. - - -- Alexander GQ Gerasiov <gq@debian.org> Wed, 08 Nov 2017 18:18:47 +0300 - -uncrustify (0.65+git20170831+dfsg1-1) unstable; urgency=medium - - * New upstream version 0.65+git20170831. Fixes various FTBFS and autotests - failures on exotic archs. (Closes: #867376) - * Bump Standards-Version to 4.1.0 (no additional changes needed). - - -- Alexander GQ Gerasiov <gq@debian.org> Thu, 31 Aug 2017 20:25:06 +0300 - -uncrustify (0.65+dfsg1-1) unstable; urgency=medium - - * New upstream version 0.65 - * debian/control: Add python-minimal to Build-Depends. - - -- Alexander GQ Gerasiov <gq@debian.org> Tue, 04 Jul 2017 14:50:47 +0300 - -uncrustify (0.64+dfsg1-1) unstable; urgency=medium - - * Imported Upstream version 0.64 - (Closes: #748787, #814193, #594210, #775517, #594206, #616708) - * Remove non-free documentation/htdocs/project-support.jpg. - * Imported debian dir from previous version. - * Remove "debian/<q" file. - * Remove fix-ftbfs-with-gcc-4.7.patch (Fixed upstream). - * debian/control: Switch dependence from autotools to cmake. - * debian/control, debian/compat: Set compatibility level to 9. - * debian/rules: Remove legacy PRONY records. - * debian/control: Change Homepage to github. - * debian/watch: Update to github using current naming scheme. - * debian/copyright: Add myself. - * Install README.md and documentation dir into package's docs. - * debian/rules: Remove tests results on clean. - * debian/control: Set myself as maintainer. (Johann Rudloff is out of - business, thanks a lot for all; Fathi Boudra acked this.) - * Bump Standards-Version to 3.9.8 (no additional changes needed). - * Add debian/TODO file. - * debian/cotrol: Add link to collab-maint's git. - - -- Alexander GQ Gerasiov <gq@debian.org> Sat, 03 Dec 2016 20:19:22 +0300 - -uncrustify (0.59+dfsg1-1.1) unstable; urgency=medium - - * Non-maintainer upload. - * Remove non-free file (project-support.jpg). Closes: #753760 - - -- Mathieu Malaterre <malat@debian.org> Fri, 16 Jan 2015 16:52:15 +0100 - -uncrustify (0.59-2) unstable; urgency=low - - * Fix FTBFS with gcc 4.7 by fixing missing <unistd.h> include. - (Closes: #667404) - - -- Fathi Boudra <fabo@debian.org> Mon, 21 May 2012 15:40:46 +0300 - -uncrustify (0.59-1) unstable; urgency=low - - * New upstream release. - * Add myself to Uploaders. - - -- Fathi Boudra <fabo@debian.org> Sat, 31 Dec 2011 12:49:32 +0200 - -uncrustify (0.57-1) unstable; urgency=low - - * New upstream release. - - [ Fathi Boudra ] - * Removed patch to check for NULL - stolen upstream. - * Bumped Standards-Version to 3.9.1 (no changes needed). - - -- Johann Rudloff <cypheon@gmx.net> Mon, 21 Feb 2011 11:54:28 +0200 - -uncrustify (0.56-2) unstable; urgency=low - - [ Fathi Boudra ] - * Added patch to check for NULL to prevent a segmentation fault. - (Closes: #580195) - * Bumped Standards-Version to 3.9.0 (no changes needed). - - -- Johann Rudloff <cypheon@gmx.net> Thu, 01 Jul 2010 20:34:01 +0300 - -uncrustify (0.56-1) unstable; urgency=low - - * New upstream release. - - [ Fathi Boudra ] - * Switch to dpkg-source 3.0 (quilt) format. - * debian/control: - - bumped debhelper version to 7.4.15 - - fixed typo in long description. - * debian/copyright: - - added email author. - - added myself. - - -- Johann Rudloff <cypheon@gmx.net> Tue, 20 Apr 2010 13:08:29 +0300 - -uncrustify (0.55-1) unstable; urgency=low - - * New upstream release (Closes: #540817) - - [ Fathi Boudra ] - * debian/patches/manpage_fix_hyphens.diff: removed - merged upstream - * debian/compat: bumped to 7 - * debian/control: - - bumped debhelper version to 7.4.13 - - bumped Standards-Version to 3.8.4 (no changes needed) - - added ${misc:Depends} - * debian/docs: updated - * debian/rules: rewrited from scratch to use dh and enabled parallel build - - -- Johann Rudloff <cypheon@gmx.net> Wed, 17 Feb 2010 09:18:41 +0100 - -uncrustify (0.52-1) unstable; urgency=low - - * New upstream release (closes: #526100) - * debian/copyright: changed years and wording of copyright - * debian/patches/manpage_fix_hyphens.diff: added patch to fix fixed hyphens - used as minus signs in manpage - * debian/rules: included usage of quilt - * debian/control: added build dependency quilt - bumped Standards-Version to 3.8.1 (no changes required) - - -- Johann Rudloff <cypheon@gmx.net> Thu, 30 Apr 2009 11:32:27 +0200 - -uncrustify (0.48-1) unstable; urgency=low - - * New upstream release - * debian/rules: removed CFLAGS settings (done by dpkg-buildpackage) - - -- Johann Rudloff <cypheon@gmx.net> Tue, 22 Jul 2008 11:19:54 +0200 - -uncrustify (0.47-1) unstable; urgency=low - - * New upstream release (closes: #479372) - * Bumped Standards-Version to 3.8.0 (no changes required) - * removed debian/uncrustify.1, since upstream sources now include a - manpage - * debian/rules: removed call to dh_installman, manpage is installed by - make install - * debian/rules: removed unneeded call to dh_installdirs - - -- Johann Rudloff <cypheon@gmx.net> Sun, 08 Jun 2008 10:09:53 +0200 - -uncrustify (0.44-1) unstable; urgency=low - - * New upstream release - * debian/uncrustify.1: updated version number and date - - -- Johann Rudloff <cypheon@gmx.net> Sun, 24 Feb 2008 09:13:49 +0100 - -uncrustify (0.43-1) unstable; urgency=low - - * New upstream release (closes: #461631) - * Bumped Standards-Version to 3.7.3 (no changes required) - * debian/copyright: updated years of copyright - * debian/control: moved homepage address from description to a separate field - * debian/uncrustify.1: updated year and month - * debian/rules: copy update config.{sub,guess} into source tree in - config.status target, remove them in clean target - - -- Johann Rudloff <cypheon@gmx.net> Thu, 10 Jan 2008 15:37:19 +0100 - -uncrustify (0.41-1) unstable; urgency=low - - * New upstream release - - -- Johann Rudloff <cypheon@gmx.net> Mon, 12 Nov 2007 21:22:25 +0100 - -uncrustify (0.40-1) unstable; urgency=low - - * New upstream release - - -- Johann Rudloff <cypheon@gmx.net> Tue, 16 Oct 2007 21:26:13 +0200 - -uncrustify (0.39-1) unstable; urgency=low - - * New Upstream Version - - -- Johann Rudloff <cypheon@gmx.net> Wed, 26 Sep 2007 23:50:30 +0200 - -uncrustify (0.38-1) unstable; urgency=low - - * New upstream release - - -- Johann Rudloff <cypheon@gmx.net> Thu, 06 Sep 2007 22:52:16 +0200 - -uncrustify (0.37-1) unstable; urgency=low - - * New upstream release - * debian/uncrustify.1: added new command line options - * debian/uncrustify.1: changes in formatting and description - - -- Johann Rudloff <cypheon@gmx.net> Sun, 19 Aug 2007 19:33:08 +0200 - -uncrustify (0.36-1) unstable; urgency=low - - * New upstream release (closes: #434938, #434939) - - -- Johann Rudloff <cypheon@gmx.net> Tue, 07 Aug 2007 13:49:41 +0200 - -uncrustify (0.35-1) unstable; urgency=low - - * New upstream release - - -- Johann Rudloff <cypheon@gmx.net> Sat, 21 Jul 2007 20:41:52 +0200 - -uncrustify (0.33-1) unstable; urgency=low - - * New upstream release (closes: #416469) - * Added debian/watch file - * debian/uncrustify.1: added new command line options - * debian/uncrustify.1: removed leading colons - * debian/copyright: updated years of copyright - * debian/copyright: updated parts concerning cmpcfg.pl, since it - now contains a proper license statement - - -- Johann Rudloff <cypheon@gmx.net> Fri, 30 Mar 2007 20:51:27 +0200 - -uncrustify (0.30-1) unstable; urgency=low - - * Initial release - - -- Johann Rudloff <cypheon@gmx.net> Sat, 25 Nov 2006 14:06:44 +0100 diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/compat b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/compat deleted file mode 100644 index ec635144..00000000 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/control b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/control deleted file mode 100644 index c0391c70..00000000 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/control +++ /dev/null @@ -1,20 +0,0 @@ -Source: uncrustify-trinity -Section: deps-r14/devel -Priority: optional -Maintainer: Alexander GQ Gerasiov <gq@debian.org> -Build-Depends: debhelper (>= 9~), cmake (>= 3.0~), ninja-build, python3 (>= 3.3~), gcc (>= 4:4.9~) -Standards-Version: 4.5.0 -Homepage: https://github.com/uncrustify/uncrustify -Vcs-Git: https://salsa.debian.org/debian/uncrustify.git -Vcs-Browser: https://salsa.debian.org/debian/uncrustify - -Package: uncrustify-trinity -Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: C, C++, ObjectiveC, C#, D, Java, Pawn and VALA source code beautifier - Uncrustify is a highly configurable source code formatter. It aligns - preprocessor define's, assignments, arithmetics and is able to fix spacing - between operators. - . - This is a TDE packaged version of upstream uncrustify, used to have a consistent - version for code formatting across multiple platforms. diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/copyright b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/copyright deleted file mode 100644 index 7c74f673..00000000 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/copyright +++ /dev/null @@ -1,107 +0,0 @@ -This work was packaged for Debian by: - - Johann Rudloff <cypheon@gmx.net> on Sat, 25 Nov 2006 14:06:44 +0100. - -It was downloaded from: - - http://uncrustify.sourceforge.net - -Upstream Author: - - Ben Gardner <gardner.ben@gmail.com> - -Copyright: - - 2005-2010 Ben Gardner <gardner.ben@gmail.com> - 1995-1999 Simon G. Vogl <simon@tk.uni-linz.ac.at> - 2006 David Thompson <da.thompson@yahoo.com> - 1999-2006 Digital Mars <http://digitalmars.com/> - -License (except src/md5.cpp, documentation/htdocs/examples/c-1.out.c, - documentation/htdocs/examples/c-1.in.c, scripts/cmpcfg.pl as - well as tests/input/d/Lexer.d, tests/input/d/HashMap.d, - tests/input/c/i2c-core.c, and the corresponding files in - tests/output, i. e.: tests/output/c/20100-i2c-core.c, - tests/output/c/20000-i2c-core.c, tests/output/d/40006-Lexer.d, - tests/output/d/40007-Lexer.d and tests/output/d/40000-HashMap.d): - - Copyright (C) 2005-2008 by Ben Gardner - - You are free to distribute this software under the terms of - the GNU General Public License, either version 2 of the License, - or (at your option) any later version. - -License (tests/input/c/i2c-core.c, documentation/htdocs/examples/c-1.out.c, - tests/output/c/20100-i2c-core.c, tests/output/c/20000-i2c-core.c, - and documentation/htdocs/examples/c-1.in.c): - - Copyright (C) 1995-1999 by Simon G. Vogl <simon@tk.uni-linz.ac.at> - - You are free to distribute this software under the terms of - the GNU General Public License, either version 2 of the License, - or (at your option) any later version. - -License (scripts/cmpcfg.pl): - - Copyright (C) 2006 by David Thompson - - You are free to distribute this software under the terms of - the GNU General Public License. - -On Debian systems, the complete text of the GNU General Public License -can be found in the file /usr/share/common-licenses/GPL. - -License (src/md5.cpp): - - This code was written by Colin Plumb in 1993, no copyright is claimed. - This code is in the public domain; do with it what you wish. - -License (tests/input/d/Lexer.d, tests/output/d/40006-Lexer.d - and tests/output/d/40007-Lexer.d): - - Copyright (c) 1999-2006 by Digital Mars - All Rights Reserved - written by Walter Bright www.digitalmars.com - - License for redistribution is either the Artistic License or - the GNU General Public License. - -On Debian systems, the complete text of the GNU General Public License -can be found in the file /usr/share/common-licenses/GPL. -The complete text of the Artistic License is available in the -file /usr/share/common-licenses/Artistic. - -License (tests/input/d/HashMap.d and tests/output/d/40000-HashMap.d): - - Copyright (C) 2004 by Doug Lea - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for damages - of any kind arising from the use of this software. - - Permission is hereby granted to anyone to use this software for any - purpose, including commercial applications, and to alter it and/or - redistribute it freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment within documentation of - said product would be appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must - not be misrepresented as being the original software. - - 3. This notice may not be removed or altered from any distribution - of the source. - - 4. Derivative works are permitted, but they must carry this notice - in full and credit the original source. - -The Debian packaging is - - Copyright (C) 2006-2009 Johann Rudloff <cypheon@gmx.net> - Copyright (C) 2009-2012 Fathi Boudra <fabo@debian.org> - Copyright (C) 2016 Alexander GQ Gerasiov <gq@debian.org> - -and is licensed under the GPL version 2 or any later version, -see `/usr/share/common-licenses/GPL-2'. diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/docs b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/docs deleted file mode 100644 index d217a928..00000000 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/docs +++ /dev/null @@ -1,2 +0,0 @@ -README.md -documentation/* diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/gbp.conf b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/gbp.conf deleted file mode 100644 index f66f0145..00000000 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/gbp.conf +++ /dev/null @@ -1,7 +0,0 @@ -[DEFAULT] -compression = xz - -[import-orig] -upstream-branch = upstream-nondfsg -pristine-tar = False -merge = False diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/001_docs-remove-remote-images.patch b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/001_docs-remove-remote-images.patch deleted file mode 100644 index 9c7d3e3b..00000000 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/001_docs-remove-remote-images.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: Remove remote images from docs. - This images does not held any information, but breaks user's privacy. -Author: Alexander Gerasiov <gq@debian.org> -Last-Update: 2018-06-17 - ---- uncrustify-0.67+dfsg1.orig/documentation/htdocs/index.html -+++ uncrustify-0.67+dfsg1/documentation/htdocs/index.html -@@ -16,25 +16,6 @@ - <div class="node2" align="left"> - <h1>Uncrustify</h1> - <h2>Source Code Beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA</h2> --<table> -- <tr> -- <td valign="top"> -- <script type='text/javascript' language='JavaScript' src='http://www.ohloh.net/projects/4765/badge_js'></script> -- </td> -- <td valign="top"> -- <a href="https://travis-ci.org/uncrustify/uncrustify/builds"> -- <img alt="Travis CI Build Status" -- src="https://travis-ci.org/uncrustify/uncrustify.svg?branch=master"/> -- </a> -- </td> -- <td valign="top"> -- <a href="https://scan.coverity.com/projects/uncrustify"> -- <img alt="Coverity Scan Build Status" -- src="https://scan.coverity.com/projects/8264/badge.svg"/> -- </a> -- </td> -- </tr> --</table> - - <h2>Introduction</h2> - <p>The goals of this project are simple: diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/002_trinity_customization.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/002_trinity_customization.diff deleted file mode 100644 index 2c5eeb89..00000000 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/002_trinity_customization.diff +++ /dev/null @@ -1,230 +0,0 @@ -Customize and repackage as a TDE package. ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,6 +1,6 @@ - cmake_minimum_required(VERSION 3.2) - --project(uncrustify) -+project(uncrustify-trinity) - - if("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}") - message(FATAL_ERROR " -@@ -231,7 +231,7 @@ - # - # Uncrustify - # --set(uncrustify_sources -+set(uncrustify-trinity_sources - src/align_add.cpp - src/align_asm_colon.cpp - src/align_assign.cpp -@@ -312,7 +312,7 @@ - ${PROJECT_BINARY_DIR}/src/option_enum.cpp - ) - --set(uncrustify_headers -+set(uncrustify-trinity_headers - src/align_add.h - src/align_asm_colon.h - src/align_assign.h -@@ -404,7 +404,7 @@ - ${PROJECT_BINARY_DIR}/uncrustify_version.h - ) - --set(uncrustify_docs -+set(uncrustify-trinity_docs - "${PROJECT_SOURCE_DIR}/AUTHORS" - "${PROJECT_SOURCE_DIR}/BUGS" - "${PROJECT_SOURCE_DIR}/ChangeLog" -@@ -413,31 +413,31 @@ - "${PROJECT_SOURCE_DIR}/README.md" - ) - --add_executable(uncrustify ${uncrustify_sources} ${uncrustify_headers}) --add_dependencies(uncrustify generate_version_header) -+add_executable(uncrustify-trinity ${uncrustify-trinity_sources} ${uncrustify-trinity_headers}) -+add_dependencies(uncrustify-trinity generate_version_header) - - if(CMAKE_VERSION VERSION_LESS 2.8.10) - if(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) - # Multi-configuration or build type set -- set_property(TARGET uncrustify APPEND PROPERTY -+ set_property(TARGET uncrustify-trinity APPEND PROPERTY - COMPILE_DEFINITIONS_DEBUG DEBUG - ) - else() - # Single-configuration with no build type set -- set_property(TARGET uncrustify APPEND PROPERTY -+ set_property(TARGET uncrustify-trinity APPEND PROPERTY - COMPILE_DEFINITIONS DEBUG - ) - endif() - else() -- set_property(TARGET uncrustify APPEND PROPERTY -+ set_property(TARGET uncrustify-trinity APPEND PROPERTY - COMPILE_DEFINITIONS $<$<OR:$<CONFIG:Debug>,$<CONFIG:>>:DEBUG> - ) - endif() - - # --# Generate uncrustify.1 -+# Generate uncrustify-trinity.1 - # --configure_file(man/uncrustify.1.in uncrustify.1 @ONLY) -+configure_file(man/uncrustify.1.in uncrustify-trinity.1 @ONLY) - - # - # Generate uncrustify.xml (katepart highlighting file) -@@ -459,7 +459,7 @@ - # - OPTION(ENABLE_CODECOVERAGE "Enable code coverage testing support") - if(ENABLE_CODECOVERAGE) -- set(CODECOVERAGE_DEPENDS uncrustify) -+ set(CODECOVERAGE_DEPENDS uncrustify-trinity) - include(${CMAKE_SOURCE_DIR}/cmake/CodeCoverage.cmake) - endif(ENABLE_CODECOVERAGE) - -@@ -467,10 +467,10 @@ - # Build command to run uncrustify on its own sources - # - add_custom_target(format-sources) --foreach(source IN LISTS uncrustify_sources uncrustify_headers) -+foreach(source IN LISTS uncrustify-trinity_sources uncrustify-trinity_headers) - get_filename_component(source_name ${source} NAME) - add_custom_target(format-${source_name} -- COMMAND uncrustify -+ COMMAND uncrustify-trinity - -c forUncrustifySources.cfg - -lCPP --no-backup ${source} - COMMENT "Formatting ${source}" -@@ -482,7 +482,7 @@ - # - # Package - # --set(CPACK_PACKAGE_NAME "uncrustify") -+set(CPACK_PACKAGE_NAME "uncrustify-trinity") - set(CPACK_PACKAGE_VERSION "${UNCRUSTIFY_VERSION}") - set(CPACK_PACKAGE_VENDOR "Ben Gardner") - set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Code beautifier") -@@ -500,8 +500,8 @@ - # Install - # - if(CMAKE_SYSTEM_NAME STREQUAL "Windows") -- install(TARGETS uncrustify DESTINATION ".") -- install(FILES ${uncrustify_docs} -+ install(TARGETS uncrustify-trinity DESTINATION ".") -+ install(FILES ${uncrustify-trinity_docs} - DESTINATION "." - ) - install(FILES "${PROJECT_SOURCE_DIR}/documentation/htdocs/index.html" -@@ -513,17 +513,17 @@ - ) - else() - include(GNUInstallDirs) -- install(TARGETS uncrustify -+ install(TARGETS uncrustify-trinity - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - ) -- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/uncrustify.1" -+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/uncrustify-trinity.1" - DESTINATION "${CMAKE_INSTALL_MANDIR}/man1" - ) - install(DIRECTORY "${PROJECT_SOURCE_DIR}/etc/" - DESTINATION "${CMAKE_INSTALL_DOCDIR}/examples" - FILES_MATCHING PATTERN "*.cfg" - ) -- install(FILES ${uncrustify_docs} -+ install(FILES ${uncrustify-trinity_docs} - DESTINATION "${CMAKE_INSTALL_DOCDIR}" - ) - endif() ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -32,7 +32,7 @@ - add_custom_command( - OUTPUT ${tests_ctest_file} - COMMAND ${PYTHON_EXECUTABLE} run_format_tests.py -- --executable $<TARGET_FILE:uncrustify> -+ --executable $<TARGET_FILE:uncrustify-trinity> - --git ${GIT_EXECUTABLE} - --python ${PYTHON_EXECUTABLE} - --write-ctest ${tests_ctest_file} -@@ -48,7 +48,7 @@ - string(REPLACE ".test" "" lang "${suite}") - add_test(NAME ${lang} - COMMAND ${PYTHON_EXECUTABLE} run_format_tests.py ${lang} -- --executable $<TARGET_FILE:uncrustify> -+ --executable $<TARGET_FILE:uncrustify-trinity> - -d --git ${GIT_EXECUTABLE} - --result-dir ${CMAKE_CURRENT_BINARY_DIR} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -@@ -60,7 +60,7 @@ - add_test( - NAME sources_format - COMMAND ${PYTHON_EXECUTABLE} run_sources_tests.py -- --executable $<TARGET_FILE:uncrustify> -+ --executable $<TARGET_FILE:uncrustify-trinity> - -d --git ${GIT_EXECUTABLE} - --result-dir ${CMAKE_CURRENT_BINARY_DIR} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -@@ -71,7 +71,7 @@ - NAME cli_options - COMMAND ${PYTHON_EXECUTABLE} - test_cli_options.py -- --build ${uncrustify_BINARY_DIR} -+ --build ${uncrustify-trinity_BINARY_DIR} - --diff - ${_configs} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cli -@@ -80,10 +80,10 @@ - add_custom_target(update-cli-options - COMMAND ${PYTHON_EXECUTABLE} - test_cli_options.py -- --build ${uncrustify_BINARY_DIR} -+ --build ${uncrustify-trinity_BINARY_DIR} - --apply -- DEPENDS uncrustify -+ DEPENDS uncrustify-trinity - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cli - ) - --add_test(NAME sanity COMMAND uncrustify --help) -+add_test(NAME sanity COMMAND uncrustify-trinity --help) ---- a/tests/cli/output/help.txt -+++ b/tests/cli/output/help.txt -@@ -1,5 +1,5 @@ - Usage: --uncrustify [options] [files ...] -+uncrustify-trinity [options] [files ...] - - If no input files are specified, the input is read from stdin - If reading from stdin, you should specify the language using -l ---- a/tests/cli/test_cli_options.py -+++ b/tests/cli/test_cli_options.py -@@ -482,16 +482,16 @@ - bin_found = False - uncr_bin = '' - bd_dir = parsed_args.build -- bin_paths = [s_path_join(bd_dir, 'uncrustify'), -- s_path_join(bd_dir, 'uncrustify.exe'), -- s_path_join(bd_dir, 'Debug/uncrustify'), -- s_path_join(bd_dir, 'Debug/uncrustify.exe'), -- s_path_join(bd_dir, 'Release/uncrustify'), -- s_path_join(bd_dir, 'Release/uncrustify.exe'), -- s_path_join(bd_dir, 'RelWithDebInfo/uncrustify'), -- s_path_join(bd_dir, 'RelWithDebInfo/uncrustify.exe'), -- s_path_join(bd_dir, 'MinSizeRel/uncrustify'), -- s_path_join(bd_dir, 'MinSizeRel/uncrustify.exe')] -+ bin_paths = [s_path_join(bd_dir, 'uncrustify-trinity'), -+ s_path_join(bd_dir, 'uncrustify-trinity.exe'), -+ s_path_join(bd_dir, 'Debug/uncrustify-trinity'), -+ s_path_join(bd_dir, 'Debug/uncrustify-trinity.exe'), -+ s_path_join(bd_dir, 'Release/uncrustify-trinity'), -+ s_path_join(bd_dir, 'Release/uncrustify-trinity.exe'), -+ s_path_join(bd_dir, 'RelWithDebInfo/uncrustify-trinity'), -+ s_path_join(bd_dir, 'RelWithDebInfo/uncrustify-trinity.exe'), -+ s_path_join(bd_dir, 'MinSizeRel/uncrustify-trinity'), -+ s_path_join(bd_dir, 'MinSizeRel/uncrustify-trinity.exe')] - for uncr_bin in bin_paths: - if not isfile(uncr_bin): - eprint("is not a file: %s" % uncr_bin) diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/003_allow_older_distributions.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/003_allow_older_distributions.diff deleted file mode 100644 index 3781601a..00000000 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/003_allow_older_distributions.diff +++ /dev/null @@ -1,40 +0,0 @@ -Index: b/CMakeLists.txt -=================================================================== ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.2) -+cmake_minimum_required(VERSION 3.0) - - project(uncrustify-trinity) - -@@ -51,8 +51,12 @@ - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") - endif() - --set(CMAKE_CXX_STANDARD 11) --set(CMAKE_CXX_STANDARD_REQUIRED YES) -+if( ${CMAKE_VERSION} VERSION_LESS "3.1" ) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") -+else() -+ set(CMAKE_CXX_STANDARD 11) -+ set(CMAKE_CXX_STANDARD_REQUIRED YES) -+endif() - - if(ENABLE_SANITIZER) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O1 -fno-omit-frame-pointer -fsanitize=${ENABLE_SANITIZER}") -@@ -139,8 +143,13 @@ - else() - # Add target to generate version header; - # do this every build to ensure git SHA is up to date -+ if( ${CMAKE_VERSION} VERSION_LESS "3.2" ) -+ set( VERSION_HEADER_BYPRODUCTS "" ) -+ else() -+ set( VERSION_HEADER_BYPRODUCTS "BYPRODUCTS" "${PROJECT_BINARY_DIR}/uncrustify_version.h" ) -+ endif() - add_custom_target(generate_version_header -- BYPRODUCTS "${PROJECT_BINARY_DIR}/uncrustify_version.h" -+ ${VERSION_HEADER_BYPRODUCTS} - COMMAND - ${CMAKE_COMMAND} - -D PYTHON_EXECUTABLE:STRING=${PYTHON_EXECUTABLE} diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/004_fixed_usage.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/004_fixed_usage.diff deleted file mode 100644 index 1d6fd0bf..00000000 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/004_fixed_usage.diff +++ /dev/null @@ -1,51 +0,0 @@ -Fixed usage message to match uncrustify-trinity. ---- a/src/uncrustify.cpp -+++ b/src/uncrustify.cpp -@@ -309,14 +309,14 @@ - " --decode : Decode remaining args (chunk flags) and exit.\n" - "\n" - "Usage Examples\n" -- "cat foo.d | uncrustify -q -c my.cfg -l d\n" -- "uncrustify -c my.cfg -f foo.d\n" -- "uncrustify -c my.cfg -f foo.d -L0-2,20-23,51\n" -- "uncrustify -c my.cfg -f foo.d -o foo.d\n" -- "uncrustify -c my.cfg foo.d\n" -- "uncrustify -c my.cfg --replace foo.d\n" -- "uncrustify -c my.cfg --no-backup foo.d\n" -- "uncrustify -c my.cfg --prefix=out -F files.txt\n" -+ "cat foo.d | uncrustify-trinity -q -c my.cfg -l d\n" -+ "uncrustify-trinity -c my.cfg -f foo.d\n" -+ "uncrustify-trinity -c my.cfg -f foo.d -L0-2,20-23,51\n" -+ "uncrustify-trinity -c my.cfg -f foo.d -o foo.d\n" -+ "uncrustify-trinity -c my.cfg foo.d\n" -+ "uncrustify-trinity -c my.cfg --replace foo.d\n" -+ "uncrustify-trinity -c my.cfg --no-backup foo.d\n" -+ "uncrustify-trinity -c my.cfg --prefix=out -F files.txt\n" - "\n" - "Note: Use comments containing ' *INDENT-OFF*' and ' *INDENT-ON*' to disable\n" - " processing of parts of the source file (these can be overridden with\n" ---- a/tests/cli/output/help.txt -+++ b/tests/cli/output/help.txt -@@ -60,14 +60,14 @@ - --decode : Decode remaining args (chunk flags) and exit. - - Usage Examples --cat foo.d | uncrustify -q -c my.cfg -l d --uncrustify -c my.cfg -f foo.d --uncrustify -c my.cfg -f foo.d -L0-2,20-23,51 --uncrustify -c my.cfg -f foo.d -o foo.d --uncrustify -c my.cfg foo.d --uncrustify -c my.cfg --replace foo.d --uncrustify -c my.cfg --no-backup foo.d --uncrustify -c my.cfg --prefix=out -F files.txt -+cat foo.d | uncrustify-trinity -q -c my.cfg -l d -+uncrustify-trinity -c my.cfg -f foo.d -+uncrustify-trinity -c my.cfg -f foo.d -L0-2,20-23,51 -+uncrustify-trinity -c my.cfg -f foo.d -o foo.d -+uncrustify-trinity -c my.cfg foo.d -+uncrustify-trinity -c my.cfg --replace foo.d -+uncrustify-trinity -c my.cfg --no-backup foo.d -+uncrustify-trinity -c my.cfg --prefix=out -F files.txt - - Note: Use comments containing ' *INDENT-OFF*' and ' *INDENT-ON*' to disable - processing of parts of the source file (these can be overridden with diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/005_upstream_45681e88.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/005_upstream_45681e88.diff deleted file mode 100644 index f4d8cb3b..00000000 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/005_upstream_45681e88.diff +++ /dev/null @@ -1,30 +0,0 @@ -Backported commit 45681e88 from upstream git repository. This fixes FTBFS on ppcel and armxx archs. ---- a/src/output.cpp -+++ b/src/output.cpp -@@ -544,11 +544,7 @@ - { - for (auto *ch = pc->text(); *ch != '\0'; ++ch) - { -- if ( *ch > 0 -- || !chunk_is_token(pc, CT_COMMENT_MULTI)) -- { -- fprintf(pfile, "%c", *ch); -- } -+ fprintf(pfile, "%c", *ch); - - if (*ch == '"') - { ---- a/tests/cli/output/class_enum_struct_union.csv -+++ b/tests/cli/output/class_enum_struct_union.csv -@@ -1,9 +1,9 @@ - number of loops,4, - language,CPP, - Line,Tag,Parent_type,Type of the parent,Column,Orig Col Strt,Orig Col End,Orig Sp Before,Br,Lvl,pp,Flags,Nl Before,Nl After,Text, --1,COMMENT_MULTI,COMMENT_WHOLE,PARENT_NOT_SET,1,4,7,3,0,0,0,"",9,0," /** * the enum (and variable declarations thereof) could be of * the following forms: * * ""enum type [: integral_type] { ... } [x, ...]"" * ""enum type [: integral_type]"" * ""enum class type [: integral_type] { ... } [x, ...]"" * ""enum class type [: integral_type]"" * ""enum [: integral_type] { ... } x, ..."" */" -+1,COMMENT_MULTI,COMMENT_WHOLE,PARENT_NOT_SET,1,4,7,3,0,0,0,"",9,0," /** * the enum (and variable declarations thereof) could be of * the following forms: * * ""enum type [: integral_type] { ... } [x, ...]"" * ""enum type [: integral_type]"" * ""enum class type [: integral_type] { ... } [x, ...]"" * ""enum class type [: integral_type]"" * ""enum [: integral_type] { ... } x, ..."" */" - 10,NEWLINE,NONE,PARENT_NOT_SET,7,7,4,0,0,0,0,"",2,0, --12,COMMENT_MULTI,COMMENT_WHOLE,PARENT_NOT_SET,1,4,7,0,0,0,0,"",9,0," /** * the class/struct (and variable declarations thereof) could be of * the following forms: * * template<...> class/struct[<...>] [macros/attributes ...] type [: bases ...] { } * template<...> class/struct[<...>] [macros/attributes ...] type * class/struct[ [macros/attributes ...] type [: bases ...] { } [x, ...] * class/struct [macros/attributes ...] type [x, ...] * class/struct [macros/attributes ...] [: bases] { } x, ... */" -+12,COMMENT_MULTI,COMMENT_WHOLE,PARENT_NOT_SET,1,4,7,0,0,0,0,"",9,0," /** * the class/struct (and variable declarations thereof) could be of * the following forms: * * template<...> class/struct[<...>] [macros/attributes ...] type [: bases ...] { } * template<...> class/struct[<...>] [macros/attributes ...] type * class/struct[ [macros/attributes ...] type [: bases ...] { } [x, ...] * class/struct [macros/attributes ...] type [x, ...] * class/struct [macros/attributes ...] [: bases] { } x, ... */" - 21,NEWLINE,NONE,PARENT_NOT_SET,7,7,1,0,0,0,0,"",2,0, - 23,PREPROC,PP_DEFINE,PARENT_NOT_SET,1,1,2,0,1,1,0,"IN_PREPROC,STMT_START,EXPR_START,DONT_INDENT,PUNCTUATOR",0,0," #" - 23,PP_DEFINE,NONE,PARENT_NOT_SET,2,2,8,0,1,1,0,"IN_PREPROC,FORCE_SPACE",0,0," define" diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/006_upstream_64d93e3fb.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/006_upstream_64d93e3fb.diff deleted file mode 100644 index ca26d397..00000000 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/006_upstream_64d93e3fb.diff +++ /dev/null @@ -1,25 +0,0 @@ -Backported commit 64d93e3fb from upstream git repository. ---- a/src/align_func_proto.cpp -+++ b/src/align_func_proto.cpp -@@ -47,8 +47,8 @@ - log_rule_B("align_var_def_amp_style"); - size_t myamp_style = options::align_var_def_amp_style(); - -- const size_t max_level_count = 8; -- const size_t max_brace_level = 8; -+ const size_t max_level_count = 16; -+ const size_t max_brace_level = 16; - - AlignStack many_as[max_level_count + 1][max_brace_level + 1]; - ---- a/src/logger.cpp -+++ b/src/logger.cpp -@@ -194,7 +194,7 @@ - return; - } - // the value of buffer_length is experimental -- const int buffer_length = 4100; -+ const int buffer_length = 40000; - char buf[buffer_length]; - - // it MUST be a 'unsigned int' variable to be runable under windows diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/007_issue_3040.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/007_issue_3040.diff deleted file mode 100644 index 99d4887f..00000000 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/007_issue_3040.diff +++ /dev/null @@ -1,183 +0,0 @@ -Backported commits 5f3f392a and fb66774e from upstream. This solves upstream issues 3040. - ---- a/src/braces.cpp -+++ b/src/braces.cpp -@@ -1290,7 +1290,7 @@ - static chunk_t *mod_case_brace_add(chunk_t *cl_colon) - { - LOG_FUNC_ENTRY(); -- LOG_FMT(LMCB, "%s(%d): line %zu", -+ LOG_FMT(LMCB, "%s(%d): line %zu\n", - __func__, __LINE__, cl_colon->orig_line); - - chunk_t *pc = cl_colon; -@@ -1309,7 +1309,28 @@ - && ( chunk_is_token(pc, CT_CASE) - || chunk_is_token(pc, CT_BREAK))) - { -- last = pc; -+ // check if previous line is a preprocessor Issue #3040 -+ chunk_t *prev = chunk_get_prev_ncnl(pc); -+ LOG_FMT(LMCB, "%s(%d): prev->text() is '%s', orig_line %zu\n", -+ __func__, __LINE__, prev->text(), prev->orig_line); -+ -+ if ( chunk_is_preproc(prev) -+ && chunk_is_not_token(prev, CT_PP_ENDIF)) -+ { -+ // previous line is a preprocessor, but NOT #endif -+ while (chunk_is_preproc(prev)) -+ { -+ prev = chunk_get_prev_ncnl(prev); -+ } -+ chunk_t *next_prev = chunk_get_next_ncnl(prev); -+ LOG_FMT(LMCB, "%s(%d): next_prev->text() is '%s', orig_line %zu\n", -+ __func__, __LINE__, next_prev->text(), next_prev->orig_line); -+ last = next_prev; -+ } -+ else -+ { -+ last = pc; -+ } - break; - } - } ---- /dev/null -+++ b/tests/config/Issue_3040.cfg -@@ -0,0 +1,7 @@ -+indent_columns = 2 -+indent_switch_case = 2 -+nl_before_case = true -+nl_after_case = true -+eat_blanks_before_close_brace = true -+mod_move_case_break = true -+mod_case_brace = force ---- a/tests/cpp.test -+++ b/tests/cpp.test -@@ -827,6 +827,7 @@ - 34322 issue_2623_1.cfg cpp/issue_2623.cpp - 34323 issue_2623_2.cfg cpp/issue_2623.cpp - 34324 issue_2623_3.cfg cpp/issue_2623.cpp -+34326 Issue_3040.cfg cpp/Issue_3040.cpp - - # Adopt some UT tests - 10000 empty.cfg cpp/621_this-spacing.cpp ---- /dev/null -+++ b/tests/expected/cpp/34326-Issue_3040.cpp -@@ -0,0 +1,62 @@ -+void main() -+{ -+ switch (opcode ) { -+ -+ case LocaleCompare: -+ { -+ return Number(localeCompare(s, a0.toString(exec))); -+ } -+ -+#ifndef KJS_PURE_ECMA -+ case Big: -+ { -+ result = String("<big>" + s + "</big>"); -+ break; -+ } -+#endif -+ } -+ -+ switch (ev->command) -+ { -+ case (MIDI_NOTEON): -+ { -+ ev->note = *ptrdata; ptrdata++; currentpos++; -+ ev->vel = *ptrdata; ptrdata++; currentpos++; -+ if (ev->vel==0) -+ note[ev->chn][ev->note]=FALSE; -+ else -+ note[ev->chn][ev->note]=TRUE; -+ -+#ifdef TRACKDEBUG2 -+ if (ev->chn==6) { -+ if (ev->vel==0) printfdebug("Note Onf\n"); -+ else printfdebug("Note On\n"); -+ }; -+#endif -+ break; -+ } -+ -+ case (MIDI_NOTEOFF): -+ { -+#ifdef TRACKDEBUG2 -+ if (ev->chn==6) printfdebug("Note Off\n"); -+#endif -+ ev->note = *ptrdata; ptrdata++; currentpos++; -+ ev->vel = *ptrdata; ptrdata++; currentpos++; -+ note[ev->chn][ev->note]=FALSE; -+ -+ break; -+ } -+ -+ case (MIDI_KEY_PRESSURE): -+ { -+#ifdef TRACKDEBUG2 -+ if (ev->chn==6) printfdebug ("Key press\n"); -+#endif -+ ev->note = *ptrdata; ptrdata++; currentpos++; -+ ev->vel = *ptrdata; ptrdata++; currentpos++; -+ break; -+ } -+ } -+} -+ ---- /dev/null -+++ b/tests/input/cpp/Issue_3040.cpp -@@ -0,0 +1,52 @@ -+void main() -+{ -+ switch (opcode ) { -+ -+ case LocaleCompare: -+ return Number(localeCompare(s, a0.toString(exec))); -+ -+#ifndef KJS_PURE_ECMA -+ case Big: -+ result = String("<big>" + s + "</big>"); -+ break; -+#endif -+ -+ } -+ -+ switch (ev->command) -+ { -+ case (MIDI_NOTEON): -+ ev->note = *ptrdata; ptrdata++; currentpos++; -+ ev->vel = *ptrdata; ptrdata++; currentpos++; -+ if (ev->vel==0) -+ note[ev->chn][ev->note]=FALSE; -+ else -+ note[ev->chn][ev->note]=TRUE; -+ -+#ifdef TRACKDEBUG2 -+ if (ev->chn==6) { -+ if (ev->vel==0) printfdebug("Note Onf\n"); -+ else printfdebug("Note On\n"); -+ }; -+#endif -+ break; -+ case (MIDI_NOTEOFF) : -+#ifdef TRACKDEBUG2 -+ if (ev->chn==6) printfdebug("Note Off\n"); -+#endif -+ ev->note = *ptrdata;ptrdata++;currentpos++; -+ ev->vel = *ptrdata;ptrdata++;currentpos++; -+ note[ev->chn][ev->note]=FALSE; -+ -+ break; -+ case (MIDI_KEY_PRESSURE) : -+#ifdef TRACKDEBUG2 -+ if (ev->chn==6) printfdebug ("Key press\n"); -+#endif -+ ev->note = *ptrdata;ptrdata++;currentpos++; -+ ev->vel = *ptrdata;ptrdata++;currentpos++; -+ break; -+ -+ } -+} -+ diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/series b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/series deleted file mode 100644 index eb36bb0b..00000000 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/series +++ /dev/null @@ -1,7 +0,0 @@ -001_docs-remove-remote-images.patch -002_trinity_customization.diff -003_allow_older_distributions.diff -004_fixed_usage.diff -005_upstream_45681e88.diff -006_upstream_64d93e3fb.diff -007_issue_3040.diff diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/rules b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/rules deleted file mode 100755 index 2ed2ae90..00000000 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/rules +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/make -f - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -ifneq "$(wildcard /usr/bin/ninja)" "" -MAKE = ninja -v -DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR) -DEB_MAKE_INSTALL_TARGET = install -DEB_CMAKE_NORMAL_ARGS += -GNinja -endif - -%: - dh $@ - -override_dh_auto_configure: - dh_auto_configure $@ -- $(DEB_CMAKE_NORMAL_ARGS) -DUNCRUSTIFY_SEPARATE_TESTS=ON - -override_dh_clean: - dh_clean - rm -rf tests/results diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/source/format b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/source/format deleted file mode 100644 index 163aaf8d..00000000 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/source/options b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/source/options deleted file mode 100644 index d71748bb..00000000 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/source/options +++ /dev/null @@ -1,3 +0,0 @@ -# Use xz instead of gzip -compression = "xz" -compression-level = 9 diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/watch b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/watch deleted file mode 100644 index 9eb014c3..00000000 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/watch +++ /dev/null @@ -1,5 +0,0 @@ -version=4 -opts=dversionmangle=s/\+dfsg\d*$// \ -https://github.com/uncrustify/uncrustify/releases \ -(?:.*?/)?uncrustify-(\d[\d.]*)\.tar\.gz debian uupdate - |