[icinga-checkins] icinga.org: icinga2/next: Debian: adapt icinga-version.h.force for the snapshots

git at icinga.org git at icinga.org
Fri Jun 13 10:23:13 CEST 2014


Module: icinga2
Branch: next
Commit: 178fb927b122077133ab593ec5e32f919d91c4b6
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=178fb927b122077133ab593ec5e32f919d91c4b6

Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Fri Jun 13 10:20:44 2014 +0200

Debian: adapt icinga-version.h.force for the snapshots

Refs #5816

---

 .gitignore            |    2 +-
 debian/CMakeLists.txt |    4 ++--
 debian/rules          |    5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 60188f4..d9f5acc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 .vagrant
-icinga-version.h.fallback
+icinga-version.h.force
 *.komodoproject
diff --git a/debian/CMakeLists.txt b/debian/CMakeLists.txt
index 6dcf3f9..bd4d751 100644
--- a/debian/CMakeLists.txt
+++ b/debian/CMakeLists.txt
@@ -16,7 +16,7 @@
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 #
-# this file is used to build icinga-version.h.fallback
+# this file is used to build icinga-version.h.force
 # for the Debian builds, it needs to be included in the tarball
 #
 
@@ -26,5 +26,5 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
 
 include(GetGitRevisionDescription)
 git_describe(GIT_VERSION --tags)
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../icinga-version.h.cmake" icinga-version.h.fallback)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../icinga-version.h.cmake" icinga-version.h.force)
 
diff --git a/debian/rules b/debian/rules
index 946ed4b..1651633 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,11 +7,12 @@ export DH_VERBOSE=1
 
 override_dh_auto_clean:
 ifeq ($(shell test -d .git && echo "git"),git) # verify we are in a GIT repo
-	# ensure icinga-version.h.fallback to be present
+	# ensure icinga-version.h.force to be present
+	rm -f icinga-version.h.force icinga-version.h.fallback
 	rm -rf debian-prebuild/
 	mkdir debian-prebuild
 	cd debian-prebuild/ && cmake ../debian/
-	cp debian-prebuild/icinga-version.h.fallback .
+	cp debian-prebuild/icinga-version.h.force .
 	rm -rf debian-prebuild/
 endif
 	# now clean build dir



More information about the icinga-checkins mailing list