fixup debian packaging

diff --git a/debian/control b/debian/control
index a6dd0d4..5ee2f45 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends-Indep: po-debconf
 
 Package: diogenes
 Architecture: all
-Depends: ${misc:Depends}, libphp-diogenes (= ${Source-Version}), gettext, dbconfig-common, apache | apache2 | httpd, php4-cli | php5-cli, php-pear | php4-pear, cvs, rcs, perl-modules, ucf (>=0.28)
+Depends: ${misc:Depends}, libphp-diogenes (>= ${source:Version}), gettext, dbconfig-common, apache | apache2 | httpd, php4-cli | php5-cli, php-pear | php4-pear, cvs, rcs, perl-modules, ucf (>=0.28)
 Recommends: mysql-server
 Suggests: wv
 Description: web content management system

diff --git a/debian/diogenes.postrm b/debian/diogenes.postrm
index f3bbf63..620f924 100644 (file)
--- a/debian/diogenes.postrm
+++ b/debian/diogenes.postrm
@@ -63,7 +63,7 @@ purge)
     #
     # Remove ucf-managed files
     #
-    if [ -x $(which ucf) ] ; then
+    if [ -n "$(which ucf)" ] ; then
         for myfile in /etc/diogenes/apache.conf /etc/diogenes/diogenes.debian.inc.php; do
             ucf --purge $myfile
             rm -f $myfile $myfile.dpkg-dist $myfile.dpkg-new $myfile.dpkg-old