[prev in list] [next in list] [prev in thread] [next in thread] 

List:       omd-commits
Subject:    [Omd-commits] OMD Git: omd: debianizing: bugfix /etc/default/omd, symlink check_hosts, misc changes
From:       git () mathias-kettner ! de (git version control)
Date:       2010-08-15 12:54:07
Message-ID: 20100815125407.EE079C15B7F () mail ! mathias-kettner ! de
[Download RAW message or body]

Module: omd
Branch: master
Commit: 5fc3bd7141e85ad29dbc961ff0cfe39c449b2eeb
URL:    http://omdistro.org/projects/omd/repository/revisions/5fc3bd7141e85ad29dbc961ff0cfe39c449b2eeb


Author: Wolfgang Barth <wob at swobspace.net>
Date:   Sun Aug 15 14:53:29 2010 +0200

debianizing: bugfix /etc/default/omd, symlink check_hosts, misc changes

---

 Makefile                       |    2 ++
 debian/.gitignore              |    2 ++
 debian/{control => control.in} |    4 ++--
 debian/links                   |    1 -
 debian/links.in                |    1 +
 debian/postinst.in             |    4 +++-
 debian/rules                   |    4 +++-
 7 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index e30048e..06fae9c 100644
--- a/Makefile
+++ b/Makefile
@@ -116,6 +116,8 @@ rpm:
 # Build DEB from prebuild binary. This currently needs 'make dist' and thus only
 # works within a GIT repository.
 deb: 
+	sed -e 's/###OMD_VERSION###/$(OMD_VERSION)/' \
+	   `pwd`/debian/control.in > `pwd`/debian/control
 	fakeroot debian/rules clean
 	git-buildpackage -uc -us -rfakeroot --git-ignore-new \
 	--git-builder="debuild --no-lintian -i\.git -I\.git \
diff --git a/debian/.gitignore b/debian/.gitignore
index 2331928..8a66c6c 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -5,3 +5,5 @@ omd/
 files
 *.debhelper
 postinst
+control
+links
diff --git a/debian/control b/debian/control.in
similarity index 92%
rename from debian/control
rename to debian/control.in
index 0c3d3d4..9f4297d 100644
--- a/debian/control
+++ b/debian/control.in
@@ -1,4 +1,4 @@
-Source: omd-0.10
+Source: omd-###OMD_VERSION###
 Section: admin
 Priority: optional
 Maintainer: <debian at omdistro.org>
@@ -6,7 +6,7 @@ Build-Depends: dpatch, debhelper (>= 7), autotools-dev,  \
build-essential, libcai  Standards-Version: 3.8.3
 Homepage: http://www.omdistro.org
 
-Package: omd-0.10
+Package: omd-###OMD_VERSION###
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libapache2-mod-python, \
libapache2-mod-php5, php5-sqlite, php5-mcrypt, libgd2-xpm, libdbi0, \
libapache2-mod-proxy-html  Recommends: xinetd, mysql-server, graphviz, dnsutils, \
                snmp, fping, smblclient, unzip, libnet-snmp-perl, libxml-simple-perl
diff --git a/debian/links b/debian/links
deleted file mode 100644
index d35ffd0..0000000
--- a/debian/links
+++ /dev/null
@@ -1 +0,0 @@
-opt/omd/versions/default/lib/nagios/plugins/check_icmp \
                opt/omd/versions/default/lib/nagios/plugins/check_host
diff --git a/debian/links.in b/debian/links.in
new file mode 100644
index 0000000..df6914f
--- /dev/null
+++ b/debian/links.in
@@ -0,0 +1 @@
+opt/omd/versions/###OMD_VERSION###/lib/nagios/plugins/check_icmp \
                opt/omd/versions/###OMD_VERSION###/lib/nagios/plugins/check_host
diff --git a/debian/postinst.in b/debian/postinst.in
index 0d29e4f..5faf506 100755
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -39,7 +39,9 @@ setperm() {
 case "$1" in
   configure)
     update-alternatives --install /opt/omd/versions/default \
-       omd-default-dir /opt/omd/versions/###OMD_VERSION### 10 \
+       omd /opt/omd/versions/###OMD_VERSION### 10 \
+       --slave /etc/init.d/omd omd.init /etc/init.d/omd-###OMD_VERSION### \
+       --slave /etc/default/omd omd.default /etc/default/omd-###OMD_VERSION### 
     ln -sfn /opt/omd/versions/default/bin/omd /usr/bin/omd
 
     # -- looking for group nagios, create it, if not exist
diff --git a/debian/rules b/debian/rules
index a0cbdaa..db5c1a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,8 +64,10 @@ install: build
 	rm -rf `pwd`/debian/`dh_listpackages`/etc/apache2
 	rm -f `pwd`/debian/`dh_listpackages`/etc/init.d/omd
 
-	sed -e 's/###OMD_VERSION###/$(OMD_VERSION)/' \
+	sed -e 's/###OMD_VERSION###/$(OMD_VERSION)/g' \
 	   `pwd`/debian/postinst.in > `pwd`/debian/postinst
+	sed -e 's/###OMD_VERSION###/$(OMD_VERSION)/g' \
+	   `pwd`/debian/links.in > `pwd`/debian/links
 
 # Build architecture-independent files here.
 binary-indep: build install


[prev in list] [next in list] [prev in thread] [next in thread]