Modified Debian packaging for development builds

refs #4988

diff --git a/debian/changelog b/debian/changelog
index 727a9a0500838074349f7451f5bea1b0d7444e28..82064020f21b227c9d3f7ff59ff24fa4179c5ded 100644 (file)
--- 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 (file)
index db71458..0000000
--- 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 <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 \

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644 (file)
index da84c17..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_disable_git_version

diff --git a/debian/rules b/debian/rules
index a2ee1573fd4b8a54cde5d9edb38096e176869e87..3cc7503938248aef53c2db7e058c75d2f5cead94 100755 (executable)
--- 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 163aaf8d82b6c54f23c45f32895dbdfdcc27b047..89ae9db8f88b823b6a7eabf55e203658739da122 100644 (file)
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)