[hamradio-commits] [cubicsdr] 06/07: Refresh patches

Andreas E. Bombe aeb at moszumanska.debian.org
Thu Jan 25 01:57:49 UTC 2018


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

aeb pushed a commit to annotated tag debian/0.2.3+dfsg-1
in repository cubicsdr.

commit a7fa3a4518f045dd14b5a5e0508e12546ae3abf8
Author: Andreas Bombe <aeb at debian.org>
Date:   Thu Jan 25 02:14:33 2018 +0100

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

diff --git a/debian/patches/disable-deb-processing b/debian/patches/disable-deb-processing
index 0081c6e..f716454 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
-@@ -1023,9 +1023,6 @@
+@@ -1031,9 +1031,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)
  
-@@ -1077,8 +1074,6 @@
+@@ -1085,8 +1082,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 d23d19e..3c7afbf 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
-@@ -671,7 +671,7 @@
+@@ -679,7 +679,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 8ab3369..5670a34 100644
--- a/debian/patches/use-system-tinyxml
+++ b/debian/patches/use-system-tinyxml
@@ -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})
-@@ -391,10 +396,6 @@
+@@ -395,10 +400,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
  )
  
-@@ -498,8 +499,6 @@
+@@ -506,8 +507,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



More information about the pkg-hamradio-commits mailing list