This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch master in repository mldonkey.
commit 76fc48e29bcdb265cd597dc2d2ed12cd2a0b594c Author: Adrian Bunk <[email protected]> Date: Wed Apr 26 10:10:51 2017 +0300 Import Debian changes 3.1.5-3.1 mldonkey (3.1.5-3.1) unstable; urgency=medium * Non-maintainer upload. * Use -std=gnu++98 to workaround FTBFS on ppc64el, thanks to Frederic Bonnard. (Closes: #859965) * Add Brazilian Portuguese debconf templates translation from Eder L. Marques. (Closes: #795366) --- .gitignore | 1 - debian/changelog | 10 ++++++++++ debian/po/pt_BR.po | 47 +++++++++++++++++++++++++++++++++++++++++++++ debian/rules | 3 +++ debian/source/local-options | 2 -- 5 files changed, 60 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 845ca06..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pc diff --git a/debian/changelog b/debian/changelog index 84684f5..233076b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +mldonkey (3.1.5-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Use -std=gnu++98 to workaround FTBFS on ppc64el, + thanks to Frederic Bonnard. (Closes: #859965) + * Add Brazilian Portuguese debconf templates translation + from Eder L. Marques. (Closes: #795366) + + -- Adrian Bunk <[email protected]> Wed, 26 Apr 2017 10:10:51 +0300 + mldonkey (3.1.5-3) unstable; urgency=medium * Team upload diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po new file mode 100644 index 0000000..e781ad6 --- /dev/null +++ b/debian/po/pt_BR.po @@ -0,0 +1,47 @@ +# mldonkey Brazilian Portuguese translation +# Copyright (C) 2012 mldonkey's PACKAGE COPYRIGHT HOLDER +# This file is distributed under the same license as the mldonkey package. +# Felipe Duarte <[email protected]>, 2012. +# Eder L. Marques <[email protected]>, 2015. +# +msgid "" +msgstr "" +"Project-Id-Version: mldonkey 3.1.0-3\n" +"Report-Msgid-Bugs-To: [email protected]\n" +"POT-Creation-Date: 2011-05-07 15:41+0200\n" +"PO-Revision-Date: 2015-08-13 08:25-0300\n" +"Last-Translator: Eder L. Marques <[email protected]>\n" +"Language-Team: Brazilian Portuguese <[email protected]>" +"\n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. Type: boolean +#. Description +#: ../mldonkey-server.templates:1001 +msgid "Launch MLDonkey at startup?" +msgstr "Iniciar o MLDonkey na inicialização?" + +#. Type: boolean +#. Description +#: ../mldonkey-server.templates:1001 +msgid "" +"If enabled, each time your machine starts, the MLDonkey server will be " +"started." +msgstr "" +"Se ativado, a cada vez que sua máquina iniciar, o servidor MLDonkey será " +"iniciado." + +#. Type: boolean +#. Description +#: ../mldonkey-server.templates:1001 +msgid "" +"Otherwise, you will need to launch MLDonkey yourself each time you want to " +"use it." +msgstr "" +"Caso contrário, você precisará iniciar o MLDonkey por conta própria a cada " +"vez que quiser usá-lo." + diff --git a/debian/rules b/debian/rules index 27e44af..dfead52 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +10,9 @@ else confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) endif +# workaround for #859965 +export DEB_CXXFLAGS_MAINT_APPEND = -std=gnu++98 + override_dh_auto_clean: # Update the PO, as suggested in "man 7 po-debconf" debconf-updatepo diff --git a/debian/source/local-options b/debian/source/local-options deleted file mode 100644 index c4cf480..0000000 --- a/debian/source/local-options +++ /dev/null @@ -1,2 +0,0 @@ -abort-on-upstream-changes -unapply-patches -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/mldonkey.git _______________________________________________ Pkg-ocaml-maint-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
