[hamradio-commits] [cubicsdr] 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 cubicsdr.

commit 5fbd01472afa7d74847b1f6fe615e0272720ae2d
Author: Andreas Bombe <aeb at debian.org>
Date:   Mon Aug 21 20:40:02 2017 +0200

    Refresh patches
    
    Gbp-Dch: Ignore
---
 debian/patches/disable-deb-processing | 4 ++--
 debian/patches/link-libatomic         | 2 +-
 debian/patches/use-system-tinyxml     | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/disable-deb-processing b/debian/patches/disable-deb-processing
index b120817..0081c6e 100644
--- a/debian/patches/disable-deb-processing
+++ b/debian/patches/disable-deb-processing
@@ -4,7 +4,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
-@@ -988,9 +988,6 @@
+@@ -1023,9 +1023,6 @@
      set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro")
      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro")
  
@@ -14,7 +14,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CubicSDR.desktop.in"
              "${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.desktop" @ONLY IMMEDIATE)
  
-@@ -1042,8 +1039,6 @@
+@@ -1077,8 +1074,6 @@
      INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.desktop"
              DESTINATION share/applications)
          
diff --git a/debian/patches/link-libatomic b/debian/patches/link-libatomic
index da5c6ef..d23d19e 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/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -637,7 +637,7 @@
+@@ -671,7 +671,7 @@
          configure_files(${CUBICSDR_HEADER_IMAGE_DIR} ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} ${CUBICSDR_HEADER_IMAGE_FILE})
      ENDIF()
      add_executable(CubicSDR ${cubicsdr_sources} ${cubicsdr_headers} ${RES_FILES})
diff --git a/debian/patches/use-system-tinyxml b/debian/patches/use-system-tinyxml
index a64249d..8ab3369 100644
--- a/debian/patches/use-system-tinyxml
+++ b/debian/patches/use-system-tinyxml
@@ -6,7 +6,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
-@@ -137,6 +137,11 @@
+@@ -149,6 +149,11 @@
      SET( EX_PLATFORM_NAME "x86" )
  endif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
  
@@ -18,7 +18,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${EX_PLATFORM_NAME})
  SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${PROJECT_BINARY_DIR}/${EX_PLATFORM_NAME})
-@@ -379,10 +384,6 @@
+@@ -391,10 +396,6 @@
      src/forms/Dialog/AboutDialogBase.cpp
      src/forms/Dialog/AboutDialog.cpp
      external/lodepng/lodepng.cpp
@@ -29,7 +29,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      external/cubicvr2/math/cubic_math.cpp
  )
  
-@@ -486,8 +487,6 @@
+@@ -498,8 +499,6 @@
      src/forms/Dialog/AboutDialogBase.h
      src/forms/Dialog/AboutDialog.h
      external/lodepng/lodepng.h

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