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

Emmanuel Bouthenot kolter at openics.org
Fri Jun 3 22:58:04 UTC 2011


The following commit has been merged in the master branch:
commit 2866386cf2f9d1eefed3fbc09275c4152c126eda
Author: Emmanuel Bouthenot <kolter at openics.org>
Date:   Fri Jun 3 13:52:28 2011 +0000

    Rewrite the CDBS_{DEPENDS,RECOMMENDS,SUGGESTS} declarations so that it's easier to read (no more overlong lines)

diff --git a/debian/rules b/debian/rules
index 8c2339e..3f9bd57 100755
--- a/debian/rules
+++ b/debian/rules
@@ -161,16 +161,31 @@ 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), 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)
+common-depends = libdbi-perl (>= 1.48), libarchive-zip-perl (>= 1.05)
+common-depends += , libmailtools-perl (>= 1.51), libmsgcat-perl (>= 1.0), libmime-tools-perl
+common-depends += , perl (>= 5.8), libio-stringy-perl, libnet-ldap-perl, libcgi-fast-perl
+common-depends += , libintl-perl, libmime-charset-perl, libmime-encwords-perl, libtemplate-perl
+common-depends += , libxml-libxml-perl, perl-modules (>= 5.10) | libcgi-pm-perl (>= 3.35)
+common-depends += , libhtml-stripscripts-parser-perl (>= 1.0), libhtml-tree-perl, libhtml-format-perl
+common-depends += , mhonarc, libregexp-common-perl
 
 # Needed by packaging routines
+CDBS_BUILD_DEPENDS += , $(common-depends)
 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
+CDBS_DEPENDS = $(common-depends)
+CDBS_DEPENDS += , sendmail (>= 8.9) | mail-transport-agent
+CDBS_DEPENDS += , sysklogd (>= 1.3-27) | system-log-daemon
+CDBS_DEPENDS += , lsb-base, adduser, debconf | debconf-2.0, dbconfig-common
+CDBS_DEPENDS += , libdbd-mysql-perl (>= 4.007), libdbd-pg-perl
+CDBS_DEPENDS += , libdbd-sybase-perl, libdbd-sqlite3-perl, sqlite3
+CDBS_DEPENDS += , libfcgi-perl, libfile-copy-recursive-perl (>= 0.36), libnet-netmask-perl
+CDBS_DEPENDS += , libterm-progressbar-perl, libmime-lite-html-perl
+
+CDBS_RECOMMENDS = libfile-nfslock-perl, libio-socket-ssl-perl, libsoap-lite-perl
+CDBS_RECOMMENDS += , libcrypt-ciphersaber-perl, libmail-dkim-perl (>= 0.36)
+CDBS_RECOMMENDS += , libapache2-mod-fastcgi
+
+CDBS_SUGGESTS = libauthcas-perl (>= 1.4), libdbd-oracle-perl (>= 0.90)
+CDBS_SUGGESTS += , libtext-linefold-perl (>= 0.008), libtext-wrap-perl

-- 
sympa Debian packaging



More information about the Pkg-sympa-commits mailing list