Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
Hi Release Team, This upload would fix 2 bugs: - #605355: Portuguese debconf translations update. - #606704: RC bug during install. The diff is attached. Regards, -- System Information: Debian Release: 6.0 APT prefers testing APT policy: (500, 'testing') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-bpo.5-amd64 (SMP w/2 CPU cores) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash
diff --git a/debian/changelog b/debian/changelog index df736c5..d12b9b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +sympa (6.0.1+dfsg-4) testing-proposed-updates; urgency=low + + [ Stefan Hornburg (Racke) ] + * Update Portuguese debconf translations (Closes: #605355, + thanks to Miguel Figueiredo) + + [ Emmanuel Bouthenot ] + * Fix the empty 'supported_lang' option from a newly generated sympa.conf + when no locales are installed. 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 (Closes: #606704). + + -- Emmanuel Bouthenot <[email protected]> Sun, 09 Jan 2011 12:20:39 +0000 + sympa (6.0.1+dfsg-3) testing-proposed-updates; urgency=low [ Stefan Hornburg (Racke) ] 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 <[email protected]> Uploaders: Stefan Hornburg (Racke) <[email protected]>, Jonas Smedegaard <[email protected]>, Emmanuel Bouthenot <[email protected]> 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/po/pt.po b/debian/po/pt.po index eba7056..7b5c3f7 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -7,13 +7,15 @@ msgstr "" "Project-Id-Version: sympa\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2010-04-12 15:33+0200\n" -"PO-Revision-Date: 2008-04-19 16:27+0100\n" +"PO-Revision-Date: 2010-11-29 08:19+0000\n" "Last-Translator: Miguel Figueiredo <[email protected]>\n" "Language-Team: Portuguese <[email protected]>\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.0\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: select #. Description @@ -132,7 +134,7 @@ msgstr "" #. Description #: ../templates:5001 msgid "URL to access WWSympa:" -msgstr "" +msgstr "URL para aceder a WWSympa:" #. Type: select #. Choices diff --git a/debian/postinst b/debian/postinst index 8deec46..4e11f37 100644 --- a/debian/postinst +++ b/debian/postinst @@ -72,6 +72,9 @@ lang="$RET" perl -pi~ -e "s/^\s*lang.*$/lang\t\t$lang/;" "$conf" rm -f "$conf"~ +# Fixing supported_lang if empty +perl -i -pe "s/^\s*(supported_lang)\s*\$/\$1\t\tnone\n/;" "$conf" + # Get the hostname db_get sympa/hostname hostn="$RET" diff --git a/debian/rules b/debian/rules index 5ddd71e..f4fd28d 100755 --- a/debian/rules +++ b/debian/rules @@ -28,7 +28,7 @@ PERL=/usr/bin/perl SCRIPTS = p12topem.pl testldap.pl load_subscribers.pl orphan_killer.pl \ crypt_passwd.pl init_comment.pl arc2webarc.pl -DEB_UPSTREAM_URL = http://www.sympa.org/distribution +DEB_UPSTREAM_URL = http://www.sympa.org/distribution/old DEB_UPSTREAM_TARBALL_MD5 = 418fc8f851b4dcaae67785a7b12c4cf5 # TODO: drop before next upstream release @@ -72,6 +72,9 @@ DEB_INSTALL_MANPAGES_sympa = $(man8basenames:%=doc/man8/%.8) DEB_UPDATE_RCD_PARAMS = defaults 50 DEB_FIXPERMS_EXCLUDE = /usr/lib/sympa/bin/queue /usr/lib/sympa/bin/bouncequeue +# “maintainer-clean” target will also remove po{,-wwsympa}/{stamp-po,*.gmo} files +DEB_MAKE_CLEAN_TARGET = maintainer-clean + localenames = af ar bg br ca cs de el en_US es et eu fi fr hu id it ja ko localenames += ml nb_NO nl nn_NO oc pl pt pt_BR ro ru sv tr vi zh_CN zh_TW upstreamtmpfiles += $(localenames:%=po/%.gmo) @@ -88,6 +91,7 @@ clean:: [ ! -e $$file.upstream ] || mv -f $$file.upstream $$file; \ done rm -f debian/stamp-upstreamtmpstuff + rm -f po/stamp-po po-wwsympa/stamp-po clean:: debconf-updatepo @@ -159,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) @@ -168,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
