[glfw3] 06/11: Drop cmake-config-fixes.patch -- applied upstream
James Cowgill
jcowgill at moszumanska.debian.org
Fri Jun 3 12:52:08 UTC 2016
This is an automated email from the git hooks/post-receive script.
jcowgill pushed a commit to branch master
in repository glfw3.
commit 8e165de3ab6c13e11b62c1efedd1251f844b7e3c
Author: James Cowgill <james410 at cowgill.org.uk>
Date: Fri Jun 3 01:38:18 2016 +0100
Drop cmake-config-fixes.patch -- applied upstream
---
debian/patches/cmake-config-fixes.patch | 28 ----------------------------
debian/patches/series | 1 -
2 files changed, 29 deletions(-)
diff --git a/debian/patches/cmake-config-fixes.patch b/debian/patches/cmake-config-fixes.patch
deleted file mode 100644
index 3cf6f8e..0000000
--- a/debian/patches/cmake-config-fixes.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Fix various paths in the CMake config files
- Based on commits in https://github.com/glfw/glfw/pull/460
-Author: James Cowgill <james410 at cowgill.org.uk>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -479,7 +479,7 @@
- include(CMakePackageConfigHelpers)
-
- if (UNIX)
-- set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/lib/cmake/glfw3/")
-+ set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/cmake/glfw3/")
- else()
- set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_PREFIX}/")
- endif()
-@@ -532,9 +532,9 @@
-
- install(FILES "${GLFW_BINARY_DIR}/src/glfw3Config.cmake"
- "${GLFW_BINARY_DIR}/src/glfw3ConfigVersion.cmake"
-- DESTINATION lib${LIB_SUFFIX}/cmake/glfw)
-+ DESTINATION ${GLFW_CONFIG_PATH})
-
-- install(EXPORT glfwTargets DESTINATION lib${LIB_SUFFIX}/cmake/glfw)
-+ install(EXPORT glfwTargets DESTINATION ${GLFW_CONFIG_PATH})
- install(FILES "${GLFW_BINARY_DIR}/src/glfw3.pc"
- DESTINATION lib${LIB_SUFFIX}/pkgconfig)
-
diff --git a/debian/patches/series b/debian/patches/series
index 90b7556..f1bf1cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
reproducible-docs.patch
-cmake-config-fixes.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/glfw3.git
More information about the Pkg-games-commits
mailing list