From a73f98414aba45e2bbdf307778c4426437e534b0 Mon Sep 17 00:00:00 2001 From: Markus Frosch Date: Sat, 2 Nov 2013 01:18:58 +0100 Subject: [PATCH] Modified Debian packaging for development builds refs #4988 --- debian/changelog | 5 ++--- debian/patches/01_disable_git_version | 19 ------------------- debian/patches/series | 1 - debian/rules | 26 +++----------------------- debian/source/format | 2 +- 5 files changed, 6 insertions(+), 47 deletions(-) delete mode 100644 debian/patches/01_disable_git_version delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 727a9a050..82064020f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 - * [dac8fa6] Imported Upstream version 0.0.3 + * Icinga2 Debian packaging for snapshots *** Please note that at this point Icinga 2 is highly experimental software *** and is missing a significant portion of the planned features. This diff --git a/debian/patches/01_disable_git_version b/debian/patches/01_disable_git_version deleted file mode 100644 index db71458bf..000000000 --- a/debian/patches/01_disable_git_version +++ /dev/null @@ -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 -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 \ diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index da84c1779..000000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01_disable_git_version diff --git a/debian/rules b/debian/rules index a2ee1573f..3cc750393 100755 --- a/debian/rules +++ b/debian/rules @@ -2,31 +2,10 @@ #export DH_VERBOSE=1 -define SAVEFILE - test -f $1.dh-orig || cp $1 $1.dh-orig -endef -define RESTOREFILE - test -f $1.dh-orig && mv $1.dh-orig $1; : -endef +export NOCONFIGURE=1 %: - dh $@ --with autotools-dev --with autoreconf - -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) + dh $@ --with autotools-dev override_dh_auto_clean: dh_auto_clean @@ -34,6 +13,7 @@ override_dh_auto_clean: rm -f config.status override_dh_auto_configure: + ./autogen.sh dh_auto_configure -- --enable-python \ --with-icinga-user=root \ --with-icinga-group=bin \ diff --git a/debian/source/format b/debian/source/format index 163aaf8d8..89ae9db8f 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) -- 2.50.1