[Pkg-nagios-changes] [SCM] Debian packaging for mod gearman. branch, master, updated. debian/1.0-1-38-g007be5a

Stig Sandbeck Mathisen ssm at debian.org
Thu Apr 7 10:39:45 UTC 2011


The following commit has been merged in the master branch:
commit 5b2d2937b9d810754d2c8b92f46e66d85c9b5715
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Thu Apr 7 12:23:27 2011 +0200

    Remove patch for build issue fixed upstream

diff --git a/debian/patches/0001-Do-not-check-for-nagios-user-during-build.patch b/debian/patches/0001-Do-not-check-for-nagios-user-during-build.patch
deleted file mode 100644
index f4efc80..0000000
--- a/debian/patches/0001-Do-not-check-for-nagios-user-during-build.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Stig Sandbeck Mathisen <ssm at debian.org>
-Date: Fri, 4 Feb 2011 16:49:36 +0100
-Subject: [PATCH] Do not check for nagios user during build
-
----
- Makefile.am  |    7 +------
- configure.ac |    9 ---------
- 2 files changed, 1 insertions(+), 15 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index b37dab9..964a790 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -152,12 +152,7 @@ install-exec-local: install-local-state-dir
- 
- install-local-state-dir:
- 	$(RM) $(DESTDIR)$(pkglibdir)/mod_gearman.so
--	if [ `id -u` -eq 0 ]; then \
--	    $(install_sh_PROGRAM) -o $(user) -d $(DESTDIR)$(localstatedir)/mod_gearman/; \
--    else \
--	    $(install_sh_PROGRAM) -o $(user) -d $(DESTDIR)$(localstatedir)/mod_gearman/; \
--        echo "*** You should run: sudo chown $(user) $(DESTDIR)$(localstatedir)/mod_gearman/"; \
--    fi
-+	$(install_sh_PROGRAM) -d $(DESTDIR)$(localstatedir)/mod_gearman
- 
- install-data-local: install-local-state-dir
- 	$(install_sh_PROGRAM) -m 644 extras/shared.conf            $(DESTDIR)$(datadir)/mod_gearman/shared.conf
-diff --git a/configure.ac b/configure.ac
-index 5f9eea4..57877f3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -56,15 +56,6 @@ AC_ARG_WITH([user],
- user="$with_user"
- AC_SUBST(user)
- 
--AC_MSG_CHECKING(if user $user exists)
--id -a $user > /dev/null 2>&1
--if test "$?" != "0" ; then
--    AC_MSG_RESULT(no)
--    AC_MSG_ERROR(user $user does not exist)
--else
--    AC_MSG_RESULT(yes)
--fi
--
- ##############################################
- # Check some functions
- AC_CHECK_FUNCS([gettimeofday strdup strchr strstr strtoul alarm gethostname memset strcspn strerror atexit gethostbyname socket])
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 77eb55b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Do-not-check-for-nagios-user-during-build.patch

-- 
Debian packaging for mod gearman.



More information about the Pkg-nagios-changes mailing list