Mark Bergsma has submitted this change and it was merged. Change subject: ganglia (3.5.0-wm1) precise; urgency=low ......................................................................
ganglia (3.5.0-wm1) precise; urgency=low * Imported Upstream version 3.5.0 * Applied diff by Nicholas Satterly --- M debian/changelog A debian/patches/php-version-hack M debian/patches/series M debian/rules 4 files changed, 50 insertions(+), 15 deletions(-) Approvals: Mark Bergsma: Verified; Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 243423f..bcfd306 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ganglia (3.5.0-wm1) precise; urgency=low + + * Imported Upstream version 3.5.0 + * Applied diff by Nicholas Satterly + + -- Mark Bergsma <[email protected]> Tue, 12 Mar 2013 14:44:37 +0000 + ganglia (3.3.8-2) UNRELEASED; urgency=low * Add a debian/watch file. diff --git a/debian/patches/php-version-hack b/debian/patches/php-version-hack new file mode 100644 index 0000000..e2419ae --- /dev/null +++ b/debian/patches/php-version-hack @@ -0,0 +1,39 @@ +Description: php-version-hack + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + ganglia (3.5.0-1) UNRELEASED; urgency=low + . + * New upstream release +Author: Nick Satterly <nick.satterly at guardian.co.uk> + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- ganglia-3.5.0.orig/configure.in ++++ ganglia-3.5.0/configure.in +@@ -422,10 +422,7 @@ if test x"$enable_php" = xyes; then + if test -n "$PHP_CONFIG_BIN"; then + # find out php version + PHP_FULL_VERSION=`$PHP_CONFIG_BIN --version` +- AC_CACHE_CHECK([PHP version >= 5.3], [php_cv_version_5], +- [AX_COMPARE_VERSION([$PHP_FULL_VERSION], [ge], [5.3], +- [php_cv_version_5="yes"], +- [php_cv_version_5="no"])]) ++ php_cv_version_5="yes" + if test "$php_cv_version_5" = "yes"; then + PHP_VERSION=5 + else diff --git a/debian/patches/series b/debian/patches/series index bdb242d..1f41692 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -large_block_count.patch +php-version-hack diff --git a/debian/rules b/debian/rules index a8ee5b5..3b3a9b6 100755 --- a/debian/rules +++ b/debian/rules @@ -36,11 +36,9 @@ --libdir=\$${prefix}/lib \ --sysconfdir=/etc/ganglia \ --infodir=\$${prefix}/share/info --enable-shared \ - --with-gmetad -build: build-stamp - make -C web + --with-gmetad --enable-status -build-stamp: config.status +build: config.status dh_testdir # Add here commands to compile the package. @@ -60,8 +58,7 @@ # -rm -f dotconf-1.0.9/conftest -rm -f libtool.old \ ganglia-config contrib/ganglia_gmond.xml gmetad/gmetad.conf \ - gmond/gmond.solaris.init gmond/modules/conf.d/modpython.conf solaris/pkginfo \ - web/conf.php + gmond/gmond.solaris.init gmond/modules/conf.d/modpython.conf solaris/pkginfo debconf-updatepo dh_autotools-dev_restoreconfig dh_clean @@ -91,14 +88,6 @@ debian/ganglia-monitor-python/etc/ganglia/conf.d/ cp gmond/python_modules/*/*.py \ debian/ganglia-monitor-python/usr/lib/ganglia/python_modules/ - -#Install webfrontend - $(MAKE) -C web install APACHE_USER=www-data DESTDIR=$(CURDIR)/debian/ganglia-webfrontend/usr/share/ganglia-webfrontend GWEB_STATEDIR=$(CURDIR)/debian/ganglia-webfrontend/var/lib - mkdir -p debian/ganglia-webfrontend/etc/apache2/conf.d/ - cp -f web/debian/apache.conf \ - debian/ganglia-webfrontend/etc/ganglia-webfrontend - cp -f web/debian/conf_debian.php \ - debian/ganglia-webfrontend/usr/share/ganglia-webfrontend/conf.php # Build architecture-independent files here. binary-indep: build install -- To view, visit https://gerrit.wikimedia.org/r/53374 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I40b711eb7c896f2e06e59435274e4a8058e5b77d Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/ganglia Gerrit-Branch: master Gerrit-Owner: Mark Bergsma <[email protected]> Gerrit-Reviewer: Mark Bergsma <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
