[Pkg-nagios-changes] [pkg-icinga2] 02/04: Enabled autoreconf for ltdl

[Markus Frosch]

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 ad2fae6123e6317fbdb547d907713f2860bce360
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Tue Oct 22 20:58:42 2013 +0200

    Enabled autoreconf for ltdl
---
 debian/control                        |    5 +++--
 debian/patches/01_disable_git_version |   19 +++++++++++++++++++
 debian/patches/series                 |    1 +
 debian/rules                          |   30 +++++++++++++++++++++++++++++-
 4 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 5254529..2dd1a88 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends: automake,
                autotools-dev,
                bison,
                debhelper (>= 9),
+               dh-autoreconf,
                doxygen,
                flex,
                g++ (>= 1.96),
@@ -21,8 +22,8 @@ Build-Depends: automake,
                libmysqlclient-dev,
                libssl-dev,
                libtool,
-               python-dev,
-               po-debconf
+               po-debconf,
+               python-dev
 Standards-Version: 3.9.4
 Homepage: http://www.icinga.org
 
diff --git a/debian/patches/01_disable_git_version b/debian/patches/01_disable_git_version
new file mode 100644
index 0000000..db71458
--- /dev/null
+++ b/debian/patches/01_disable_git_version
@@ -0,0 +1,19 @@
+Description: Disabled reconf of version includes
+ This helps avoiding the software to use the git-buildpackage for version info
+Author: Markus Frosch <markus at 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 \
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..da84c17
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_disable_git_version
diff --git a/debian/rules b/debian/rules
index 48e7959..268cc35 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,36 @@
 
 #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
+
 %:
-	dh $@  --with autotools-dev
+	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)
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f config.log
+	rm -f config.status
 
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-python \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga2.git