[med-svn] r4685 - in trunk/packages/arb/trunk/debian: . patches po source
Andreas Tille
tille at alioth.debian.org
Thu Mar 25 10:29:39 UTC 2010
Author: tille
Date: 2010-03-25 10:29:38 +0000 (Thu, 25 Mar 2010)
New Revision: 4685
Added:
trunk/packages/arb/trunk/debian/patches/10_gcc_4.4.3.patch
trunk/packages/arb/trunk/debian/po/es.po
trunk/packages/arb/trunk/debian/po/fi.po
trunk/packages/arb/trunk/debian/po/gl.po
trunk/packages/arb/trunk/debian/po/ja.po
trunk/packages/arb/trunk/debian/source/
trunk/packages/arb/trunk/debian/source/format
Modified:
trunk/packages/arb/trunk/debian/arb.README.debian
trunk/packages/arb/trunk/debian/changelog
trunk/packages/arb/trunk/debian/rules
Log:
New upstream version does now compile using latest gcc, debconf translations, source format 3.0
Modified: trunk/packages/arb/trunk/debian/arb.README.debian
===================================================================
--- trunk/packages/arb/trunk/debian/arb.README.debian 2010-03-25 09:06:45 UTC (rev 4684)
+++ trunk/packages/arb/trunk/debian/arb.README.debian 2010-03-25 10:29:38 UTC (rev 4685)
@@ -32,7 +32,7 @@
- The nameserver data are build in a separat package. The reason
is that there are perhaps more recent packages available from
http://download.arb-home.de/xtra/
- So this package can be overriden by a separat package if
+ So this package can be overridden by a separat package if
necessary.
- libmotif: I tried to compile Arb against liblesstif. The
package builds fine but when running the program some controls
Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================
--- trunk/packages/arb/trunk/debian/changelog 2010-03-25 09:06:45 UTC (rev 4684)
+++ trunk/packages/arb/trunk/debian/changelog 2010-03-25 10:29:38 UTC (rev 4685)
@@ -1,4 +1,4 @@
-arb (5.1-1) UNRELEASED; urgency=low
+arb (5.1-1) unstable; urgency=low
[ Andreas Tille ]
* New upstream version
@@ -22,6 +22,17 @@
- Removed useless warning about prereleases
- Added hint about different phyml versions
* debian/patches/10_gcc_4.4.3.patch: compile with gcc-4.4.3
+ * debian/rules: Add ARBHOME variable explicitely to clean target
+ * Added Finish debconf translation (Thanks to Esko Arajärvi <edu at iki.fi>)
+ Closes: #536516
+ * Added Galician debconf translation (Thanks to marce <mvillarino at gmail.com>)
+ Closes: #537534
+ * Added Japanese debconf translation (Thankse to Hideki Yamane <henrich at debian.or.jp>)
+ Closes: #554882
+ * Added: Spanish debconf translation (Thanks to Francisco Javier Cuadrado
+ <fcocuadrado at gmail.com>)
+ Closes: #573005
+ * Switch to source format 3.0
[ David Paleino ]
* Removed myself from Uploaders
Added: trunk/packages/arb/trunk/debian/patches/10_gcc_4.4.3.patch
===================================================================
--- trunk/packages/arb/trunk/debian/patches/10_gcc_4.4.3.patch (rev 0)
+++ trunk/packages/arb/trunk/debian/patches/10_gcc_4.4.3.patch 2010-03-25 10:29:38 UTC (rev 4685)
@@ -0,0 +1,130 @@
+--- arbsrc_6213.orig/SL/FILE_BUFFER/FileBuffer.cxx
++++ arbsrc_6213/SL/FILE_BUFFER/FileBuffer.cxx
+@@ -13,6 +13,7 @@
+ #include <cstdlib>
+ #include <cstring>
+ #include <errno.h>
++#include <cstdio>
+
+ using namespace std;
+
+--- arbsrc_6213.orig/SL/FAST_ALIGNER/ClustalV.cxx
++++ arbsrc_6213/SL/FAST_ALIGNER/ClustalV.cxx
+@@ -286,8 +286,8 @@
+ // 2 for improbably mutations
+ // -1 if one char is illegal
+ {
+- char *p1 = strchr(nucleic_acid_order, c1);
+- char *p2 = strchr(nucleic_acid_order, c2);
++ char *p1 = (char *)strchr(nucleic_acid_order, c1);
++ char *p2 = (char *)strchr(nucleic_acid_order, c2);
+
+ awtc_assert(c1);
+ awtc_assert(c2);
+--- arbsrc_6213.orig/AWT/AWT_file_selection.cxx
++++ arbsrc_6213/AWT/AWT_file_selection.cxx
+@@ -142,7 +142,7 @@
+ }
+
+ char *AWT_extract_directory(const char *path) {
+- char *lslash = strrchr(path, '/');
++ char *lslash = (char *)strrchr(path, '/');
+ if (!lslash) return 0;
+
+ char *result = strdup(path);
+--- arbsrc_6213.orig/AWTI/AWTI_import.cxx
++++ arbsrc_6213/AWTI/AWTI_import.cxx
+@@ -19,7 +19,7 @@
+ #define MAX_COMMENT_LINES 2000
+
+ inline const char *name_only(const char *fullpath) {
+- char *lslash = strrchr(fullpath, '/');
++ char *lslash = (char *)strrchr(fullpath, '/');
+ return lslash ? lslash+1 : fullpath;
+ }
+
+--- arbsrc_6213.orig/NTREE/NT_edconf.cxx
++++ arbsrc_6213/NTREE/NT_edconf.cxx
+@@ -249,7 +249,7 @@
+ static long nt_build_sai_string_by_hash(const char *key, long val, void *cd_sai_builder) {
+ struct SAI_string_builder *sai_builder = (struct SAI_string_builder*)cd_sai_builder;
+
+- char *sep = strchr(key,1);
++ char *sep = (char *)strchr(key,1);
+ if (!sep) return val; // what's wrong
+
+ struct GBS_strstruct *sai_middle = sai_builder->sai_middle;
+--- arbsrc_6213.orig/PROBE_DESIGN/probe_design.cxx
++++ arbsrc_6213/PROBE_DESIGN/probe_design.cxx
+@@ -1848,7 +1848,7 @@
+ }
+
+ if (!error) { // set pt-server database file to same permissions as pts directory
+- char *dir = strrchr(file,'/');
++ char *dir = (char *)strrchr(file,'/');
+ if (dir) {
+ *dir = 0;
+ long modi = GB_mode_of_file(file);
+--- arbsrc_6213.orig/PROBE_DESIGN/SaiProbeVisualization.cxx
++++ arbsrc_6213/PROBE_DESIGN/SaiProbeVisualization.cxx
+@@ -526,7 +526,7 @@
+
+ if (!tok_suffix) {
+ // handle special case where no suffix exists
+- char *end = strchr(probeRegion, 0);
++ char *end = (char *)strchr(probeRegion, 0);
+ if (end>probeRegion && end[-1] == '-') tok_suffix = "";
+ }
+
+--- arbsrc_6213.orig/HELP_SOURCE/arb_help2xml.cxx
++++ arbsrc_6213/HELP_SOURCE/arb_help2xml.cxx
+@@ -302,7 +302,7 @@
+ // returns NULL if no keyword was found
+ // otherwise returns position behind keyword and sets value of 'keyword'
+
+- char *space = strchr(line, ' ');
++ char *space = (char *)strchr(line, ' ');
+ if (space && space>line) {
+ keyword = string(line, 0, space-line);
+ return space;
+--- arbsrc_6213.orig/PROBE/PT_prefixtree.cxx
++++ arbsrc_6213/PROBE/PT_prefixtree.cxx
+@@ -238,7 +238,7 @@
+ int size = p - buffer;
+ p = (char *)PTM_get_mem(size);
+ memcpy(p,buffer,size);
+- PT_WRITE_PNTR(data,p);
++ PT_WRITE_PNTR(data,(long)p);
+ psg.stat.cut_offs ++;
+ return NULL;
+ }
+@@ -318,7 +318,7 @@
+ gfather = (POS_TREE *)j;
+ if (gfather){
+ PT_change_father(gfather, father, new_elemfather);
+- PT_WRITE_PNTR(&new_elemfather->data,gfather);
++ PT_WRITE_PNTR(&new_elemfather->data,(long)gfather);
+ }
+ sbase = dbase = sizeof(PT_PNTR);
+ base2 = 1 << base;
+@@ -328,16 +328,16 @@
+ son = (POS_TREE *)j;
+ int sontype = PT_GET_TYPE(son);
+ if (sontype != PT_NT_SAVED) {
+- PT_WRITE_PNTR((char *) &son->data, new_elemfather);
++ PT_WRITE_PNTR((char *) &son->data, (long)new_elemfather);
+ }
+- PT_WRITE_PNTR(((char *) &new_elemfather->data) + dbase, son);
++ PT_WRITE_PNTR(((char *) &new_elemfather->data) + dbase, (long)son);
+ sbase += sizeof(PT_PNTR);
+ dbase += sizeof(PT_PNTR);
+ continue;
+ }
+ if (i & base2) {
+- PT_WRITE_PNTR(((char *) &new_elemfather->data) + dbase, node);
+- PT_WRITE_PNTR((&node->data), (PT_PNTR)new_elemfather);
++ PT_WRITE_PNTR(((char *) &new_elemfather->data) + dbase, (long)node);
++ PT_WRITE_PNTR((&node->data), (long)new_elemfather);
+ dbase += sizeof(PT_PNTR);
+ }
+ }
Added: trunk/packages/arb/trunk/debian/po/es.po
===================================================================
--- trunk/packages/arb/trunk/debian/po/es.po (rev 0)
+++ trunk/packages/arb/trunk/debian/po/es.po 2010-03-25 10:29:38 UTC (rev 4685)
@@ -0,0 +1,50 @@
+# arb po-debconf translation to Spanish
+# Copyright (C) 2010 Software in the Public Interest
+# This file is distributed under the same license as the arb package.
+#
+# Changes:
+# - Initial translation
+# Francisco Javier Cuadrado <fcocuadrado at gmail.com>
+#
+# Traductores, si no conocen el formato PO, merece la pena leer la
+# documentación de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Equipo de traducción al español, por favor lean antes de traducir
+# los siguientes documentos:
+#
+# - El proyecto de traducción de Debian al español
+# http://www.debian.org/intl/spanish/
+# especialmente las notas y normas de traducción en
+# http://www.debian.org/intl/spanish/notas
+#
+# - La guía de traducción de po's de debconf:
+# /usr/share/doc/po-debconf/README-trans
+# o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: arb 0.0.20071207.1-7\n"
+"Report-Msgid-Bugs-To: arb at packages.debian.org\n"
+"POT-Creation-Date: 2009-03-20 08:21+0100\n"
+"PO-Revision-Date: 2010-03-05 09:00+0100\n"
+"Last-Translator: Francisco Javier Cuadrado <fcocuadrado at gmail.com>\n"
+"Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../arb-common.templates:1001
+msgid "Arb users:"
+msgstr "Usuarios de arb:"
+
+#. Type: multiselect
+#. Description
+#: ../arb-common.templates:1001
+msgid "Please choose, among the list of all unprivileged users of the system, those who will be allowed running ${pkg}."
+msgstr "Escoja de entre la lista de todos los usuarios sin privilegios del sistema, aquellos que podrán ejecutar ${pkg}."
+
Added: trunk/packages/arb/trunk/debian/po/fi.po
===================================================================
--- trunk/packages/arb/trunk/debian/po/fi.po (rev 0)
+++ trunk/packages/arb/trunk/debian/po/fi.po 2010-03-25 10:29:38 UTC (rev 4685)
@@ -0,0 +1,33 @@
+# Copyright (C) 2009
+# This file is distributed under the same license as the arb package.
+#
+# Esko Arajärvi <edu at iki.fi>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: arb\n"
+"Report-Msgid-Bugs-To: arb at packages.debian.org\n"
+"POT-Creation-Date: 2009-03-20 08:21+0100\n"
+"PO-Revision-Date: 2009-07-10 20:54+0300\n"
+"Last-Translator: Esko Arajärvi <edu at iki.fi>\n"
+"Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 0.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: multiselect
+#. Description
+#: ../arb-common.templates:1001
+msgid "Arb users:"
+msgstr "Arb-käyttäjät:"
+
+#. Type: multiselect
+#. Description
+#: ../arb-common.templates:1001
+msgid ""
+"Please choose, among the list of all unprivileged users of the system, those "
+"who will be allowed running ${pkg}."
+msgstr ""
+"Valitse järjestelmän kaikkien tavallisten käyttäjien listalta ne, jotka "
+"saavat ajaa ohjelman ${pkg}."
Added: trunk/packages/arb/trunk/debian/po/gl.po
===================================================================
--- trunk/packages/arb/trunk/debian/po/gl.po (rev 0)
+++ trunk/packages/arb/trunk/debian/po/gl.po 2010-03-25 10:29:38 UTC (rev 4685)
@@ -0,0 +1,35 @@
+# Copyright (C) 2009 Marce Villarino
+# This file is distributed under the same license as the arb package.
+#
+# Marce Villarino <mvillarino at gmail.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: arb\n"
+"Report-Msgid-Bugs-To: arb at packages.debian.org\n"
+"POT-Creation-Date: 2009-03-20 08:21+0100\n"
+"PO-Revision-Date: 2009-07-19 11:25+0200\n"
+"Last-Translator: Marce Villarino <mvillarino at gmail.com>\n"
+"Language-Team: Galician <proxecto at trasno.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 0.3\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. Type: multiselect
+#. Description
+#: ../arb-common.templates:1001
+msgid "Arb users:"
+msgstr "Usuarios de Arb:"
+
+#. Type: multiselect
+#. Description
+#: ../arb-common.templates:1001
+msgid ""
+"Please choose, among the list of all unprivileged users of the system, those "
+"who will be allowed running ${pkg}."
+msgstr ""
+"Escolla na lista de todos os usuarios sen privilexios do sistema, aqueles a "
+"quen "
+"se lles permitirá executar ${pkg}."
+
Added: trunk/packages/arb/trunk/debian/po/ja.po
===================================================================
--- trunk/packages/arb/trunk/debian/po/ja.po (rev 0)
+++ trunk/packages/arb/trunk/debian/po/ja.po 2010-03-25 10:29:38 UTC (rev 4685)
@@ -0,0 +1,32 @@
+# Copyright (C) 2009 Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+# This file is distributed under the same license as the tipcutils package.
+# Hideki Yamane (Debian-JP) <henrich at debian.or.jp>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: arb 0.0.20071207.1-7\n"
+"Report-Msgid-Bugs-To: arb at packages.debian.org\n"
+"POT-Creation-Date: 2009-03-20 08:21+0100\n"
+"PO-Revision-Date: 2009-11-07 10:23+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich at debian.or.jp>\n"
+"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: multiselect
+#. Description
+#: ../arb-common.templates:1001
+msgid "Arb users:"
+msgstr "arb ユーザ:"
+
+#. Type: multiselect
+#. Description
+#: ../arb-common.templates:1001
+msgid ""
+"Please choose, among the list of all unprivileged users of the system, those "
+"who will be allowed running ${pkg}."
+msgstr ""
+"システムのすべての非特権ユーザの一覧から、${pkg} を動作させるのを許可するユーザ"
+"を選んでください。"
+
Modified: trunk/packages/arb/trunk/debian/rules
===================================================================
--- trunk/packages/arb/trunk/debian/rules 2010-03-25 09:06:45 UTC (rev 4684)
+++ trunk/packages/arb/trunk/debian/rules 2010-03-25 10:29:38 UTC (rev 4685)
@@ -12,6 +12,8 @@
### pkgserv=$(pkg)-server
common=debian/$(pkgcom)
+ARBHOME=$(CURDIR)
+
include /usr/share/quilt/quilt.make
build: build-stamp debian/po/templates.pot
@@ -19,16 +21,14 @@
dh_testdir
mkdir -p LIBLINK MAKEBIN lib/help
- export ARBHOME=`pwd` ; \
export LC_ALL=C ; \
- export PATH=$${ARBHOME}/bin:$${PATH} ; \
- export LD_LIBRARY_PATH=$${ARBHOME}/lib:$${LD_LIBRARY_PATH}; \
- $(MAKE) DEBIAN=1 ARBHOME=$${ARBHOME} all
- export ARBHOME=`pwd` ; \
+ export PATH=$(ARBHOME)/bin:$${PATH} ; \
+ export LD_LIBRARY_PATH=$(ARBHOME)/lib:$${LD_LIBRARY_PATH}; \
+ $(MAKE) DEBIAN=1 ARBHOME=$(ARBHOME) all
export LC_ALL=C ; \
- export PATH=$${ARBHOME}/bin:$${PATH} ; \
- export LD_LIBRARY_PATH=$${ARBHOME}/lib:$${LD_LIBRARY_PATH}; \
- $(MAKE) DEBIAN=1 ARBHOME=$${ARBHOME} arbxtras
+ export PATH=$(ARBHOME)/bin:$${PATH} ; \
+ export LD_LIBRARY_PATH=$(ARBHOME)/lib:$${LD_LIBRARY_PATH}; \
+ $(MAKE) DEBIAN=1 ARBHOME=$(ARBHOME) arbxtras
touch $@
@@ -57,7 +57,7 @@
# Make does only work if config.makefile exists which is only the
# case when quilt has installed the patches. So there is neither
# a need nor the expection of success if config.makefile is missing
- [ ! -f config.makefile ] || $(MAKE) clean
+ [ ! -f config.makefile ] || $(MAKE) DEBIAN=1 ARBHOME=$(ARBHOME) clean
# fix broken clean process
find . -type f -name "*.a" -exec rm -f \{\} \;
Added: trunk/packages/arb/trunk/debian/source/format
===================================================================
--- trunk/packages/arb/trunk/debian/source/format (rev 0)
+++ trunk/packages/arb/trunk/debian/source/format 2010-03-25 10:29:38 UTC (rev 4685)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the debian-med-commit
mailing list