[med-svn] r20929 - trunk/packages/libquazip/trunk/debian/patches

[Andreas Tille]

Author: tille
Date: 2016-01-01 22:58:13 +0000 (Fri, 01 Jan 2016)
New Revision: 20929

Added:
   trunk/packages/libquazip/trunk/debian/patches/change_suffix.patch
Modified:
   trunk/packages/libquazip/trunk/debian/patches/series
Log:
Enable changing suffix


Added: trunk/packages/libquazip/trunk/debian/patches/change_suffix.patch
===================================================================
--- trunk/packages/libquazip/trunk/debian/patches/change_suffix.patch	                        (rev 0)
+++ trunk/packages/libquazip/trunk/debian/patches/change_suffix.patch	2016-01-01 22:58:13 UTC (rev 20929)
@@ -0,0 +1,35 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 01 Jan 2016 23:40:15 +0100
+Bug-Debian: https://bugs.debian.org/805087
+Description: Enable changing suffix
+ Patch was obtained from upstream SVN
+   http://sourceforge.net/p/quazip/code/257/
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,4 +51,4 @@ set(LIB_DESTINATION "${CMAKE_INSTALL_PRE
+ 
+ add_subdirectory(quazip)
+ 
+-install(FILES FindQuaZip.cmake DESTINATION ${CMAKE_ROOT}/Modules)
++install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION ${CMAKE_ROOT}/Modules)
+--- a/FindQuaZip.cmake
++++ b/FindQuaZip.cmake
+@@ -30,7 +30,7 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIB
+ 		)
+ 		FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
+ 			HINTS /usr/include /usr/local/include
+-			PATH_SUFFIXES quazip
++			PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
+ 		)
+ 		FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
+ 	ENDIF (WIN32)
+--- a/quazip/CMakeLists.txt
++++ b/quazip/CMakeLists.txt
+@@ -19,5 +19,5 @@ set_target_properties(quazip PROPERTIES
+ # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty)
+ target_link_libraries(quazip ${QT_QTMAIN_LIBRARY} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARIES})
+ 
+-install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip)
++install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX})
+ install(TARGETS quazip LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})

Modified: trunk/packages/libquazip/trunk/debian/patches/series
===================================================================
--- trunk/packages/libquazip/trunk/debian/patches/series	2016-01-01 22:49:19 UTC (rev 20928)
+++ trunk/packages/libquazip/trunk/debian/patches/series	2016-01-01 22:58:13 UTC (rev 20929)
@@ -4,3 +4,4 @@
 quazip-qt5-target-name.patch
 logo-breach.patch
 
+change_suffix.patch