[Pkg-sympa-commits] [SCM] sympa Debian packaging branch, debian/squeeze, updated. debian/6.0.1+dfsg-3-8-gee5ff9b

[Emmanuel Bouthenot]

The following commit has been merged in the debian/squeeze branch:
commit 3e9346d5133bd94d680d2e65b1032c895d741b78
Author: Emmanuel Bouthenot <kolter at openics.org>
Date:   Sun Jan 9 12:29:23 2011 +0000

    Rearrange recommends and dependencies so that sympa will depends on all
    DB backends libs. This will make installation more robust regarding the
    multiples combinations of DB backends and debconf priorities (#606704).

diff --git a/debian/control b/debian/control
index 448de68..045b344 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,10 @@ Maintainer: Debian Sympa team <pkg-sympa-devel at lists.alioth.debian.org>
 Uploaders: Stefan Hornburg (Racke) <racke at linuxia.de>, Jonas Smedegaard <dr at jones.dk>, Emmanuel Bouthenot <kolter at debian.org>
 Build-Depends: cdbs (>= 0.4.70~),
  devscripts (>= 2.10.7~),
- dh-buildinfo,
  debhelper (>= 6),
+ dh-buildinfo,
  perl-suid,
  libdbi-perl (>= 1.06),
- libdbd-mysql-perl | libdbd-pg-perl | libdbd-sqlite3-perl | libdbd-sqlite2-perl,
  libarchive-zip-perl (>= 1.05),
  libmailtools-perl (>= 1.51),
  libmsgcat-perl (>= 1.0),
@@ -39,11 +38,11 @@ Homepage: http://www.sympa.org/
 
 Package: sympa
 Architecture: any
-Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${cdbs:Depends}, libfile-copy-recursive-perl, libnet-netmask-perl, libterm-progressbar-perl, libmime-lite-html-perl
+Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${cdbs:Depends}
 Replaces: wwsympa
 Provides: wwsympa
 Conflicts: wwsympa
-Recommends: logrotate, doc-base, mysql-server | postgresql | sqlite3 | sqlite, locales, ca-certificates
+Recommends: logrotate, doc-base, mysql-server | postgresql, locales, ca-certificates
 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 8720717..453c857 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: logrotate, doc-base, mysql-server | postgresql | sqlite3 | sqlite, locales, ca-certificates
+Recommends: logrotate, doc-base, mysql-server | postgresql, locales, ca-certificates
 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 2cf5af3..f4fd28d 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 = perl-suid, libdbi-perl (>= 1.06), libdbd-mysql-perl | libdbd-pg-perl | libdbd-sqlite3-perl | libdbd-sqlite2-perl, libarchive-zip-perl (>= 1.05), libmailtools-perl (>= 1.51), libmsgcat-perl (>= 1.0), libmime-tools-perl | libmime-perl (>= 5.209), perl (>= 5.8), libio-stringy-perl, libnet-ldap-perl (>= 0.27), libcgi-fast-perl, libcrypt-ciphersaber-perl, libintl-perl, libmime-charset-perl, libmime-encwords-perl, libtemplate-perl, libxml-libxml-perl, libcgi-pm-perl (>= 3.35), libhtml-stripscripts-parser-perl (>= 1.0), libhtml-tree-perl, libhtml-format-perl, mhonarc, libregexp-common-perl
+common-depends = perl-suid, libdbi-perl (>= 1.06), libarchive-zip-perl (>= 1.05), libmailtools-perl (>= 1.51), libmsgcat-perl (>= 1.0), libmime-tools-perl | libmime-perl (>= 5.209), perl (>= 5.8), libio-stringy-perl, libnet-ldap-perl (>= 0.27), libcgi-fast-perl, libcrypt-ciphersaber-perl, libintl-perl, libmime-charset-perl, libmime-encwords-perl, libtemplate-perl, libxml-libxml-perl, 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,3 +172,5 @@ CDBS_BUILD_DEPENDS += , debconf-utils, po-debconf
 
 # Needed 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 += , libfile-copy-recursive-perl, libnet-netmask-perl, libterm-progressbar-perl, libmime-lite-html-perl
+CDBS_DEPENDS += , libdbd-mysql-perl, libdbd-pg-perl, libdbd-sqlite3-perl | libdbd-sqlite2-perl, sqlite3 | sqlite

-- 
sympa Debian packaging