Modified Debian packaging for development builds

refs #4988
This commit is contained in:
Markus Frosch 2013-11-02 01:18:58 +01:00
parent c930215d3f
commit a73f98414a
5 changed files with 6 additions and 47 deletions

5
debian/changelog vendored
View File

@ -1,7 +1,6 @@
icinga2 (0.0.3-1~icingaorg+0) UNRELEASED; urgency=low icinga2 (0.0.3-0) UNRELEASED; urgency=low
* Initial Debian packaging for the Icinga 2 alphas and betas * Icinga2 Debian packaging for snapshots
* [dac8fa6] Imported Upstream version 0.0.3
*** Please note that at this point Icinga 2 is highly experimental software *** Please note that at this point Icinga 2 is highly experimental software
*** and is missing a significant portion of the planned features. This *** and is missing a significant portion of the planned features. This

View File

@ -1,19 +0,0 @@
Description: Disabled reconf of version includes
This helps avoiding the software to use the git-buildpackage for version info
Author: Markus Frosch <markus@lazyfrosch.de>
Last-Update: 2013-10-23
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,8 +54,8 @@
uninstall-local:
-rm -r $(icinga2docdir)
-BUILT_SOURCES = icinga-version.stamp
-CLEANFILES = icinga-version.h
+#BUILT_SOURCES = icinga-version.stamp
+#CLEANFILES = icinga-version.h
GIT_VERSION_CMD = $(SHELL) $(top_srcdir)/git_version.sh
icinga-version.stamp:
@if test -f "$(srcdir)/icinga-version.h"; then \

View File

@ -1 +0,0 @@
01_disable_git_version

26
debian/rules vendored
View File

@ -2,31 +2,10 @@
#export DH_VERBOSE=1 #export DH_VERBOSE=1
define SAVEFILE export NOCONFIGURE=1
test -f $1.dh-orig || cp $1 $1.dh-orig
endef
define RESTOREFILE
test -f $1.dh-orig && mv $1.dh-orig $1; :
endef
%: %:
dh $@ --with autotools-dev --with autoreconf dh $@ --with autotools-dev
override_dh_autoreconf:
$(call SAVEFILE,Makefile.in)
$(call SAVEFILE,icinga2.spec)
$(call SAVEFILE,third-party/ltdl/Makefile.in)
$(call SAVEFILE,third-party/ltdl/aclocal.m4)
$(call SAVEFILE,third-party/ltdl/configure)
dh_autoreconf autoreconf -- -f -i third-party/ltdl/
override_dh_autoreconf_clean:
dh_autoreconf_clean
$(call RESTOREFILE,Makefile.in)
$(call RESTOREFILE,icinga2.spec)
$(call RESTOREFILE,third-party/ltdl/Makefile.in)
$(call RESTOREFILE,third-party/ltdl/aclocal.m4)
$(call RESTOREFILE,third-party/ltdl/configure)
override_dh_auto_clean: override_dh_auto_clean:
dh_auto_clean dh_auto_clean
@ -34,6 +13,7 @@ override_dh_auto_clean:
rm -f config.status rm -f config.status
override_dh_auto_configure: override_dh_auto_configure:
./autogen.sh
dh_auto_configure -- --enable-python \ dh_auto_configure -- --enable-python \
--with-icinga-user=root \ --with-icinga-user=root \
--with-icinga-group=bin \ --with-icinga-group=bin \

View File

@ -1 +1 @@
3.0 (quilt) 3.0 (native)