[neon/neon-packaging/dbc-parser-cpp/Neon/unstable] debian/patches: split into patches

[Carlos De Maine]

Git commit 8c3dc8b70f23d7e445ee931e0ab305b9806fc3b3 by Carlos De Maine.
Committed on 01/04/2023 at 02:18.
Pushed by carlosdem into branch 'Neon/unstable'.

split into patches

M  +1    -27   debian/patches/0001_labplot_patches
C  +1    -26   debian/patches/0002_labplot_patches [from: debian/patches/0001_labplot_patches - 052% similarity]
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/neon-packaging/dbc-parser-cpp/commit/8c3dc8b70f23d7e445ee931e0ab305b9806fc3b3

diff --git a/debian/patches/0001_labplot_patches b/debian/patches/0001_labplot_patches
index c7a8a75..82aad7b 100644
--- a/debian/patches/0001_labplot_patches
+++ b/debian/patches/0001_labplot_patches
@@ -20,30 +20,4 @@ index c92cc3e..c1ea0f4 100644
 +				signal_re("\\s(SG_)\\s(\\w+)\\s\\:\\s(\\d+)\\|(\\d+)\\@(\\d+)(\\+|\\-)\\s\\((-?\\d+\\.?(\\d+)?)\\,(-?\\d+\\.?(\\d+)?)\\)\\s\\[(-?\\d+\\.?(\\d+)?)\\|(-?\\d+\\.?(\\d+)?)\\]\\s\"(\\w*)\"\\s([\\w\\,]+|Vector__XXX)*") {
  
  	}
