From: Carsten Schoenert <c.schoenert@t-online.de>
Date: Sat, 17 Dec 2016 19:11:25 +0000 (+0100)
Subject: Removing hyphen inside KICAD_FULL_VERSION
X-Git-Tag: archive/raspbian/6.0.2+dfsg-1+rpi1~1^2^2^2^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=91df73074fa535fdab8b3373d6f9dc5250ccb7ba;p=kicad.git

Removing hyphen inside KICAD_FULL_VERSION

Upstream is providing the possibility to append various strings into the
KICAD_FULL_VERSION if needed. We can use this to append the debian
specific version on the upstream version.
For this the KICAD_FULL_VERSION needs to be merged without the hyphen
'-' so the version is reflecting the debian version in real.

Gbp-Pq: Topic debian-hacks
Gbp-Pq: Name Removing-hyphen-inside-KICAD_FULL_VERSION.patch
---

diff --git a/CMakeModules/WriteVersionHeader.cmake b/CMakeModules/WriteVersionHeader.cmake
index d58c39b4..a550764a 100644
--- a/CMakeModules/WriteVersionHeader.cmake
+++ b/CMakeModules/WriteVersionHeader.cmake
@@ -39,7 +39,7 @@ set( KICAD_VERSION_FULL "${KICAD_VERSION}" )
 
 # Optional user version information defined at configuration.
 if( KICAD_VERSION_EXTRA )
-    set( KICAD_VERSION_FULL "${KICAD_VERSION_FULL}-${KICAD_VERSION_EXTRA}" )
+    set( KICAD_VERSION_FULL "${KICAD_VERSION_FULL}${KICAD_VERSION_EXTRA}" )
 endif()
 
 set( _wvh_new_version_text