[med-svn] [Git][med-team/arb][master] 13 commits: d/po/sv: update Swedish debconf translations from Martin Bagge.
Michael R. Crusoe (@crusoe)
gitlab at salsa.debian.org
Thu Aug 17 19:02:29 BST 2023
Michael R. Crusoe pushed to branch master at Debian Med / arb
Commits:
3eff1673 by Michael R. Crusoe at 2023-08-17T18:24:53+02:00
d/po/sv: update Swedish debconf translations from Martin Bagge.
Closes: #918015
- - - - -
c2c19022 by Michael R. Crusoe at 2023-08-17T18:27:49+02:00
d/po/pt_BR: update Brazilian Portuguese debconf templates translation from Paulo Henrique de Lima Santana. Closes: #1026401
- - - - -
2b86a875 by Michael R. Crusoe at 2023-08-17T18:28:42+02:00
d/po/tr: update turkish translation of debconf messages from Atila KOÇ. Closes: #1038922
- - - - -
4fda1d94 by Michael R. Crusoe at 2023-08-17T18:36:20+02:00
d/control: switch Architecture to "any" as raxml is available everywhere
- - - - -
404092f8 by Michael R. Crusoe at 2023-08-17T19:46:43+02:00
d/patches/110_narrowing: Fix types for arm64, others
- - - - -
f7be134c by Michael R. Crusoe at 2023-08-17T19:47:21+02:00
d/rules: allow for parallel builds.
- - - - -
50ee98aa by Michael R. Crusoe at 2023-08-17T19:58:16+02:00
routine-update: Standards-Version: 4.6.2
- - - - -
02f342bd by Michael R. Crusoe at 2023-08-17T19:58:17+02:00
routine-update: debhelper-compat 13
- - - - -
619002e7 by Michael R. Crusoe at 2023-08-17T19:58:33+02:00
routine-update: Remove trailing whitespace in debian/changelog
- - - - -
80314796 by Michael R. Crusoe at 2023-08-17T19:58:34+02:00
routine-update: Add salsa-ci file
- - - - -
ed6ace85 by Michael R. Crusoe at 2023-08-17T19:58:34+02:00
routine-update: Rules-Requires-Root: no
- - - - -
5f26d75c by Michael R. Crusoe at 2023-08-17T19:58:36+02:00
Trim trailing whitespace.
Changes-By: lintian-brush
Fixes: lintian: trailing-whitespace
See-also: https://lintian.debian.org/tags/trailing-whitespace.html
- - - - -
91622699 by Michael R. Crusoe at 2023-08-17T19:59:54+02:00
routine-update: Ready to upload to unstable
- - - - -
12 changed files:
- − debian/arb-common.README.debian
- debian/arb.README.debian
- debian/changelog
- − debian/compat
- debian/control
- + debian/patches/110_narrowing.patch
- debian/patches/series
- debian/po/pt_BR.po
- debian/po/sv.po
- debian/po/tr.po
- debian/rules
- + debian/salsa-ci.yml
Changes:
=====================================
debian/arb-common.README.debian deleted
=====================================
@@ -1,12 +0,0 @@
-ARB for Debian
-==============
-
-ARB is restrictued to the architectures
-
- amd64 i386 kfreebsd-i386 kfreebsd-amd64
-
-because the dependency RAxML is only available on these architectures
-(because it relays on SSE). This makes sense because ARB is most probably
-used on these architectures anyway.
-
- -- Andreas Tille <tille at debian.org> Thu, 27 Jun 2013 14:52:57 +0200
=====================================
debian/arb.README.debian
=====================================
@@ -25,14 +25,6 @@ Dependencies
upstream releases of phyml. The latest version of phyml is
available as Debian package as well and it is in the list of
Suggested packages of Arb to enable you to compare the results.
- - The internal copy of RAxML is also replaced by the Debian
- packaged version. Due to the fact that RAxML is using SSE and
- thus is only available on the architectures
- amd64 i386 kfreebsd-i386 kfreebsd-amd64
- as a consequence also ARB is only build on these architectures
- This is most probably no restriction because ARB used on these
- architectures only anyway.
-
Comments regarding the packaging
--------------------------------
=====================================
debian/changelog
=====================================
@@ -1,3 +1,25 @@
+arb (6.0.6-6) unstable; urgency=medium
+
+ * Team upload.
+ * d/po/sv: update Swedish debconf translations from Martin Bagge.
+ Closes: #918015
+ * d/po/pt_BR: update Brazilian Portuguese debconf templates translation from
+ Paulo Henrique de Lima Santana. Closes: #1026401
+ * d/po/tr: update turkish translation of debconf messages from
+ Atila KOÇ. Closes: #1038922
+ * d/control: switch Architecture to "any" as raxml is available
+ everywhere
+ * d/patches/110_narrowing.patch: Fix types for arm64, others
+ * d/rules: allow for parallel builds.
+ * Standards-Version: 4.6.2 (routine-update)
+ * debhelper-compat 13 (routine-update)
+ * Remove trailing whitespace in debian/changelog (routine-update)
+ * Add salsa-ci file (routine-update)
+ * Rules-Requires-Root: no (routine-update)
+ * Trim trailing whitespace.
+
+ -- Michael R. Crusoe <crusoe at debian.org> Thu, 17 Aug 2023 19:59:54 +0200
+
arb (6.0.6-5) unstable; urgency=medium
* Team Upload.
@@ -12,7 +34,7 @@ arb (6.0.6-5) unstable; urgency=medium
* Fix description
Closes: #926017
* d/watch: (FIXME) Add location of new upstream releases as comment
-
+
[ Elmar Pruesse ]
* Fix stripping of static libs
@@ -751,4 +773,3 @@ arb (0.0.20041112-1) unstable; urgency=low
* Inoffcial test release.
-- Andreas Tille <tille at debian.org> Fri, 12 Nov 2004 13:15:16 +0100
-
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -6,7 +6,7 @@ Section: non-free/science
XS-Autobuild: yes
Priority: optional
Build-Depends: chrpath,
- debhelper (>= 11~),
+ debhelper-compat (= 13),
freeglut3-dev | libglu-dev,
libbio-perl-perl,
libglew-dev,
@@ -25,13 +25,14 @@ Build-Depends: chrpath,
perl-doc,
xsltproc,
xutils-dev
-Standards-Version: 4.2.1
+Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/med-team/arb
Vcs-Git: https://salsa.debian.org/med-team/arb.git
Homepage: http://www.arb-home.de/
+Rules-Requires-Root: no
Package: arb
-Architecture: amd64 i386 kfreebsd-i386 kfreebsd-amd64
+Architecture: any
Depends: arb-common (= ${source:Version}),
fastdnaml,
libarb (= ${binary:Version}),
@@ -67,7 +68,7 @@ Description: phylogenetic sequence analysis suite - main program
cooperation with Ribocon GmbH http://www.ribocon.com .
Package: libarb
-Architecture: amd64 i386 kfreebsd-i386 kfreebsd-amd64
+Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends}
Recommends: arb
@@ -88,7 +89,7 @@ Description: phylogenetic sequence analysis suite - libraries
This package provides the dynamic libraries which are used by ARB.
Package: libarb-dev
-Architecture: amd64 i386 kfreebsd-i386 kfreebsd-amd64
+Architecture: any
Section: non-free/libdevel
Depends: libarb (= ${binary:Version}),
${misc:Depends}
=====================================
debian/patches/110_narrowing.patch
=====================================
@@ -0,0 +1,25 @@
+Author: Michael R. Crusoe <crusoe at debian.org>
+Description: Fix types for arm64, others
+
+To avoid "error: narrowing conversion of '-2' from 'int' to 'char' [-Wnarrowing]"
+
+--- arb.orig/SL/FAST_ALIGNER/ClustalV.cxx
++++ arb/SL/FAST_ALIGNER/ClustalV.cxx
+@@ -275,7 +275,7 @@
+
+ static char *result[3]; // result buffers
+
+-static char pam250mt[] = {
++static int pam250mt[] = {
+ 12,
+ 0, 2,
+ -2, 1, 3,
+@@ -298,7 +298,7 @@
+ -8, -2, -5, -6, -6, -7, -4, -7, -7, -5, -3, 2, -3, -4, -5, -2, -6, 0, 0, 17
+ };
+
+-static char *matptr = pam250mt;
++static int *matptr = pam250mt;
+
+ #if (defined(DISPLAY_DIFF) || defined(MATRIX_DUMP))
+ static void p_decode(const unsigned char *naseq, unsigned char *seq, int l) {
=====================================
debian/patches/series
=====================================
@@ -8,3 +8,4 @@
80_enable_new_dtags.patch
90_do_not_create_MAFFT_symlinks.patch
100_use_tirpc.patch
+110_narrowing.patch
=====================================
debian/po/pt_BR.po
=====================================
@@ -2,15 +2,15 @@
# Copyright (C) 2010 arb's COPYRIGHT HOLDER
# This file is distributed under the same license as the arb package.
# Gustavo Jordan <gustavojcbrasil at gmail.com>, 2010.
-#
+# Paulo Henrique de Lima Santana (phls) <phls at debian.org>, 2022.
#
msgid ""
msgstr ""
-"Project-Id-Version: arb\n"
+"Project-Id-Version: arb_6.0.6-5\n"
"Report-Msgid-Bugs-To: arb at packages.debian.org\n"
"POT-Creation-Date: 2014-10-11 07:42+0200\n"
-"PO-Revision-Date: 2010-09-05 22:19-0300\n"
-"Last-Translator: Gustavo Jordan <gustavojcbrasil at gmail.com>\n"
+"PO-Revision-Date: 2022-12-19 12:37-0300\n"
+"Last-Translator: Paulo Henrique de Lima Santana (phls) <phls at debian.org>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese at lists.debian."
"org>\n"
"Language: pt_BR\n"
@@ -18,12 +18,14 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"pt_BR utf-8\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"X-Generator: Gtranslator 42.0\n"
#. Type: multiselect
#. Description
#: ../arb-common.templates:2001
msgid "ARB PT-server administrators:"
-msgstr ""
+msgstr "Administradores do servidor ARB PT:"
#. Type: multiselect
#. Description
@@ -34,6 +36,10 @@ msgid ""
"${PORT}), as well as three slots to give private per-user access (connecting "
"to ~/.arb_pts/${USER}${NUMBER}.socket)."
msgstr ""
+"A configuração padrão dos slots do servidor PT em /etc/arb/arb_tcp.dat "
+"fornece ao ARB três slots globais acessíveis a todos os usuários (conectando-"
+"se ao localhost:${PORT}), bem como três slots para fornecer acesso privado "
+"por usuário (conectando-se a ~/.arb_pts/${USER}${NUMBER}.socket)."
#. Type: multiselect
#. Description
@@ -43,13 +49,6 @@ msgid ""
"the shared PT-servers. Please enter the login names for these privileged "
"users."
msgstr ""
-
-#~ msgid "Arb users:"
-#~ msgstr "Usuários arb:"
-
-#~ msgid ""
-#~ "Please choose, among the list of all unprivileged users of the system, "
-#~ "those who will be allowed running ${pkg}."
-#~ msgstr ""
-#~ "Por favor escolha, entre a lista de todos os usuários sem privilégios no "
-#~ "sistema, aqueles que poderão executar ${pkg}."
+"Somente os membros do grupo de sistema \"arb\" poderão construir e atualizar "
+"os servidores PT compartilhados. Por favor, insira os nomes de login para "
+"esses usuários privilegiados."
=====================================
debian/po/sv.po
=====================================
@@ -1,44 +1,58 @@
# Translation of arb debconf template to Swedish
-# Copyright (C) 2014 Martin Bagge <brother at bsnet.se>
+# Copyright (C) 2019 Martin Bagge <brother at bsnet.se>
# This file is distributed under the same license as the arb package.
#
-# Martin Bagge <brother at bsnet.se>, 2014
+# Martin Bagge <brother at bsnet.se>, 2019
msgid ""
msgstr ""
"Project-Id-Version: arb 0.0.20050526-2\n"
"Report-Msgid-Bugs-To: arb at packages.debian.org\n"
-"POT-Creation-Date: 2014-09-07 19:53+0200\n"
-"PO-Revision-Date: 2014-11-17 10:32+0100\n"
+"POT-Creation-Date: 2014-10-11 07:42+0200\n"
+"PO-Revision-Date: 2019-01-02 10:04+0100\n"
"Last-Translator: Martin Bagge / brother <brother at bsnet.se>\n"
"Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 2.2\n"
#. Type: multiselect
#. Description
-#: ../arb-common.templates:1001
-msgid "ARB PT-server administrators"
-msgstr "ARB PT-server-administratörer"
+#: ../arb-common.templates:2001
+msgid "ARB PT-server administrators:"
+msgstr "ARB PT-server-administratörer:"
#. Type: multiselect
#. Description
-#: ../arb-common.templates:1001
+#: ../arb-common.templates:2001
msgid ""
-"ARB is preconfigured via /etc/arb/arb_tcp.dat with three private PT servers "
-"for each user as well as three global PT servers accessible by all users."
+"The default configuration of PT-server slots in /etc/arb/arb_tcp.dat gives "
+"ARB three global slots accessible by all users (connecting to localhost:"
+"${PORT}), as well as three slots to give private per-user access (connecting "
+"to ~/.arb_pts/${USER}${NUMBER}.socket)."
msgstr ""
-"ARB har i /etc/arb/arb_tcp.dat fått tre privata PT-servrar angivna för varje "
-"användare, samt tre globala PT-servrar som alla användare kan komma åt."
+"Standardinställningarna för PT-server-platser i /etc/arb/arb_tcp.dat ger ARB "
+"tre globala platser som alla användare kan komma åt (genom att ansluta till "
+"localhost:${PORT}), samt tre platser att nyttja privat per användare (genom "
+"att ansluta till ~/.arb_pts/${ANV}${NUMMER}.socket)"
#. Type: multiselect
#. Description
-#: ../arb-common.templates:1001
+#: ../arb-common.templates:2001
msgid ""
-"Only members of the system group \"arb\" will be able to build and update "
-"the shared PT servers. This setting configures the group members."
+"Only members of the \"arb\" system group will be able to build and update "
+"the shared PT-servers. Please enter the login names for these privileged "
+"users."
msgstr ""
"Endast medlemmar i systemgruppen \"arb\" kan bygga och uppdatera de delade "
-"PT-servrarna. Denna inställning justerar gruppmedlemmarna."
+"PT-servrarna. Ange inloggningsnamn för dessa privilegierade användare."
+
+#~ msgid ""
+#~ "ARB is preconfigured via /etc/arb/arb_tcp.dat with three private PT "
+#~ "servers for each user as well as three global PT servers accessible by "
+#~ "all users."
+#~ msgstr ""
+#~ "ARB har i /etc/arb/arb_tcp.dat fått tre privata PT-servrar angivna för "
+#~ "varje användare, samt tre globala PT-servrar som alla användare kan komma "
+#~ "åt."
=====================================
debian/po/tr.po
=====================================
@@ -1,27 +1,28 @@
-# Turkish translation of arb package
-# Copyright (C) 2014 Mert Dirik
+# Turkish debconf translation of arb
# This file is distributed under the same license as the arb package.
# Mert Dirik <mertdirik at gmail.com>, 2014.
+# Atila KOÇ <koc at artielektronik.com.tr>, 2023.
#
msgid ""
msgstr ""
"Project-Id-Version: arb\n"
"Report-Msgid-Bugs-To: arb at packages.debian.org\n"
"POT-Creation-Date: 2014-10-11 07:42+0200\n"
-"PO-Revision-Date: 2014-08-01 15:00+0200\n"
-"Last-Translator: Mert Dirik <mertdirik at gmail.com>\n"
+"PO-Revision-Date: 2023-04-20 22:30+0300\n"
+"Last-Translator: Atila KOÇ <koc at artielektronik.com.tr>\n"
"Language-Team: Debian L10n Turkish <debian-l10n-turkish at lists.debian.org>\n"
"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 2.4.2\n"
#. Type: multiselect
#. Description
#: ../arb-common.templates:2001
msgid "ARB PT-server administrators:"
-msgstr ""
+msgstr "ARB PT-sunucusu yöneticileri:"
#. Type: multiselect
#. Description
@@ -32,6 +33,11 @@ msgid ""
"${PORT}), as well as three slots to give private per-user access (connecting "
"to ~/.arb_pts/${USER}${NUMBER}.socket)."
msgstr ""
+"/etc/arb/arb_tcp.dat dosyası içindeki öntanımlı PT-sunucu yuvaları "
+"yapılandırması ARB'ye tüm kullanıcların erişebildiği (localhost:${PORT} yolu "
+"ile bağlanan) üç genel yuva ile aynı zamanda kullanıcı bazında erişime izin "
+"veren (~/.arb_pts/${USER}${NUMBER}.socket yolu ile bağlanan) üç özel yuva "
+"sunar."
#. Type: multiselect
#. Description
@@ -41,6 +47,9 @@ msgid ""
"the shared PT-servers. Please enter the login names for these privileged "
"users."
msgstr ""
+"Yalnızca 'arb' sistem grubu üyeleri paylaşılan PT-sunucularını "
+"yapılandırabilecek ve güncelleyebileceklerdir. Bu ayrıcalıklı kullanıcıların "
+"kullanıcı adlarını girin."
#~ msgid "Arb users:"
#~ msgstr "Arb kullanıcıları:"
=====================================
debian/rules
=====================================
@@ -40,7 +40,7 @@ config.makefile: config.makefile.template
config.makefile.template > config.makefile
override_dh_auto_build:
- $(MAKE) all
+ dh_auto_build -- all
override_dh_auto_configure: config.makefile
=====================================
debian/salsa-ci.yml
=====================================
@@ -0,0 +1,4 @@
+---
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
View it on GitLab: https://salsa.debian.org/med-team/arb/-/compare/d4605223d282a712a0905feef4cc962e7d033ea8...91622699f593bf765c9b5cd9257b9c92a543eb9e
--
View it on GitLab: https://salsa.debian.org/med-team/arb/-/compare/d4605223d282a712a0905feef4cc962e7d033ea8...91622699f593bf765c9b5cd9257b9c92a543eb9e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20230817/e486cc00/attachment-0001.htm>
More information about the debian-med-commit
mailing list