From ded41180adccabaf58bc1f33caca2faa3ee3ef4a Mon Sep 17 00:00:00 2001 From: x2003bruneau Date: Mon, 29 Jan 2007 20:07:25 +0000 Subject: [PATCH] Cleanup banana Makefile to prepare the release git-svn-id: svn+ssh://murphy/home/svn/banana/trunk@184 9869982d-c50d-0410-be91-f2a2ec7c7c7b --- Makefile | 4 ++-- debian/control | 4 ++-- debian/patches/10.correct_spool_path.patch | 11 ----------- debian/rules | 2 +- 4 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 debian/patches/10.correct_spool_path.patch diff --git a/Makefile b/Makefile index f43994d..9ef09b0 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ PKG_FILES = AUTHORS Changelog COPYING README Makefile TODO PKG_DIRS = banana po css examples img -VCS_FILTER = ! -name .arch-ids ! -name .arch-inventory +VCS_FILTER = ! -name .svn # global targets @@ -16,7 +16,7 @@ build: pkg-build dist: clean pkg-dist clean: - rm -rf locale banana/include/banana.inc.php + rm -rf locale banana/banana.inc.php make -C po clean %: %.in Makefile diff --git a/debian/control b/debian/control index e6424ee..a9ce07c 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ Build-Depends-Indep: cdbs, debhelper (>= 4.1.16) Package: php-banana Architecture: all -Depends: php4-cli -Recommends: compface, imagemagick +Depends: php5-cli +Recommends: compface, imagemagick, php5-tidy Description: php library aimed to write NNTP <-> Web gateways . Homepage: http://opensource.polytechnique.org/banana/ diff --git a/debian/patches/10.correct_spool_path.patch b/debian/patches/10.correct_spool_path.patch deleted file mode 100644 index c8999c8..0000000 --- a/debian/patches/10.correct_spool_path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /home/x2000habouzit/dev/banana/banana/spool.inc.php 2005-01-07 23:47:41.000000000 +0100 -+++ banana/spool.inc.php 2005-01-07 23:46:58.000000000 +0100 -@@ -150,7 +150,7 @@ - global $banana; - $url = parse_url($banana->host); - $file = $url['host'].'_'.$url['port'].'_'.$this->group; -- return dirname(dirname(__FILE__)).'/spool/'.$file; -+ return "/var/spool/banana/$file"; - } - - function _updateSpool($arg) diff --git a/debian/rules b/debian/rules index 12c34e9..cff565c 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,7 @@ DEB_INSTALL_CHANGELOGS_ALL := DEB_INSTALL_CHANGELOGS_php-banana := Changelog #directories -DEB_INSTALL_DIRS_php-banana := var/spool/banana/ +DEB_INSTALL_DIRS_php-banana := var/spool/banana/ var/spool/banana/templates_c install/php-banana:: make -- 2.1.4