diff -Nru cacti-0.8.7i/debian/changelog cacti-0.8.7i/debian/changelog --- cacti-0.8.7i/debian/changelog 2012-01-02 07:11:23.000000000 +0000 +++ cacti-0.8.7i/debian/changelog 2012-01-19 08:25:48.000000000 +0000 @@ -1,3 +1,15 @@ +cacti (0.8.7i-2ubuntu1) precise; urgency=low + + * debian/patches/01_config.php.patch: Backports from Debian git repos to + fix while upgrade because /etc/cacti/debian.php has been rewrite. + (Closes: #654352) + * debian/control: + - Move apache2 to Recommends to allow cacti running to other webserver, + and fcgi stuff to Depends. (LP: #544828) + - Remove absolute packages: apache, apache-ssl, apache-perl + + -- Mahyuddin Susanto Thu, 19 Jan 2012 15:25:27 +0700 + cacti (0.8.7i-2) unstable; urgency=low * Cherry-pick upstream patches diff -Nru cacti-0.8.7i/debian/control cacti-0.8.7i/debian/control --- cacti-0.8.7i/debian/control 2011-12-30 20:32:25.000000000 +0000 +++ cacti-0.8.7i/debian/control 2012-01-19 08:24:04.000000000 +0000 @@ -1,7 +1,8 @@ Source: cacti Section: web Priority: extra -Maintainer: Cacti Maintainer +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Cacti Maintainer Uploaders: Sean Finney , Mahyuddin Susanto Build-Depends: debhelper (>= 7.0.50~), @@ -13,9 +14,8 @@ Package: cacti Architecture: all -Depends: apache2 | apache | apache-ssl | apache-perl | httpd, - dbconfig-common (>= 1.8.8), - libapache2-mod-php5 | php5, +Depends: dbconfig-common (>= 1.8.8), + libapache2-mod-php5 | libapache2-mod-fcgid | php5-cgi, libphp-adodb (>= 4.50-1), php5-cli, php5-mysql, @@ -25,7 +25,8 @@ ucf, virtual-mysql-client, ${misc:Depends} -Recommends: iputils-ping, +Recommends: apache2 | lighttpd | nginx | httpd, + iputils-ping, logrotate, mysql-server Suggests: php5-ldap diff -Nru cacti-0.8.7i/debian/patches/01_config.php.patch cacti-0.8.7i/debian/patches/01_config.php.patch --- cacti-0.8.7i/debian/patches/01_config.php.patch 2011-12-30 20:32:25.000000000 +0000 +++ cacti-0.8.7i/debian/patches/01_config.php.patch 2012-01-19 08:14:48.000000000 +0000 @@ -2,21 +2,33 @@ debian.php, which can be managed by debconf/ucf Author: Sean Finney Last-Update: 2011-10-12 -Index: cacti/include/global.php +Index: cacti-0.8.7i/include/global.php =================================================================== ---- cacti.orig/include/global.php 2011-12-12 19:43:02.380827920 +0700 -+++ cacti/include/global.php 2011-12-12 19:43:00.576818960 +0700 -@@ -32,12 +32,7 @@ +--- cacti-0.8.7i.orig/include/global.php 2012-01-06 16:57:38.977090143 +0700 ++++ cacti-0.8.7i/include/global.php 2012-01-06 16:58:36.221374001 +0700 +@@ -30,21 +30,16 @@ - /* Default database settings*/ - $database_type = "mysql"; + */ + +-/* Default database settings*/ +-$database_type = "mysql"; -$database_default = "cacti"; -$database_hostname = "localhost"; -$database_username = "cactiuser"; -$database_password = "cactiuser"; -$database_port = "3306"; -$database_ssl = false; -+require('/etc/cacti/debian.php'); - +- /* Default session name - Session name must contain alpha characters */ $cacti_session_name = "Cacti"; + + /* Include configuration */ + include(dirname(__FILE__) . "/config.php"); + ++/* Default database settings*/ ++$database_type = "mysql"; ++require('/etc/cacti/debian.php'); ++ + if (isset($config["cacti_version"])) { + die("Invalid include/config.php file detected."); + exit;