[gmsh] 01/04: update license patch

[Nico Schlömer]

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

nschloe-guest pushed a commit to branch master
in repository gmsh.

commit c776245f13a698ad1f039cf0e8b5dc6f7fe13094
Author: Nico Schlömer <nico.schloemer at gmail.com>
Date:   Fri Sep 22 18:19:51 2017 +0200

    update license patch
---
 debian/patches/20_skip_license_file.patch | 54 +++++++++++++++++++------------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/debian/patches/20_skip_license_file.patch b/debian/patches/20_skip_license_file.patch
index 588e7e7..94ec609 100644
--- a/debian/patches/20_skip_license_file.patch
+++ b/debian/patches/20_skip_license_file.patch
@@ -1,26 +1,40 @@
 Description: skips LICENSE.txt during installation. All information is in debian/copyright.
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-11-28
+Author: Anton Gladky <gladky.anton at gmail.com>, Nico Schlömer <nico.schloemer at gmail.com>
+Last-Update: 2017-09-22
 
-Index: gmsh-2.15.0-source/CMakeLists.txt
-===================================================================
---- gmsh-2.15.0-source.orig/CMakeLists.txt
-+++ gmsh-2.15.0-source/CMakeLists.txt
-@@ -1571,7 +1571,7 @@ if(UNIX)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b71bb6e5..bc804023 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1578,7 +1578,6 @@ if(UNIX)
  endif(UNIX)
  
  set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
--set(LICENSE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/LICENSE.txt)
-+#set(LICENSE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/LICENSE.txt)
- set(CREDITS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/CREDITS.txt)
+-set(LICENSE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt)
+ set(CREDITS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/CREDITS.txt)
+ set(CHANGELOG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/CHANGELOG.txt)
  set(ONELAB_PY ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab/python/onelab.py)
- file(GLOB TUTORIAL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tutorial/?*.*)
-@@ -1738,7 +1738,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
- if(MAKEINFO AND TEXI2PDF)
-   add_custom_target(doc COMMAND ${CMAKE_COMMAND} -E tar zcf
-                     ${CMAKE_CURRENT_BINARY_DIR}/gmsh-${GMSH_VERSION}-doc.tgz
--                    doc/CREDITS.txt doc/LICENSE.txt doc/VERSIONS.txt
-+                    doc/CREDITS.txt doc/VERSIONS.txt
-                     doc/gmsh.1 doc/texinfo/gmsh.html doc/texinfo/gmsh.info
-                     doc/texinfo/gmsh.pdf doc/texinfo/gmsh.txt
-                     COMMAND ${CMAKE_COMMAND} -E remove ${TEX_OBJ}
+@@ -1628,7 +1627,6 @@ if(WIN32 OR CYGWIN)
+   if(CYGWIN)
+     unix2dos(GMSH_API)
+     unix2dos(WELCOME_FILE)
+-    unix2dos(LICENSE_FILE)
+     unix2dos(CREDITS_FILE)
+     unix2dos(CHANGELOG_FILE)
+     unix2dos(TUTORIAL_FILES)
+@@ -1702,7 +1700,6 @@ if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
+   install(FILES ${GMSH_API} DESTINATION include/gmsh)
+ endif(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
+ install(FILES ${WELCOME_FILE} DESTINATION ${GMSH_DOC} RENAME README.txt)
+-install(FILES ${LICENSE_FILE} DESTINATION ${GMSH_DOC})
+ install(FILES ${CREDITS_FILE} DESTINATION ${GMSH_DOC})
+ install(FILES ${CHANGELOG_FILE} DESTINATION ${GMSH_DOC})
+ install(FILES ${TUTORIAL_FILES} DESTINATION ${GMSH_DOC}/tutorial)
+@@ -1804,7 +1801,6 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
+     "3D finite element mesh generator with built-in CAD engine and post-processor")
+ set(CPACK_PACKAGE_FILE_NAME gmsh-${GMSH_VERSION}-${GMSH_OS})
+ set(CPACK_PACKAGE_INSTALL_DIRECTORY "Gmsh")
+-set(CPACK_RESOURCE_FILE_LICENSE ${LICENSE_FILE})
+ set(CPACK_RESOURCE_FILE_README ${WELCOME_FILE})
+ set(CPACK_RESOURCE_FILE_WELCOME ${WELCOME_FILE})
+ set(CPACK_PACKAGE_EXECUTABLE "gmsh;Gmsh")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gmsh.git