From c1f7a0251136f6327d14a85eb5a761489551b668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 5 May 2018 19:24:03 +0200 Subject: New upstream release; refresh patches; remove upstream build artefacte --- debian/changelog | 9 +++++++++ debian/copyright | 10 +++++++++- debian/patches/0900-spelling-errors.patch | 6 +++--- 3 files changed, 21 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0b0ca17..2446221 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +xtrkcad (1:5.1.1-1) UNRELEASED; urgency=medium + + [ Jörg Frings-Fürst ] + * New upstream release. + - Refresh patches. + - Remove upstream build artefacte. + + -- Jörg Frings-Fürst Sat, 05 May 2018 18:22:45 +0200 + xtrkcad (1:5.1.0-1) unstable; urgency=medium [ Jörg Frings-Fürst ] diff --git a/debian/copyright b/debian/copyright index 1fa90d6..ea3ccd7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,7 +2,15 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: XTrkCAD Upstream-Contact: XTrkCAD Developers Source: http://sourceforge.net/projects/xtrkcad-fork/ -Files-Excluded: .hgtags .hgignore +Files-Excluded: .hgtags .hgignore CMakeCache.txt cmake_install.cmake + CPackConfig.cmake xtrkcad-config.h Makefile CTestTestfile.cmake + compile_commands.json CPackSourceConfig.cmake CMakeFiles/feature_tests.bin + CMakeFiles/3.6.2/CMakeDetermineCompilerABI_C.bin + CMakeFiles/3.6.2/CMakeDetermineCompilerABI_CXX.bin + CMakeFiles/3.6.2/CompilerIdC/a.out CMakeFiles/3.6.2/CompilerIdCXX/a.out + CMakeFiles/CMakeTmp app/bin/unittest/CMakeFiles/dxfformattest.dir/__ + app/doc/html app/i18n/de_DE/LC_MESSAGES app/i18n/fi/LC_MESSAGES + app/i18n/pt_BR/LC_MESSAGES app/i18n/de_DE app/i18n/fi app/i18n/pt_BR Files: * Copyright: 2003 Sillub Technology diff --git a/debian/patches/0900-spelling-errors.patch b/debian/patches/0900-spelling-errors.patch index e3cef33..e38b90b 100644 --- a/debian/patches/0900-spelling-errors.patch +++ b/debian/patches/0900-spelling-errors.patch @@ -102,7 +102,7 @@ Index: trunk/app/bin/ccontrol.c +++ trunk/app/bin/ccontrol.c @@ -383,7 +383,7 @@ static paramData_t controlEditPLs[] = { #define I_CONTROLNAME (0) - /*0*/ { PD_STRING, controlEditName, "name", PDO_NOPREF, (void*)200, N_("Name") }, + /*0*/ { PD_STRING, controlEditName, "name", PDO_NOPREF | PDO_STRINGLIMITLENGTH, (void*)200, N_("Name"), 0, (void *)sizeof(controlEditName) }, #define I_ORIGX (1) - /*1*/ { PD_FLOAT, &controlEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Orgin X") }, + /*1*/ { PD_FLOAT, &controlEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Origin X") }, @@ -115,7 +115,7 @@ Index: trunk/app/bin/csensor.c +++ trunk/app/bin/csensor.c @@ -355,7 +355,7 @@ static paramData_t sensorEditPLs[] = { #define I_SENSORNAME (0) - /*0*/ { PD_STRING, sensorEditName, "name", PDO_NOPREF, (void*)200, N_("Name") }, + /*0*/ { PD_STRING, sensorEditName, "name", PDO_NOPREF|PDO_STRINGLIMITLENGTH, (void*)200, N_("Name"), 0, (void *)sizeof(sensorEditName) }, #define I_ORIGX (1) - /*1*/ { PD_FLOAT, &sensorEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Orgin X") }, + /*1*/ { PD_FLOAT, &sensorEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Origin X") }, @@ -128,7 +128,7 @@ Index: trunk/app/bin/csignal.c +++ trunk/app/bin/csignal.c @@ -483,7 +483,7 @@ static paramData_t signalEditPLs[] = { #define I_SIGNALNAME (0) - /*0*/ { PD_STRING, signalEditName, "name", PDO_NOPREF, (void*)200, N_("Name") }, + /*0*/ { PD_STRING, signalEditName, "name", PDO_NOPREF|PDO_STRINGLIMITLENGTH, (void*)200, N_("Name"), 0, (void *)sizeof(signalEditName) }, #define I_ORIGX (1) - /*1*/ { PD_FLOAT, &signalEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Orgin X") }, + /*1*/ { PD_FLOAT, &signalEditOrig.x, "origx", PDO_DIM, &r_1000_1000, N_("Origin X") }, -- cgit v1.2.3