[Pkg-sympa-commits] [SCM] sympa Debian packaging branch, master, updated. debian/6.1.1_dfsg-2-12-g8f2f56a

[Emmanuel Bouthenot]

The following commit has been merged in the master branch:
commit 5f567ada4d17c5c8d74fdd81c84f32b30b3f019c
Author: Emmanuel Bouthenot <kolter at openics.org>
Date:   Sun Jan 9 22:16:17 2011 +0000

    Rearrange recommends and dependencies:
     - Remove build depends on DB backends libs (not needed).
     - Add a strict dependency on all DB backends libs to make sympa
     installation more robust (see #606704).

diff --git a/debian/control b/debian/control
index a94b121..ed71ced 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends: cdbs (>= 0.4.70~),
  debhelper (>= 6),
  dh-buildinfo,
  libdbi-perl (>= 1.48),
- libdbd-mysql-perl (>= 4.007) | libdbd-pg-perl | libdbd-sqlite3-perl | libdbd-sybase-perl,
  libarchive-zip-perl (>= 1.05),
  libmailtools-perl (>= 1.51),
  libmsgcat-perl (>= 1.0),
@@ -41,7 +40,7 @@ Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${cdbs:Depends}
 Replaces: wwsympa
 Provides: wwsympa
 Conflicts: wwsympa
-Recommends: ${cdbs:Recommends}, logrotate, doc-base, mysql-server | postgresql | sqlite3 | sqlite, locales, ca-certificates
+Recommends: ${cdbs:Recommends}, logrotate, doc-base, mysql-server | postgresql, locales, ca-certificates
 Suggests: ${cdbs:Suggests}, apache2 | httpd-cgi, openssl (>= 0.9.5a), libapache2-mod-fcgid, libsoap-lite-perl
 Description: Modern mailing list manager
  Sympa is a scalable and highly customizable modern mailing list manager
diff --git a/debian/control.in b/debian/control.in
index 51d2989..825b62e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -15,7 +15,7 @@ Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${cdbs:Depends}
 Replaces: wwsympa
 Provides: wwsympa
 Conflicts: wwsympa
-Recommends: ${cdbs:Recommends}, logrotate, doc-base, mysql-server | postgresql | sqlite3 | sqlite, locales, ca-certificates
+Recommends: ${cdbs:Recommends}, logrotate, doc-base, mysql-server | postgresql, locales, ca-certificates
 Suggests: ${cdbs:Suggests}, apache2 | httpd-cgi, openssl (>= 0.9.5a), libapache2-mod-fcgid, libsoap-lite-perl
 Description: Modern mailing list manager
  Sympa is a scalable and highly customizable modern mailing list manager
diff --git a/debian/rules b/debian/rules
index 735306b..58f0b61 100755
--- a/debian/rules
+++ b/debian/rules
@@ -163,7 +163,7 @@ binary-post-install/sympa::
 		"$(DEB_DESTDIR)"/usr/share/doc/$(cdbs_curpkg)/examples/config/topics.us.conf
 
 # Needed both by upstream build (or test) process and at runtime
-common-depends = libdbi-perl (>= 1.48), libdbd-mysql-perl (>= 4.007) | libdbd-pg-perl | libdbd-sqlite3-perl | libdbd-sybase-perl, libarchive-zip-perl (>= 1.05), libmailtools-perl (>= 1.51), libmsgcat-perl (>= 1.0), libmime-tools-perl, perl (>= 5.8), libio-stringy-perl, libnet-ldap-perl, libcgi-fast-perl, libintl-perl, libmime-charset-perl, libmime-encwords-perl, libtemplate-perl, libxml-libxml-perl, perl-modules (>= 5.10) | libcgi-pm-perl (>= 3.35), libhtml-stripscripts-parser-perl (>= 1.0), libhtml-tree-perl, libhtml-format-perl, mhonarc, libregexp-common-perl
+common-depends = libdbi-perl (>= 1.48), libarchive-zip-perl (>= 1.05), libmailtools-perl (>= 1.51), libmsgcat-perl (>= 1.0), libmime-tools-perl, perl (>= 5.8), libio-stringy-perl, libnet-ldap-perl, libcgi-fast-perl, libintl-perl, libmime-charset-perl, libmime-encwords-perl, libtemplate-perl, libxml-libxml-perl, perl-modules (>= 5.10) | libcgi-pm-perl (>= 3.35), libhtml-stripscripts-parser-perl (>= 1.0), libhtml-tree-perl, libhtml-format-perl, mhonarc, libregexp-common-perl
 CDBS_DEPENDS = $(common-depends)
 CDBS_BUILD_DEPENDS += , $(common-depends)
 
@@ -172,6 +172,7 @@ CDBS_BUILD_DEPENDS += , debconf-utils, po-debconf
 
 # Needed (always/often) at runtime
 CDBS_DEPENDS += , sendmail (>= 8.9) | mail-transport-agent, sysklogd (>= 1.3-27) | system-log-daemon, lsb-base, adduser, debconf | debconf-2.0, dbconfig-common
+CDBS_DEPENDS += , libdbd-mysql-perl (>= 4.007), libdbd-pg-perl, libdbd-sybase-perl, libdbd-sqlite3-perl, sqlite3
 CDBS_DEPENDS += , libfcgi-perl, libfile-copy-recursive-perl (>= 0.36), libnet-netmask-perl, libterm-progressbar-perl, libmime-lite-html-perl
 CDBS_RECOMMENDS = libfile-nfslock-perl, libio-socket-ssl-perl, libsoap-lite-perl, libcrypt-ciphersaber-perl, libmail-dkim-perl (>= 0.36), libapache2-mod-fastcgi
 CDBS_SUGGESTS = libauthcas-perl (>= 1.4), libdbd-oracle-perl (>= 0.90), libtext-linefold-perl (>= 0.008), libtext-wrap-perl

-- 
sympa Debian packaging