[Pkg-nagios-changes] [pkg-icinga2] 07/08: Added patch disable_git_version to avoid generation of new version data
Markus Frosch
lazyfrosch-guest at moszumanska.debian.org
Sun Dec 29 20:30:17 UTC 2013
This is an automated email from the git hooks/post-receive script.
lazyfrosch-guest pushed a commit to branch master
in repository pkg-icinga2.
commit 35ce03b66478303181c8d154e73c7e93db7df2a3
Author: Markus Frosch <markus at lazyfrosch.de>
Date: Sun Dec 29 21:28:33 2013 +0100
Added patch disable_git_version to avoid generation of new version data
---
debian/patches/disable_git_version | 30 ++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 31 insertions(+)
diff --git a/debian/patches/disable_git_version b/debian/patches/disable_git_version
new file mode 100644
index 0000000..b0bef2a
--- /dev/null
+++ b/debian/patches/disable_git_version
@@ -0,0 +1,30 @@
+Description: Disable GIT based version calculation
+Author: Markus Frosch <markus at lazyfrosch.de>
+Bug: https://dev.icinga.org/issues/5410
+Last-Update: 2013-12-29
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,14 +47,14 @@
+ set(CPACK_SOURCE_IGNORE_FILES "/.git/")
+ include(CPack)
+
+-include(GetGitRevisionDescription)
+-git_describe(GIT_VERSION --tags)
+-if(GIT_VERSION MATCHES "-NOTFOUND$")
++#include(GetGitRevisionDescription)
++#git_describe(GIT_VERSION --tags)
++#if(GIT_VERSION MATCHES "-NOTFOUND$")
+ configure_file(icinga-version.h.fallback ${CMAKE_CURRENT_BINARY_DIR}/icinga-version.h COPYONLY)
+-else()
+- configure_file(icinga-version.h.cmake icinga-version.h)
+- configure_file(${CMAKE_CURRENT_BINARY_DIR}/icinga-version.h ${CMAKE_CURRENT_SOURCE_DIR}/icinga-version.h.fallback COPYONLY)
+-endif()
++#else()
++# configure_file(icinga-version.h.cmake icinga-version.h)
++# configure_file(${CMAKE_CURRENT_BINARY_DIR}/icinga-version.h ${CMAKE_CURRENT_SOURCE_DIR}/icinga-version.h.fallback COPYONLY)
++#endif()
+
+ if(WIN32)
+ set(Boost_USE_STATIC_LIBS ON)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a044a32
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable_git_version
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga2.git
More information about the Pkg-nagios-changes
mailing list