- 
-
-From 076057bffe6e5da4748467d97fc7e353f93376c2 Mon Sep 17 00:00:00 2001
-From: Martin Marmsoler <martin.marmsoler at gmail.com>
-Date: Fri, 6 Jan 2023 10:01:10 +0100
-Subject: [PATCH 2/2] - signals can also contain special characters: SG_ Speed
- : 0|8 at 1+ (1,0) [0|204] "Km/h"  DEVICE1,DEVICE2,DEVICE3 - multiple whitespaces
- at the end:  SG_ TEMPERATURE : 48|16 at 1+ (0.01,-40) [-40|125] "C" 
- DEVICE1,DEVICE2,DEVICE3
-
----
- src/dbc.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/dbc.cpp b/src/dbc.cpp
-index c1ea0f4..24bfad7 100644
---- a/src/dbc.cpp
-+++ b/src/dbc.cpp
-@@ -11,7 +11,7 @@ namespace libdbc {
- 				name_space_re("^(NS_)\\s\\:"), node_re("^(BU_:)\\s((?:[\\w]+?\\s?)*)"),
- 				message_re("^(BO_)\\s(\\d+)\\s(\\w+)\\:\\s(\\d+)\\s(\\w+|Vector__XXX)"),
- 				// NOTE: No multiplex support yet
--				signal_re("\\s(SG_)\\s(\\w+)\\s\\:\\s(\\d+)\\|(\\d+)\\@(\\d+)(\\+|\\-)\\s\\((-?\\d+\\.?(\\d+)?)\\,(-?\\d+\\.?(\\d+)?)\\)\\s\\[(-?\\d+\\.?(\\d+)?)\\|(-?\\d+\\.?(\\d+)?)\\]\\s\"(\\w*)\"\\s([\\w\\,]+|Vector__XXX)*") {
-+				signal_re("\\s(SG_)\\s(\\w+)\\s\\:\\s(\\d+)\\|(\\d+)\\@(\\d+)(\\+|\\-)\\s\\((-?\\d+\\.?(\\d+)?)\\,(-?\\d+\\.?(\\d+)?)\\)\\s\\[(-?\\d+\\.?(\\d+)?)\\|(-?\\d+\\.?(\\d+)?)\\]\\s\"(.*)\"\\s+([\\w\\,]+|Vector__XXX)*") {
- 
- 	}
- 
\ No newline at end of file
+  
\ No newline at end of file
diff --git a/debian/patches/0001_labplot_patches b/debian/patches/0002_labplot_patches
similarity index 52%
copy from debian/patches/0001_labplot_patches
copy to debian/patches/0002_labplot_patches
index c7a8a75..63a4f5e 100644
--- a/debian/patches/0001_labplot_patches
+++ b/debian/patches/0002_labplot_patches
@@ -1,27 +1,3 @@
-From 120ba2b46149ea6f8ea3b9f87adbd65d84e65de3 Mon Sep 17 00:00:00 2001
-From: Martin Marmsoler <martin.marmsoler at gmail.com>
-Date: Fri, 6 Jan 2023 09:50:48 +0100
-Subject: [PATCH 1/2] value can be negative example:  SG_ Signal : 16|11 at 1+
- (0.1,-102) [-102|102] "%"  DEVICE
-
----
- src/dbc.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/dbc.cpp b/src/dbc.cpp
-index c92cc3e..c1ea0f4 100644
---- a/src/dbc.cpp
-+++ b/src/dbc.cpp
-@@ -11,7 +11,7 @@ namespace libdbc {
- 				name_space_re("^(NS_)\\s\\:"), node_re("^(BU_:)\\s((?:[\\w]+?\\s?)*)"),
- 				message_re("^(BO_)\\s(\\d+)\\s(\\w+)\\:\\s(\\d+)\\s(\\w+|Vector__XXX)"),
- 				// NOTE: No multiplex support yet
--				signal_re("\\s(SG_)\\s(\\w+)\\s\\:\\s(\\d+)\\|(\\d+)\\@(\\d+)(\\+|\\-)\\s\\((\\d+\\.?(\\d+)?)\\,(\\d+\\.?(\\d+)?)\\)\\s\\[(-?\\d+\\.?(\\d+)?)\\|(-?\\d+\\.?(\\d+)?)\\]\\s\"(\\w*)\"\\s([\\w\\,]+|Vector__XXX)*") {
-+				signal_re("\\s(SG_)\\s(\\w+)\\s\\:\\s(\\d+)\\|(\\d+)\\@(\\d+)(\\+|\\-)\\s\\((-?\\d+\\.?(\\d+)?)\\,(-?\\d+\\.?(\\d+)?)\\)\\s\\[(-?\\d+\\.?(\\d+)?)\\|(-?\\d+\\.?(\\d+)?)\\]\\s\"(\\w*)\"\\s([\\w\\,]+|Vector__XXX)*") {
- 
- 	}
- 
-
 From 076057bffe6e5da4748467d97fc7e353f93376c2 Mon Sep 17 00:00:00 2001
 From: Martin Marmsoler <martin.marmsoler at gmail.com>
 Date: Fri, 6 Jan 2023 10:01:10 +0100
@@ -45,5 +21,4 @@ index c1ea0f4..24bfad7 100644
 -				signal_re("\\s(SG_)\\s(\\w+)\\s\\:\\s(\\d+)\\|(\\d+)\\@(\\d+)(\\+|\\-)\\s\\((-?\\d+\\.?(\\d+)?)\\,(-?\\d+\\.?(\\d+)?)\\)\\s\\[(-?\\d+\\.?(\\d+)?)\\|(-?\\d+\\.?(\\d+)?)\\]\\s\"(\\w*)\"\\s([\\w\\,]+|Vector__XXX)*") {
 +				signal_re("\\s(SG_)\\s(\\w+)\\s\\:\\s(\\d+)\\|(\\d+)\\@(\\d+)(\\+|\\-)\\s\\((-?\\d+\\.?(\\d+)?)\\,(-?\\d+\\.?(\\d+)?)\\)\\s\\[(-?\\d+\\.?(\\d+)?)\\|(-?\\d+\\.?(\\d+)?)\\]\\s\"(.*)\"\\s+([\\w\\,]+|Vector__XXX)*") {
  
- 	}
- 
\ No newline at end of file
+ 	}
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 2771d7c..95d6749 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001_labplot_patches
+0002_labplot_patches