[med-svn] [beads] 06/10: Fix some whitespace errors in patches

Andreas Tille tille at debian.org
Sat Oct 21 13:37:39 UTC 2017


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

tille pushed a commit to branch master
in repository beads.

commit ec403ff50c0acf7210cf94529205a5f48e617e75
Author: Andreas Tille <tille at debian.org>
Date:   Sat Oct 21 14:02:27 2017 +0200

    Fix some whitespace errors in patches
---
 debian/patches/installation.patch | 22 +++++++++++-----------
 debian/patches/rpath.patch        | 34 +++++++++++++++++-----------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/debian/patches/installation.patch b/debian/patches/installation.patch
index 15a7b8a..f5f1c13 100644
--- a/debian/patches/installation.patch
+++ b/debian/patches/installation.patch
@@ -5,14 +5,14 @@ Description: CMakeFiles.txt assumed in-source build
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -186,8 +186,8 @@
- # the project's entire directory structure.
- SUBDIRS (src)
- 
--INSTALL(PROGRAMS src/beads DESTINATION bin)
--INSTALL(PROGRAMS src/qtbeads/qtbeads DESTINATION bin)
-+INSTALL(PROGRAMS "${CMAKE_BINARY_DIR}/src/beads" DESTINATION bin)
-+INSTALL(PROGRAMS "${CMAKE_BINARY_DIR}/src/qtbeads/qtbeads" DESTINATION bin)
- #INSTALL(DIRECTORY doc/man1 DESTINATION share/man/man1)
- INSTALL(FILES doc/man1/beads.1 DESTINATION share/man/man1)
- INSTALL(FILES share/applications/beads.desktop DESTINATION share/applications)
+@@ -186,8 +186,8 @@ SET(CPACK_STRIP_FILES "src/beads;src/qtb
+ # the project's entire directory structure.
+ SUBDIRS (src)
+ 
+-INSTALL(PROGRAMS src/beads DESTINATION bin)
+-INSTALL(PROGRAMS src/qtbeads/qtbeads DESTINATION bin)
++INSTALL(PROGRAMS "${CMAKE_BINARY_DIR}/src/beads" DESTINATION bin)
++INSTALL(PROGRAMS "${CMAKE_BINARY_DIR}/src/qtbeads/qtbeads" DESTINATION bin)
+ #INSTALL(DIRECTORY doc/man1 DESTINATION share/man/man1)
+ INSTALL(FILES doc/man1/beads.1 DESTINATION share/man/man1)
+ INSTALL(FILES share/applications/beads.desktop DESTINATION share/applications)
diff --git a/debian/patches/rpath.patch b/debian/patches/rpath.patch
index f4b1113..91657b3 100644
--- a/debian/patches/rpath.patch
+++ b/debian/patches/rpath.patch
@@ -6,20 +6,20 @@ Description: Remove unusual statements, which gets rid of rpath.
 
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -34,7 +34,6 @@
- ELSE(WIN32)
- 	FIND_PACKAGE(X11 REQUIRED)
- 	
--	INCLUDE_DIRECTORIES(X11_INCLUDE_DIR)
- 	# X11_FOUND is true if X11 is available.
- 	#    * X11_INCLUDE_DIR contains the include directories to use X11.
- 	#    * X11_LIBRARIES points to the libraries to link against to use X11.
-@@ -44,8 +43,6 @@
- 	ADD_DEFINITIONS(${PTHREADS_DEFINITIONS})
- 	# -m -pthread FindThreads
- 	
--	# Make sure the linker can find the Hello library once it is built.
--	link_directories (${X11_INCLUDE_DIR})
- ENDIF(WIN32)
- 
- 
+@@ -34,7 +34,6 @@ IF(WIN32)
+ ELSE(WIN32)
+ 	FIND_PACKAGE(X11 REQUIRED)
+ 	
+-	INCLUDE_DIRECTORIES(X11_INCLUDE_DIR)
+ 	# X11_FOUND is true if X11 is available.
+ 	#    * X11_INCLUDE_DIR contains the include directories to use X11.
+ 	#    * X11_LIBRARIES points to the libraries to link against to use X11.
+@@ -44,8 +43,6 @@ ELSE(WIN32)
+ 	ADD_DEFINITIONS(${PTHREADS_DEFINITIONS})
+ 	# -m -pthread FindThreads
+ 	
+-	# Make sure the linker can find the Hello library once it is built.
+-	link_directories (${X11_INCLUDE_DIR})
+ ENDIF(WIN32)
+ 
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/beads.git



More information about the debian-med-commit mailing list