[med-svn] r23262 - in trunk/packages/arb/trunk/debian: . patches po

Andreas Tille tille at moszumanska.debian.org
Wed Dec 7 10:36:15 UTC 2016 

Author: tille
Date: 2016-12-07 10:36:14 +0000 (Wed, 07 Dec 2016)
New Revision: 23262

Removed:
   trunk/packages/arb/trunk/debian/arb.menu
   trunk/packages/arb/trunk/debian/patches/90_gcc6.patch
Modified:
   trunk/packages/arb/trunk/debian/arb-common.install
   trunk/packages/arb/trunk/debian/arb.README.debian
   trunk/packages/arb/trunk/debian/changelog
   trunk/packages/arb/trunk/debian/compat
   trunk/packages/arb/trunk/debian/control
   trunk/packages/arb/trunk/debian/patches/70_skip_compler_version_check.patch
   trunk/packages/arb/trunk/debian/patches/80_enable_new_dtags.patch
   trunk/packages/arb/trunk/debian/patches/series
   trunk/packages/arb/trunk/debian/po/ca.po
   trunk/packages/arb/trunk/debian/po/sv.po
   trunk/packages/arb/trunk/debian/rules
   trunk/packages/arb/trunk/debian/watch
Log:
  * New upstream version
  * Update Swedish debconf translation (Thanks to Martin Bagge
    <brother at bsnet.se>)
    Closes: #769879
  * Add Catalan debconf templates translation (Thanks to Innocent De Marchi
    <tangram.peces at gmail.com>)
    Closes: #788004
  * debhelper 10
  * d/watch: version=4
  * d/rules: hardening=+all (but no effect :-()
  * Delete menu file
  * Install arb_CHANGES.txt as upstream changelog



Modified: trunk/packages/arb/trunk/debian/arb-common.install
===================================================================
--- trunk/packages/arb/trunk/debian/arb-common.install	2016-12-07 07:55:07 UTC (rev 23261)
+++ trunk/packages/arb/trunk/debian/arb-common.install	2016-12-07 10:36:14 UTC (rev 23262)
@@ -1,5 +1,4 @@
 debian/tmp/demo.arb                   usr/share/doc/arb/examples
-debian/tmp/arb_CHANGES.txt            usr/share/doc/arb/changelog
 debian/tmp/arb_LICENSE.txt            usr/share/doc/arb
 debian/tmp/arb_README.txt             usr/share/doc/arb
 

Modified: trunk/packages/arb/trunk/debian/arb.README.debian
===================================================================
--- trunk/packages/arb/trunk/debian/arb.README.debian	2016-12-07 07:55:07 UTC (rev 23261)
+++ trunk/packages/arb/trunk/debian/arb.README.debian	2016-12-07 10:36:14 UTC (rev 23262)
@@ -9,7 +9,7 @@
 
  - Arb comes with its own version of Phylip.  Because Phylip has
    its Debian package this is not build into arb package.  Instead
-   I replaced links to the apropriate locations.
+   I replaced links to the appropriate locations.
  - Arb has its own version of FastDNAml which has also a separate
    Debian package.  Here also symlinks to the Debian packaged
    version are used.

Deleted: trunk/packages/arb/trunk/debian/arb.menu
===================================================================
--- trunk/packages/arb/trunk/debian/arb.menu	2016-12-07 07:55:07 UTC (rev 23261)
+++ trunk/packages/arb/trunk/debian/arb.menu	2016-12-07 10:36:14 UTC (rev 23262)
@@ -1,2 +0,0 @@
-?package(arb):needs="X11" section="Applications/Science/Biology" \
-  title="Arb"  icon="/usr/share/arb/arb.xpm" command="/usr/bin/arb"

Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================
--- trunk/packages/arb/trunk/debian/changelog	2016-12-07 07:55:07 UTC (rev 23261)
+++ trunk/packages/arb/trunk/debian/changelog	2016-12-07 10:36:14 UTC (rev 23262)
@@ -1,3 +1,20 @@
+arb (6.0.6-1) unstable; urgency=medium
+
+  * New upstream version
+  * Update Swedish debconf translation (Thanks to Martin Bagge
+    <brother at bsnet.se>)
+    Closes: #769879
+  * Add Catalan debconf templates translation (Thanks to Innocent De Marchi
+    <tangram.peces at gmail.com>)
+    Closes: #788004
+  * debhelper 10
+  * d/watch: version=4
+  * d/rules: hardening=+all (but no effect :-()
+  * Delete menu file
+  * Install arb_CHANGES.txt as upstream changelog
+
+ -- Andreas Tille <tille at debian.org>  Wed, 07 Dec 2016 10:34:07 +0100
+
 arb (6.0.3-2) unstable; urgency=medium
 
   * Team upload.

Modified: trunk/packages/arb/trunk/debian/compat
===================================================================
--- trunk/packages/arb/trunk/debian/compat	2016-12-07 07:55:07 UTC (rev 23261)
+++ trunk/packages/arb/trunk/debian/compat	2016-12-07 10:36:14 UTC (rev 23262)
@@ -1 +1 @@
-9
+10

Modified: trunk/packages/arb/trunk/debian/control
===================================================================
--- trunk/packages/arb/trunk/debian/control	2016-12-07 07:55:07 UTC (rev 23261)
+++ trunk/packages/arb/trunk/debian/control	2016-12-07 10:36:14 UTC (rev 23262)
@@ -6,7 +6,7 @@
 XS-Autobuild: yes
 Priority: optional
 Build-Depends: chrpath,
-               debhelper (>= 9),
+               debhelper (>= 10),
                freeglut3-dev | libglu-dev,
                libbio-perl-perl,
                libglew-dev,

Modified: trunk/packages/arb/trunk/debian/patches/70_skip_compler_version_check.patch
===================================================================
--- trunk/packages/arb/trunk/debian/patches/70_skip_compler_version_check.patch	2016-12-07 07:55:07 UTC (rev 23261)
+++ trunk/packages/arb/trunk/debian/patches/70_skip_compler_version_check.patch	2016-12-07 10:36:14 UTC (rev 23262)
@@ -5,11 +5,12 @@
 
 --- a/Makefile
 +++ b/Makefile
-@@ -738,23 +738,7 @@ check_same_GCC_VERSION:
+@@ -749,24 +749,7 @@ check_same_GCC_VERSION:
  		$(ARBHOME)/SOURCE_TOOLS/check_same_compiler_version.pl $(COMPILER_NAME) $(COMPILER_VERSION_ALLOWED)
  
  check_GCC_VERSION:
 -		@echo 'Compiler version check:'
+-# see . at ALLOWED_gcc_VERSIONS
 -ifeq ('$(COMPILER_VERSION_ALLOWED)', '')
 -		@echo "  - Your compiler is '$(COMPILER_NAME)' version '$(COMPILER_VERSION)'"
 -		@echo '    This version is not in the list of supported $(COMPILER_NAME)-versions:'

Modified: trunk/packages/arb/trunk/debian/patches/80_enable_new_dtags.patch
===================================================================
--- trunk/packages/arb/trunk/debian/patches/80_enable_new_dtags.patch	2016-12-07 07:55:07 UTC (rev 23261)
+++ trunk/packages/arb/trunk/debian/patches/80_enable_new_dtags.patch	2016-12-07 10:36:14 UTC (rev 23262)
@@ -7,7 +7,7 @@
 
 --- a/Makefile
 +++ b/Makefile
-@@ -198,8 +198,8 @@ ifeq ($(DEBUG),0)
+@@ -201,8 +201,8 @@ ifeq ($(DEBUG),0)
  endif
  
  ifeq ($(DEBIAN),1)

Deleted: trunk/packages/arb/trunk/debian/patches/90_gcc6.patch
===================================================================
--- trunk/packages/arb/trunk/debian/patches/90_gcc6.patch	2016-12-07 07:55:07 UTC (rev 23261)
+++ trunk/packages/arb/trunk/debian/patches/90_gcc6.patch	2016-12-07 10:36:14 UTC (rev 23262)
@@ -1,46 +0,0 @@
-Author: Sascha Steinbiss <satta at debian.org>
-Description: fix building with GCC 6.
-
---- a/HEADERLIBS/Makefile
-+++ b/HEADERLIBS/Makefile
-@@ -7,5 +7,6 @@
- eigen: eigen.tgz
- 	tar -zxvf $<
- 	touch eigen/
-+	patch -p0 < return_value.patch
- 
- 
---- /dev/null
-+++ b/HEADERLIBS/return_value.patch
-@@ -0,0 +1,20 @@
-+--- eigen/Eigen/src/Sparse/AmbiVector.h.1	2016-09-17 11:46:17.000000000 +0000
-++++ eigen/Eigen/src/Sparse/AmbiVector.h	2016-09-17 11:47:13.000000000 +0000
-+@@ -44,7 +44,7 @@
-+     void init(RealScalar estimatedDensity);
-+     void init(int mode);
-+ 
-+-    void nonZeros() const;
-++    int nonZeros() const;
-+ 
-+     /** Specifies a sub-vector to work on */
-+     void setBounds(int start, int end) { m_start = start; m_end = end; }
-+@@ -133,7 +133,7 @@
-+ 
-+ /** \returns the number of non zeros in the current sub vector */
-+ template<typename Scalar>
-+-void AmbiVector<Scalar>::nonZeros() const
-++int AmbiVector<Scalar>::nonZeros() const
-+ {
-+   if (m_mode==IsSparse)
-+     return m_llSize;
---- a/TEMPLATES/cxxforward.h
-+++ b/TEMPLATES/cxxforward.h
-@@ -21,7 +21,7 @@
- # if (GCC_VERSION_CODE >= 407)
- #  if (__cplusplus == 199711L)
- #  else
--#   if (__cplusplus == 201103L)
-+#   if (__cplusplus >= 201103L)
- #    define ARB_ENABLE_Cxx11_FEATURES
- #   else
- #    error Unknown C++ standard defined in __cplusplus

Modified: trunk/packages/arb/trunk/debian/patches/series
===================================================================
--- trunk/packages/arb/trunk/debian/patches/series	2016-12-07 07:55:07 UTC (rev 23261)
+++ trunk/packages/arb/trunk/debian/patches/series	2016-12-07 10:36:14 UTC (rev 23262)
@@ -6,4 +6,3 @@
 60_use_packaged_phyml
 70_skip_compler_version_check.patch
 80_enable_new_dtags.patch
-90_gcc6.patch

Modified: trunk/packages/arb/trunk/debian/po/ca.po
===================================================================
--- trunk/packages/arb/trunk/debian/po/ca.po	2016-12-07 07:55:07 UTC (rev 23261)
+++ trunk/packages/arb/trunk/debian/po/ca.po	2016-12-07 10:36:14 UTC (rev 23262)
@@ -3,54 +3,49 @@
 # Copyright (C) 2007 Andreas Tille.
 # This file is distributed under the same license as the PACKAGE package.
 # Miguel Gea Milvaques <xerakko at debian.org>, 2007.
-# Innocent De Marchi <tangram.peces at gmail.com>, 2011.
+# Innocent De Marchi <tangram.peces at gmail.com>, 2011-2015.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 5.2-1\n"
+"Project-Id-Version: 6.0.2-1\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-10-13 19:20+0100\n"
+"POT-Creation-Date: 2014-09-07 19:53+0200\n"
+"PO-Revision-Date: 2015-05-27 18:25+0100\n"
 "Last-Translator: Innocent De Marchi <tangram.peces at gmail.com>\n"
 "Language-Team: catalan <debian-l10n-catalan at lists.debian.org>\n"
 "Language: ca_ES\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.7.6\n"
 
 #. Type: multiselect
 #. Description
-#: ../arb-common.templates:2001
-msgid "ARB PT-server administrators:"
-msgstr "Administradors del servidor-PT de ARB:"
+#: ../arb-common.templates:1001
+msgid "ARB PT-server administrators"
+msgstr "Administradors del servidor PT d'ARB"
 
 #. Type: multiselect
 #. Description
-#: ../arb-common.templates:2001
+#: ../arb-common.templates:1001
 msgid ""
-"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)."
+"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 ""
-"La configuració predeterminada  de les ranures del servidor PT a /etc/arb/"
-"arb_tcp.da deixa tres ranures globals ARB accessibles per a tots els usuaris "
-"(connectant al servidor local:${PORT}), a més d'altres tres ranures per a "
-"accés privat de cada usuari (connectant a ~/.arb_pts/${USER}${NUMBER}."
-"socket)."
+"ARB es pre-configura mitjançant /etc/arb/arb_tcp.dat amb tres servidors "
+"privats PT per a cada usuari així com a tres servidors PT globals "
+"accessibles per a tots els usuaris."
 
 #. Type: multiselect
 #. Description
-#: ../arb-common.templates:2001
+#: ../arb-common.templates:1001
 msgid ""
-"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."
+"Only members of the system group \"arb\" will be able to build and update "
+"the shared PT servers. This setting configures the group members."
 msgstr ""
-"Només els membres del grup \"arb\" del sistema poden construir i actualitzar "
-"els servidors PT compartits. Si us plau, escriviu els noms identificatius "
-"per a aquests usuaris amb permís d'accés. "
+"Només els usuaris membres del grup del sistema «arb» poden compilar i "
+"actualitzar el servidors PT compartits. Aquesta opció configura els membres "
+"del grup."
 
 #~ msgid "Arb users:"
 #~ msgstr "Usuaris Arb:"

Modified: trunk/packages/arb/trunk/debian/po/sv.po
===================================================================
--- trunk/packages/arb/trunk/debian/po/sv.po	2016-12-07 07:55:07 UTC (rev 23261)
+++ trunk/packages/arb/trunk/debian/po/sv.po	2016-12-07 10:36:14 UTC (rev 23262)
@@ -1,59 +1,44 @@
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-# Developers do not need to manually edit POT or PO files.
-# , fuzzy
+# Translation of arb debconf template to Swedish
+# Copyright (C) 2014 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
 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-10-11 07:42+0200\n"
-"PO-Revision-Date: 2005-10-09 18:16+0200\n"
-"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
-"Language-Team: Swedish <sv at li.org>\n"
+"POT-Creation-Date: 2014-09-07 19:53+0200\n"
+"PO-Revision-Date: 2014-11-17 10:32+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=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.10\n"
 
 #. Type: multiselect
 #. Description
-#: ../arb-common.templates:2001
-msgid "ARB PT-server administrators:"
-msgstr ""
+#: ../arb-common.templates:1001
+msgid "ARB PT-server administrators"
+msgstr "ARB PT-server-administratörer"
 
 #. Type: multiselect
 #. Description
-#: ../arb-common.templates:2001
+#: ../arb-common.templates:1001
 msgid ""
-"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)."
+"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."
 
 #. Type: multiselect
 #. Description
-#: ../arb-common.templates:2001
+#: ../arb-common.templates:1001
 msgid ""
-"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."
+"Only members of the system group \"arb\" will be able to build and update "
+"the shared PT servers. This setting configures the group members."
 msgstr ""
-
-#~ msgid "Arb users:"
-#~ msgstr "Arb användare:"
-
-#~ msgid ""
-#~ "Please choose, among the list of all unprivileged users of the system, "
-#~ "those who will be allowed running ${pkg}."
-#~ msgstr ""
-#~ "Välj i listan av opriviligerade användare på systemet, de som ska "
-#~ "tillåtas att köra ${pkg}."
+"Endast medlemmar i systemgruppen \"arb\" kan bygga och uppdatera de delade "
+"PT-servrarna. Denna inställning justerar gruppmedlemmarna."

Modified: trunk/packages/arb/trunk/debian/rules
===================================================================
--- trunk/packages/arb/trunk/debian/rules	2016-12-07 07:55:07 UTC (rev 23261)
+++ trunk/packages/arb/trunk/debian/rules	2016-12-07 10:36:14 UTC (rev 23262)
@@ -4,6 +4,8 @@
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 pkgcom=$(pkg)-common
 pkgdoc=$(pkg)-doc
@@ -26,7 +28,7 @@
 export DEB_CXXFLAGS_MAINT_APPEND=-std=c++98
 
 %:
-	dh $@ --parallel
+	dh $@
 
 config.makefile: config.makefile.template
 	# ARB's build system is configured with config.makefile. This file is
@@ -95,6 +97,9 @@
 	dh_strip 
 	find debian/libarb-dev -name \*.a -print0 | xargs -0 -n 1 strip --remove-section=.comment
 
+override_dh_installchangelogs:
+	dh_installchangelogs arb_CHANGES.txt
+
 override_dh_shlibdeps:
 	dh_shlibdeps -a -l debian/libarb/usr/lib
 

Modified: trunk/packages/arb/trunk/debian/watch
===================================================================
--- trunk/packages/arb/trunk/debian/watch	2016-12-07 07:55:07 UTC (rev 23261)
+++ trunk/packages/arb/trunk/debian/watch	2016-12-07 10:36:14 UTC (rev 23262)
@@ -1,6 +1,4 @@
-version=3
-#opts="downloadurlmangle=s/$/arbsrc.tgz/,filenamemangle=s/\/$/.tgz/" \
-#   http://download.arb-home.de/release/ arb_(\d+.*)/
+version=4
 
 opts="downloadurlmangle=s{([\d.]+)/$}{$1/arb-$1-source.tgz},filenamemangle=s/\/$/.tgz/" \
    http://download.arb-home.de/release/ arb-(\d+.*)/

More information about the debian-med-commit mailing list