[Pkg-nagios-changes] [pkg-nagios] r1295 - in ndoutils/trunk/debian: . patches
Hendrik Frenzel
hfrenzel-guest at alioth.debian.org
Mon Jan 7 21:16:49 UTC 2008
tags 459180 pending
thanks
Author: hfrenzel-guest
Date: 2008-01-07 21:16:48 +0000 (Mon, 07 Jan 2008)
New Revision: 1295
Removed:
ndoutils/trunk/debian/ndoutils-doc.dirs
Modified:
ndoutils/trunk/debian/changelog
ndoutils/trunk/debian/control
ndoutils/trunk/debian/patches/02-makefiles.dpatch
ndoutils/trunk/debian/rules
Log:
fixed some lintian warnings, updated to standard 3.7.3 and closing #459180
Modified: ndoutils/trunk/debian/changelog
===================================================================
--- ndoutils/trunk/debian/changelog 2007-12-09 23:33:47 UTC (rev 1294)
+++ ndoutils/trunk/debian/changelog 2008-01-07 21:16:48 UTC (rev 1295)
@@ -1,3 +1,13 @@
+ndoutils (1.4b7-2) unstable; urgency=low
+
+ * updated Standards-Version to 3.7.3.
+ * removed bashism in debian/rules (Closes: #459180)
+ * removed Homepage stanza from description in debian/control
+ * removed empty directory usr/share/ndoutils-nagios2-mysql/tmpl/configs
+ * removed libz.o and libnsl.o linking since ndoutils uses none of its symbols
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net> Mon, 07 Jan 2008 18:05:50 +0100
+
ndoutils (1.4b7-1) unstable; urgency=low
* New upstream release (Closes: #445996)
Modified: ndoutils/trunk/debian/control
===================================================================
--- ndoutils/trunk/debian/control 2007-12-09 23:33:47 UTC (rev 1294)
+++ ndoutils/trunk/debian/control 2008-01-07 21:16:48 UTC (rev 1295)
@@ -4,7 +4,7 @@
Maintainer: Hendrik Frenzel <hfrenzel at scunc.net>
Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libmysqlclient15-dev | libmysqlclient-dev
Uploaders: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Homepage: http://www.nagios.org
Vcs-Svn: svn://svn.debian.org/svn/pkg-nagios/ndoutils/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-nagios/ndoutils/trunk/
@@ -22,8 +22,6 @@
processing.
.
This package uses MySQL databases.
- .
- Homepage: http://www.nagios.org
Package: ndoutils-doc
Section: doc
Deleted: ndoutils/trunk/debian/ndoutils-doc.dirs
===================================================================
--- ndoutils/trunk/debian/ndoutils-doc.dirs 2007-12-09 23:33:47 UTC (rev 1294)
+++ ndoutils/trunk/debian/ndoutils-doc.dirs 2008-01-07 21:16:48 UTC (rev 1295)
@@ -1,2 +0,0 @@
-/usr/share/doc/ndoutils
-
Modified: ndoutils/trunk/debian/patches/02-makefiles.dpatch
===================================================================
--- ndoutils/trunk/debian/patches/02-makefiles.dpatch 2007-12-09 23:33:47 UTC (rev 1294)
+++ ndoutils/trunk/debian/patches/02-makefiles.dpatch 2008-01-07 21:16:48 UTC (rev 1295)
@@ -5,9 +5,313 @@
## DP: No description.
@DPATCH@
-diff -urNad ndoutils-1.4b5~/src/Makefile.in ndoutils-1.4b5/src/Makefile.in
---- ndoutils-1.4b5~/src/Makefile.in 2007-08-29 17:20:48.000000000 +0200
-+++ ndoutils-1.4b5/src/Makefile.in 2007-08-29 23:19:54.000000000 +0200
+diff -urNad ndoutils-1.4b7~/configure ndoutils-1.4b7/configure
+--- ndoutils-1.4b7~/configure 2007-10-31 19:17:03.000000000 +0100
++++ ndoutils-1.4b7/configure 2008-01-07 18:02:55.000000000 +0100
+@@ -5466,67 +5466,67 @@
+
+
+
+-echo "$as_me:$LINENO: checking for main in -lnsl" >&5
+-echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6
+-if test "${ac_cv_lib_nsl_main+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lnsl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-
+-int
+-main ()
+-{
+-main ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_nsl_main=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_nsl_main=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6
+-if test $ac_cv_lib_nsl_main = yes; then
+- SOCKETLIBS="$SOCKETLIBS -lnsl"
+-fi
++#echo "$as_me:$LINENO: checking for main in -lnsl" >&5
++#echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6
++#if test "${ac_cv_lib_nsl_main+set}" = set; then
++# echo $ECHO_N "(cached) $ECHO_C" >&6
++#else
++# ac_check_lib_save_LIBS=$LIBS
++#LIBS="-lnsl $LIBS"
++#cat >conftest.$ac_ext <<_ACEOF
++#/* confdefs.h. */
++#_ACEOF
++#cat confdefs.h >>conftest.$ac_ext
++#cat >>conftest.$ac_ext <<_ACEOF
++#/* end confdefs.h. */
++#
++#
++#int
++#main ()
++#{
++#main ();
++# ;
++# return 0;
++#}
++#_ACEOF
++#rm -f conftest.$ac_objext conftest$ac_exeext
++#if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++# (eval $ac_link) 2>conftest.er1
++# ac_status=$?
++# grep -v '^ *+' conftest.er1 >conftest.err
++# rm -f conftest.er1
++# cat conftest.err >&5
++# echo "$as_me:$LINENO: \$? = $ac_status" >&5
++# (exit $ac_status); } &&
++# { ac_try='test -z "$ac_c_werror_flag"
++# || test ! -s conftest.err'
++# { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++# (eval $ac_try) 2>&5
++# ac_status=$?
++# echo "$as_me:$LINENO: \$? = $ac_status" >&5
++# (exit $ac_status); }; } &&
++# { ac_try='test -s conftest$ac_exeext'
++# { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++# (eval $ac_try) 2>&5
++# ac_status=$?
++# echo "$as_me:$LINENO: \$? = $ac_status" >&5
++# (exit $ac_status); }; }; then
++# ac_cv_lib_nsl_main=yes
++#else
++# echo "$as_me: failed program was:" >&5
++#sed 's/^/| /' conftest.$ac_ext >&5
++#
++#ac_cv_lib_nsl_main=no
++#fi
++#rm -f conftest.err conftest.$ac_objext \
++# conftest$ac_exeext conftest.$ac_ext
++#LIBS=$ac_check_lib_save_LIBS
++#fi
++#echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_main" >&5
++#echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6
++#if test $ac_cv_lib_nsl_main = yes; then
++# SOCKETLIBS="$SOCKETLIBS -lnsl"
++#fi
+
+ echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
+ echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
+@@ -5993,78 +5993,78 @@
+ MYSQLLIBFOUND=no
+
+
+-echo "$as_me:$LINENO: checking for compress in -lz" >&5
+-echo $ECHO_N "checking for compress in -lz... $ECHO_C" >&6
+-if test "${ac_cv_lib_z_compress+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lz $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-/* Override any gcc2 internal prototype to avoid an error. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+- builtin and then its argument prototype would still apply. */
+-char compress ();
+-int
+-main ()
+-{
+-compress ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- ac_cv_lib_z_compress=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_z_compress=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5
+-echo "${ECHO_T}$ac_cv_lib_z_compress" >&6
+-if test $ac_cv_lib_z_compress = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBZ 1
+-_ACEOF
+-
+- LIBS="-lz $LIBS"
+-
+-fi
++#echo "$as_me:$LINENO: checking for compress in -lz" >&5
++#echo $ECHO_N "checking for compress in -lz... $ECHO_C" >&6
++#if test "${ac_cv_lib_z_compress+set}" = set; then
++# echo $ECHO_N "(cached) $ECHO_C" >&6
++#else
++# ac_check_lib_save_LIBS=$LIBS
++#LIBS="-lz $LIBS"
++#cat >conftest.$ac_ext <<_ACEOF
++#/* confdefs.h. */
++#_ACEOF
++#cat confdefs.h >>conftest.$ac_ext
++#cat >>conftest.$ac_ext <<_ACEOF
++#/* end confdefs.h. */
++#
++#/* Override any gcc2 internal prototype to avoid an error. */
++##ifdef __cplusplus
++#extern "C"
++##endif
++#/* We use char because int might match the return type of a gcc2
++# builtin and then its argument prototype would still apply. */
++#char compress ();
++#int
++#main ()
++#{
++#compress ();
++# ;
++# return 0;
++#}
++#_ACEOF
++#rm -f conftest.$ac_objext conftest$ac_exeext
++#if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++# (eval $ac_link) 2>conftest.er1
++# ac_status=$?
++# grep -v '^ *+' conftest.er1 >conftest.err
++# rm -f conftest.er1
++# cat conftest.err >&5
++# echo "$as_me:$LINENO: \$? = $ac_status" >&5
++# (exit $ac_status); } &&
++# { ac_try='test -z "$ac_c_werror_flag"
++# || test ! -s conftest.err'
++# { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++# (eval $ac_try) 2>&5
++# ac_status=$?
++# echo "$as_me:$LINENO: \$? = $ac_status" >&5
++# (exit $ac_status); }; } &&
++# { ac_try='test -s conftest$ac_exeext'
++# { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++# (eval $ac_try) 2>&5
++# ac_status=$?
++# echo "$as_me:$LINENO: \$? = $ac_status" >&5
++# (exit $ac_status); }; }; then
++# ac_cv_lib_z_compress=yes
++#else
++# echo "$as_me: failed program was:" >&5
++#sed 's/^/| /' conftest.$ac_ext >&5
++#
++#ac_cv_lib_z_compress=no
++#fi
++#rm -f conftest.err conftest.$ac_objext \
++# conftest$ac_exeext conftest.$ac_ext
++#LIBS=$ac_check_lib_save_LIBS
++#fi
++#echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5
++#echo "${ECHO_T}$ac_cv_lib_z_compress" >&6
++#if test $ac_cv_lib_z_compress = yes; then
++# cat >>confdefs.h <<_ACEOF
++##define HAVE_LIBZ 1
++#_ACEOF
++#
++# LIBS="-lz $LIBS"
++#
++#fi
+
+ echo "$as_me:$LINENO: checking for mysql_store_result in -lmysqlclient" >&5
+ echo $ECHO_N "checking for mysql_store_result in -lmysqlclient... $ECHO_C" >&6
+diff -urNad ndoutils-1.4b7~/configure.in ndoutils-1.4b7/configure.in
+--- ndoutils-1.4b7~/configure.in 2007-10-31 19:17:03.000000000 +0100
++++ ndoutils-1.4b7/configure.in 2008-01-07 18:04:56.000000000 +0100
+@@ -87,7 +87,7 @@
+ AC_SUBST(OTHERLIBS)
+
+ dnl Checks for library functions.
+-AC_CHECK_LIB(nsl,main,SOCKETLIBS="$SOCKETLIBS -lnsl")
++dnl AC_CHECK_LIB(nsl,main,SOCKETLIBS="$SOCKETLIBS -lnsl")
+ AC_CHECK_LIB(socket,socket,SOCKETLIBS="$SOCKETLIBS -lsocket")
+ AC_SUBST(SOCKETLIBS)
+ AC_CHECK_LIB(wrap,main,[
+@@ -205,7 +205,7 @@
+ MYSQLLIBFOUND=no
+
+ dnl check compress lib for Mac OSX as well...
+- AC_CHECK_LIB(z,compress)
++ dnl AC_CHECK_LIB(z,compress)
+ dnl AC_CHECK_LIB(mysqlclient,mysql_store_result,MYSQLLIBFOUND=yes,MYSQLLIBFOUND=no)
+ AC_CHECK_LIB(mysqlclient,mysql_store_result,MYSQLLIBFOUND=yes,)
+ AC_CHECK_LIB(mysqlclient,mysql_connect,MYSQLLIBFOUND=yes,)
+diff -urNad ndoutils-1.4b7~/src/Makefile.in ndoutils-1.4b7/src/Makefile.in
+--- ndoutils-1.4b7~/src/Makefile.in 2007-10-03 03:02:58.000000000 +0200
++++ ndoutils-1.4b7/src/Makefile.in 2008-01-07 17:57:50.000000000 +0100
@@ -11,6 +11,7 @@
CC=@CC@
Modified: ndoutils/trunk/debian/rules
===================================================================
--- ndoutils/trunk/debian/rules 2007-12-09 23:33:47 UTC (rev 1294)
+++ ndoutils/trunk/debian/rules 2008-01-07 21:16:48 UTC (rev 1295)
@@ -48,7 +48,11 @@
clean: unpatch
dh_testdir -a
dh_testroot -a
- -rm -f {build,config}-ndoutils-{mysql,pgsql}-stamp
+ -rm -f \
+ build-ndoutils-mysql-stamp \
+ build-ndoutils-pgsql-stamp \
+ config-ndoutils-mysql-stamp \
+ config-ndoutils-pgsql-stamp
[ ! -f Makefile ] || $(MAKE) distclean
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
@@ -56,10 +60,29 @@
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif
- rm -f src/*-{mysql,pgsql}-{2,3}x*
- rm -f src/*-{mysql,pgsql}
- rm -f {install,configure,build}-stamp
- rm -f debian/ndoutils-nagios2-{my,pg}sql.{dirs,manpages,ndoutils.{default,init},config,{pre,post}{inst,rm}}
+ rm -f \
+ src/*-mysql src/*-mysql-2x* src/*-mysql-3x* \
+ src/*-pgsql src/*-pgsql-2x* src/*-pgsql-3x*
+ rm -f install-stamp configure-stamp build-stamp
+ rm -f \
+ debian/ndoutils-nagios2-mysql.dirs \
+ debian/ndoutils-nagios2-mysql.manpages \
+ debian/ndoutils-nagios2-mysql.ndoutils.default \
+ debian/ndoutils-nagios2-mysql.ndoutils.init \
+ debian/ndoutils-nagios2-mysql.config \
+ debian/ndoutils-nagios2-mysql.preinst \
+ debian/ndoutils-nagios2-mysql.prerm \
+ debian/ndoutils-nagios2-mysql.postinst \
+ debian/ndoutils-nagios2-mysql.postrm \
+ debian/ndoutils-nagios2-pgsql.dirs \
+ debian/ndoutils-nagios2-pgsql.manpages \
+ debian/ndoutils-nagios2-pgsql.ndoutils.default \
+ debian/ndoutils-nagios2-pgsql.ndoutils.init \
+ debian/ndoutils-nagios2-pgsql.config \
+ debian/ndoutils-nagios2-pgsql.preinst \
+ debian/ndoutils-nagios2-pgsql.prerm \
+ debian/ndoutils-nagios2-pgsql.postinst \
+ debian/ndoutils-nagios2-pgsql.postrm
rm -f debian/doc/NDOUTILS\ DB\ Model.odt \
debian/doc/NDOUtils\ Documentation.sxw
dh_clean
@@ -116,7 +139,7 @@
ndoutils-nagios2-mysql: build-ndoutils-nagios2-mysql
@echo " ### Doing $@"
- for script in dirs ndoutils.{default,init} config {pre,post}{rm,inst} manpages; do \
+ for script in dirs ndoutils.default ndoutils.init config preinst postinst prerm postrm manpages; do \
test -e debian/ndoutils-NG-DB.$${script}.in && \
sed "s/@@NG@@/nagios2/g;s/@@DB@@/mysql/g;s/@@PACKAGE@@/$@/g;s/@@PKG_SHORT@@/ndoutils-mysql/g;s/@@DBPORT@@/3306/g" \
< debian/ndoutils-NG-DB.$${script}.in > debian/$@.$${script}; \
@@ -142,8 +165,6 @@
mv debian/$@/usr/share/$@/tmpl/ndo2db.cfg.sed \
debian/$@/usr/share/$@/tmpl/ndo2db.cfg
- mkdir -p debian/$@/usr/share/$@/tmpl/configs
-
# install the SQL schemes
install -m 644 db/mysql.sql \
debian/$@/usr/share/dbconfig-common/data/$@/install/mysql
More information about the Pkg-nagios-changes
mailing list