[hamradio-commits] [limesuite] 04/08: Refresh patches

[Andreas E. Bombe]

This is an automated email from the git hooks/post-receive script.

aeb pushed a commit to branch master
in repository limesuite.

commit cbdd744497f48203af0826115afd87bdab266097
Author: Andreas Bombe <aeb at debian.org>
Date:   Thu Jan 12 00:38:40 2017 +0100

    Refresh patches
    
    Gbp-Dch: Ignore
---
 debian/patches/link-libatomic           | 2 +-
 debian/patches/override-build-timestamp | 4 ++--
 debian/patches/version-string           | 8 +++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/patches/link-libatomic b/debian/patches/link-libatomic
index 7eded07..2a3237a 100644
--- a/debian/patches/link-libatomic
+++ b/debian/patches/link-libatomic
@@ -7,7 +7,7 @@ Author: Andreas Bombe <aeb at debian.org>
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -97,6 +97,8 @@
+@@ -96,6 +96,8 @@
  list(APPEND LIME_SUITE_INCLUDES ${SQLITE3_INCLUDE_DIRS})
  list(APPEND LIME_SUITE_LIBRARIES ${SQLITE3_LIBRARIES})
  
diff --git a/debian/patches/override-build-timestamp b/debian/patches/override-build-timestamp
index 8059af0..8ef8b01 100644
--- a/debian/patches/override-build-timestamp
+++ b/debian/patches/override-build-timestamp
@@ -8,9 +8,9 @@ Author: Andreas Bombe <aeb at debian.org>
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -55,7 +55,12 @@
- endif()
+@@ -49,7 +49,12 @@
  
+ set(LIME_SUITE_LIBVER "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
  set(LIME_SUITE_VERSION "${LIME_SUITE_LIBVER}-${LIME_SUITE_EXTVER}")
 -string(TIMESTAMP BUILD_TIMESTAMP "%Y-%m-%d")
 +
diff --git a/debian/patches/version-string b/debian/patches/version-string
index 628048d..19b02cb 100644
--- a/debian/patches/version-string
+++ b/debian/patches/version-string
@@ -11,7 +11,7 @@ Author: Andreas Bombe <aeb at debian.org>
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -42,19 +42,23 @@
+@@ -35,20 +35,25 @@
  # number if there are changes within the major.minor release series
  set(LIME_SUITE_SOVER "${VERSION_MAJOR}.${VERSION_MINOR}-1")
  
@@ -38,12 +38,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +	    set(LIME_SUITE_EXTVER "unknown")
 +	endif (GITHASH)
 +    endif()
- 
--set(LIME_SUITE_VERSION "${LIME_SUITE_LIBVER}-${LIME_SUITE_EXTVER}")
++
 +    set(LIME_SUITE_VERSION "${LIME_SUITE_LIBVER}-${LIME_SUITE_EXTVER}")
 +else (NOT OVERRIDE_LIME_SUITE_VERSION)
 +    set(LIME_SUITE_VERSION "${OVERRIDE_LIME_SUITE_VERSION}")
 +endif (NOT OVERRIDE_LIME_SUITE_VERSION)
  
+ set(LIME_SUITE_LIBVER "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+-set(LIME_SUITE_VERSION "${LIME_SUITE_LIBVER}-${LIME_SUITE_EXTVER}")
+ 
  if (NOT OVERRIDE_TIMESTAMP)
      message(FATAL_ERROR "OVERRIDE_TIMESTAMP not set")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/limesuite.git