[med-svn] r762 - in trunk/packages/arb/trunk/debian: . bin patches po
tille at alioth.debian.org
tille at alioth.debian.org
Wed Nov 7 20:34:32 UTC 2007
Author: tille
Date: 2007-11-07 20:34:31 +0000 (Wed, 07 Nov 2007)
New Revision: 762
Added:
trunk/packages/arb/trunk/debian/arb-common.lintian.overrides
trunk/packages/arb/trunk/debian/libarb.dirs
trunk/packages/arb/trunk/debian/libarb.lintian.overrides
Removed:
trunk/packages/arb/trunk/debian/lintian.overrides
Modified:
trunk/packages/arb/trunk/debian/arb-common.install
trunk/packages/arb/trunk/debian/arb-common.links
trunk/packages/arb/trunk/debian/arb.install
trunk/packages/arb/trunk/debian/arb.links
trunk/packages/arb/trunk/debian/bin/arb-kill.1
trunk/packages/arb/trunk/debian/changelog
trunk/packages/arb/trunk/debian/control
trunk/packages/arb/trunk/debian/get-orig-source
trunk/packages/arb/trunk/debian/libarb.install
trunk/packages/arb/trunk/debian/patches/00list
trunk/packages/arb/trunk/debian/po/cs.po
trunk/packages/arb/trunk/debian/rules
Log:
Several changes that finally build base for a prerelease.
Modified: trunk/packages/arb/trunk/debian/arb-common.install
===================================================================
--- trunk/packages/arb/trunk/debian/arb-common.install 2007-11-07 04:42:11 UTC (rev 761)
+++ trunk/packages/arb/trunk/debian/arb-common.install 2007-11-07 20:34:31 UTC (rev 762)
@@ -1,21 +1,22 @@
-GDEHELP/DATA_FILES usr/share/arb/GDEHELP
+GDEHELP/DATA_FILES usr/lib/arb/GDEHELP
GDEHELP/ARB_GDEmenus etc/arb
-PERL_SCRIPTS usr/share/arb
-SH usr/share/arb
-HELP_SOURCE/oldhelp/*.hlp usr/share/arb/HELP_SOURCE/oldhelp
-HELP_SOURCE/oldhelp/prompt usr/share/arb/HELP_SOURCE/oldhelp
-HELP_SOURCE/oldhelp/seer usr/share/arb/HELP_SOURCE/oldhelp
-lib/[d-gi-kmoqrt-z]* usr/share/arb/lib
+PERL_SCRIPTS usr/lib/arb
+SH usr/lib/arb
+HELP_SOURCE/oldhelp/*.hlp usr/lib/arb/HELP_SOURCE/oldhelp
+HELP_SOURCE/oldhelp/prompt usr/lib/arb/HELP_SOURCE/oldhelp
+HELP_SOURCE/oldhelp/seer usr/lib/arb/HELP_SOURCE/oldhelp
+lib/[d-gi-kmoqt-z]* usr/lib/arb/lib
lib/pi* usr/share/arb/lib
-lib/s[a-tv-z]* usr/share/arb/lib
+lib/rna3d usr/share/arb/lib
+lib/s[a-tv-z]* usr/lib/arb/lib
lib/pts var/lib/arb
-lib/arb_default/* usr/share/arb/lib/arb_default
-lib/help usr/share/arb/lib
-lib/ARB.pm usr/share/arb/lib
-GDEHELP/HELP_GEN/* usr/share/arb/GDEHELP
-lib/config.Linux usr/share/arb/lib
-debian/bin/arb_create_debian_conffile usr/share/arb/SH
+lib/arb_default/* usr/lib/arb/lib/arb_default
+lib/help usr/lib/arb/lib
+lib/ARB.pm usr/lib/arb/lib
+GDEHELP/HELP_GEN/* usr/lib/arb/GDEHELP
+lib/config.Linux usr/lib/arb/lib
+debian/bin/arb_create_debian_conffile usr/lib/arb/SH
lib/nas/names.dat* var/lib/arb/nas
-demo.arb usr/share/doc/arb/examples
debian/About usr/share/doc/arb/
lib/submit usr/share/doc/arb
+demo.arb usr/share/doc/arb/examples
Modified: trunk/packages/arb/trunk/debian/arb-common.links
===================================================================
--- trunk/packages/arb/trunk/debian/arb-common.links 2007-11-07 04:42:11 UTC (rev 761)
+++ trunk/packages/arb/trunk/debian/arb-common.links 2007-11-07 20:34:31 UTC (rev 762)
@@ -1,11 +1,9 @@
-etc/arb/ARB_GDEmenus usr/share/arb/GDEHELP/ARB_GDEmenus
-usr/share/arb/GDEHELP usr/lib/arb/GDEHELP
-usr/share/arb/PERL_SCRIPTS usr/lib/arb/PERL_SCRIPTS
-usr/share/arb/SH usr/lib/arb/SH
-usr/share/arb/HELP_SOURCE usr/lib/arb/HELP_SOURCE
-usr/share/arb/lib usr/lib/arb/lib
-var/lib/arb/pts usr/share/arb/lib/pts
-var/lib/arb/nas usr/share/arb/lib/nas
-usr/share/arb/SH/arb_clean usr/bin/arb_clean
-usr/share/doc/arb/html usr/share/arb/lib/html_help
-usr/share/doc/arb/submit usr/share/arb/lib/submit
+etc/arb/ARB_GDEmenus usr/lib/arb/GDEHELP/ARB_GDEmenus
+var/lib/arb/pts usr/lib/arb/lib/pts
+var/lib/arb/nas usr/lib/arb/lib/nas
+usr/lib/arb/SH/arb_clean usr/bin/arb_clean
+usr/share/doc/arb/html usr/lib/arb/lib/help_html
+usr/share/doc/arb/submit usr/lib/arb/lib/submit
+usr/share/arb/lib/pictures usr/lib/arb/lib/pictures
+usr/share/arb/lib/pixmaps usr/lib/arb/lib/pixmaps
+usr/share/arb/lib/rna3d usr/lib/arb/lib/rna3d
Added: trunk/packages/arb/trunk/debian/arb-common.lintian.overrides
===================================================================
--- trunk/packages/arb/trunk/debian/arb-common.lintian.overrides (rev 0)
+++ trunk/packages/arb/trunk/debian/arb-common.lintian.overrides 2007-11-07 20:34:31 UTC (rev 762)
@@ -0,0 +1,3 @@
+# This script is not intended to be run by itself. Instead
+# it is used to construct a script at runtime
+arb-common: script-not-executable ./usr/lib/arb/lib/macro.head
Modified: trunk/packages/arb/trunk/debian/arb.install
===================================================================
--- trunk/packages/arb/trunk/debian/arb.install 2007-11-07 04:42:11 UTC (rev 761)
+++ trunk/packages/arb/trunk/debian/arb.install 2007-11-07 20:34:31 UTC (rev 762)
@@ -1,4 +1,4 @@
-bin/[A-Zabcd-z]* usr/lib/arb/bin
+bin/[A-LN-Zabcd-z]* usr/lib/arb/bin
debian/bin/arb usr/bin
debian/bin/arb-add-pt-server usr/bin
debian/bin/arb-kill usr/bin
Modified: trunk/packages/arb/trunk/debian/arb.links
===================================================================
--- trunk/packages/arb/trunk/debian/arb.links 2007-11-07 04:42:11 UTC (rev 761)
+++ trunk/packages/arb/trunk/debian/arb.links 2007-11-07 20:34:31 UTC (rev 762)
@@ -37,3 +37,4 @@
usr/lib/phylip/bin/seqboot usr/lib/arb/bin/seqboot
usr/lib/phylip/bin/treedist usr/lib/arb/bin/treedist
usr/bin/fastDNAml usr/lib/arb/bin/fastdnaml
+usr/bin/protml usr/lib/arb/bin/protml
Modified: trunk/packages/arb/trunk/debian/bin/arb-kill.1
===================================================================
--- trunk/packages/arb/trunk/debian/bin/arb-kill.1 2007-11-07 04:42:11 UTC (rev 761)
+++ trunk/packages/arb/trunk/debian/bin/arb-kill.1 2007-11-07 20:34:31 UTC (rev 762)
@@ -9,14 +9,13 @@
.\"
.TH arb-kill 1 "November 17, 2004" "Kill arb processes"
.SH NAME
-.B arb-kill [--all]
-\- definitely kill all processes started by arb that are started by the user
+arb-kill \- definitely kill all processes started by arb that are started by the user
If option --all is given try sudo to kill all processes even if they are owned
by other users.
.SH SYNOPSIS
-.B arb-kill
+.B arb-kill [--all]
.SH DESCRIPTION
Sometimes arb leaves some processes running. All processes that
Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================
--- trunk/packages/arb/trunk/debian/changelog 2007-11-07 04:42:11 UTC (rev 761)
+++ trunk/packages/arb/trunk/debian/changelog 2007-11-07 20:34:31 UTC (rev 762)
@@ -1,6 +1,7 @@
arb (0.0.20071029-1) unstable; urgency=low
* New upstream version
+ Closes: #446666
* Added Build-Depends libglew-dev which is needed for 3D version
* Added Build-Depends libxpm4-dev according to the advise of
Charles Plessy <charles-debian-nospam at plessy.org> in bug #364908
@@ -15,6 +16,17 @@
* Substituded ${Source-Version} by ${source:Version} resp.
${binary:Version}
* debian/arb.menu: Applications/Science/Biology
+ * move files from lib/* directly to /usr/lib/arb/lib instead of
+ /usr/share/arb/lib and a bunch of symlinks
+ * Set maintainer to Maintainer: Debian-Med Packaging Team
+ <debian-med-packaging at lists.alioth.debian.org>
+ * Added Portugese debconf translations (thanks to Miguel Figueiredo
+ <elmig at debianpt.org>
+ Closes: #341558
+ * Updated Czech debconf translations (thanks to Jakub Kasparec
+ <mr.k at centrum.cz>)
+ Closes: #356713, #392683
+ * Do not build molphy and symlink to molphy executables instead
-- Andreas Tille <tille at debian.org> Mon, 05 Nov 2007 18:17:32 +0100
Modified: trunk/packages/arb/trunk/debian/control
===================================================================
--- trunk/packages/arb/trunk/debian/control 2007-11-07 04:42:11 UTC (rev 761)
+++ trunk/packages/arb/trunk/debian/control 2007-11-07 20:34:31 UTC (rev 762)
@@ -1,8 +1,9 @@
Source: arb
Section: non-free/science
Priority: extra
-Maintainer: Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 5.0), dpatch (>= 2.0), libmotif-dev, xviewg-dev, rxp, lynx, sablotron, libtiff4-dev, libxaw7-dev, kaffe | free-java-sdk, freeglut3-dev | libglu-dev, libglew-dev, libpng12-dev, x11proto-print-dev, libxpm-dev, libxp-dev, libglw1-mesa-dev
+Maintainer: Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+Uploaders: Andreas Tille <tille at debian.org>
+Build-Depends: debhelper (>= 5.0), dpatch (>= 2.0), libmotif-dev, xviewg-dev, rxp, lynx, sablotron, libtiff4-dev, libxaw7-dev, kaffe | free-java-sdk, freeglut3-dev | libglu-dev, libglew-dev, libpng12-dev, x11proto-print-dev, libxpm-dev, libxp-dev, libglw1-mesa-dev, perl-doc
Standards-Version: 3.7.2
Package: arb
Modified: trunk/packages/arb/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/arb/trunk/debian/get-orig-source 2007-11-07 04:42:11 UTC (rev 761)
+++ trunk/packages/arb/trunk/debian/get-orig-source 2007-11-07 20:34:31 UTC (rev 762)
@@ -32,8 +32,9 @@
find PERL_SCRIPTS ! -newer SH/arb_ale -exec touch -r SH/arb_ale \{\} \;
find HELP_SOURCE ! -newer SH/arb_ale -exec touch -r SH/arb_ale \{\} \;
rm -f SH/arb_oneach
+# remove binary that should be installed on modern systems anyway
+rm -f zcat
-
chmod 644 lib/submit/*
cd ..
Added: trunk/packages/arb/trunk/debian/libarb.dirs
===================================================================
--- trunk/packages/arb/trunk/debian/libarb.dirs (rev 0)
+++ trunk/packages/arb/trunk/debian/libarb.dirs 2007-11-07 20:34:31 UTC (rev 762)
@@ -0,0 +1 @@
+usr/share/lintian/overrides
Modified: trunk/packages/arb/trunk/debian/libarb.install
===================================================================
--- trunk/packages/arb/trunk/debian/libarb.install 2007-11-07 04:42:11 UTC (rev 761)
+++ trunk/packages/arb/trunk/debian/libarb.install 2007-11-07 20:34:31 UTC (rev 762)
@@ -1 +1 @@
-lib/*.so usr/lib/
+lib/*.so usr/lib/arb/lib
Added: trunk/packages/arb/trunk/debian/libarb.lintian.overrides
===================================================================
--- trunk/packages/arb/trunk/debian/libarb.lintian.overrides (rev 0)
+++ trunk/packages/arb/trunk/debian/libarb.lintian.overrides 2007-11-07 20:34:31 UTC (rev 762)
@@ -0,0 +1,3 @@
+# rpath is set intentionally to make use of private dynamic
+# libraries
+libarb: binary-or-shlib-defines-rpath ./usr/lib/arb/lib/ARB.so
Deleted: trunk/packages/arb/trunk/debian/lintian.overrides
===================================================================
--- trunk/packages/arb/trunk/debian/lintian.overrides 2007-11-07 04:42:11 UTC (rev 761)
+++ trunk/packages/arb/trunk/debian/lintian.overrides 2007-11-07 20:34:31 UTC (rev 762)
@@ -1,3 +0,0 @@
-# This script is not intended to be run by itself. Instead
-# it is used to construct a script at runtime
-arb-common: script-not-executable ./usr/share/arb/lib/macro.head
Modified: trunk/packages/arb/trunk/debian/patches/00list
===================================================================
--- trunk/packages/arb/trunk/debian/patches/00list 2007-11-07 04:42:11 UTC (rev 761)
+++ trunk/packages/arb/trunk/debian/patches/00list 2007-11-07 20:34:31 UTC (rev 762)
@@ -2,3 +2,4 @@
20_developer_tools.dpatch
20_Makefiles.dpatch
20_perl_scripts.dpatch
+30_Makefile_main.dpatch
Modified: trunk/packages/arb/trunk/debian/po/cs.po
===================================================================
--- trunk/packages/arb/trunk/debian/po/cs.po 2007-11-07 04:42:11 UTC (rev 761)
+++ trunk/packages/arb/trunk/debian/po/cs.po 2007-11-07 20:34:31 UTC (rev 762)
@@ -1,3 +1,4 @@
+# translation of arb_0.0.20050526-7_cs.po to czech
#
# Translators, if you are not familiar with the PO format, gettext
# documentation is worth reading, especially sections dedicated to
@@ -11,38 +12,31 @@
#
# Developers do not need to manually edit POT or PO files.
#
+# Jakub Kasparec <mr.k at centrum.cz>, 2006.
msgid ""
msgstr ""
-"Project-Id-Version: arb\n"
-"Report-Msgid-Bugs-To: tille at debian.org\n"
-"POT-Creation-Date: 2005-10-07 07:35+0200\n"
-"PO-Revision-Date: 2005-07-13 19:16+0200\n"
-"Last-Translator: Igor Jasa <Igor.Jasa at seznam.cz>\n"
-"Language-Team: Czech <debian-110n-czech at lists.debian.org>\n"
+"Project-Id-Version: arb_0.0.20050526-7_cs\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-09-09 14:14-0600\n"
+"PO-Revision-Date: 2006-10-12 21:23+0200\n"
+"Last-Translator: Jakub Kasparec <mr.k at centrum.cz>\n"
+"Language-Team: czech <debian-l10n-czech at lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Type: multiselect
#. Description
-#: ../arb-common.templates:4
+#: ../arb-common.templates:1001
msgid "Arb users:"
-msgstr ""
+msgstr "Uživatelé Arbu:"
#. Type: multiselect
#. Description
-#: ../arb-common.templates:4
+#: ../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 ""
+msgstr "ProsÃm, zvolte, kteřà z neprivilegovaných uživatelů systému budou moci spuÅ¡tÄ›t ${pkg}."
-#~ msgid ""
-#~ "Here is a list of all normal users of the system. Now you can select "
-#~ "those users who should be able to use ARB."
-#~ msgstr ""
-#~ "Tady je seznam v¹ech bì¾ných u¾ivatelù systému. Teï mù¾ete vybrat ty "
-#~ "u¾ivatele, kteøí by mìli být mo¾nost pou¾ívat ARB."
-
-#~ msgid "Please specify the Arb users!"
-#~ msgstr "Prosím specifikujte u¾ivatele Arb!"
Modified: trunk/packages/arb/trunk/debian/rules
===================================================================
--- trunk/packages/arb/trunk/debian/rules 2007-11-07 04:42:11 UTC (rev 761)
+++ trunk/packages/arb/trunk/debian/rules 2007-11-07 20:34:31 UTC (rev 762)
@@ -30,12 +30,12 @@
export LC_ALL=C ; \
export PATH=$${ARBHOME}/bin:$${PATH} ; \
export LD_LIBRARY_PATH=$${ARBHOME}/lib:$${LD_LIBRARY_PATH}; \
- $(MAKE) all
+ $(MAKE) DEBIAN=1 all
export ARBHOME=`pwd` ; \
export LC_ALL=C ; \
export PATH=$${ARBHOME}/bin:$${PATH} ; \
export LD_LIBRARY_PATH=$${ARBHOME}/lib:$${LD_LIBRARY_PATH}; \
- $(MAKE) arbxtras
+ $(MAKE) DEBIAN=1 arbxtras
touch build-stamp
@@ -100,13 +100,14 @@
fi
# Install lintian.overrides
- cp -a debian/lintian.overrides debian/arb-common/usr/share/lintian/overrides/arb-common
+ cp -a debian/arb-common.lintian.overrides debian/arb-common/usr/share/lintian/overrides/arb-common
+ cp -a debian/libarb.lintian.overrides debian/libarb/usr/share/lintian/overrides/libarb
# Fix permissions
- chmod 755 debian/arb-common/usr/share/arb/SH/*
- chmod 644 debian/arb-common/usr/share/arb/lib/pixmaps/*.xpm
+ chmod 755 debian/arb-common/usr/lib/arb/SH/*
+ chmod 644 debian/arb-common/usr/lib/arb/lib/pixmaps/*.xpm
# Remove thumbnail dir
- rm -rf debian/arb-common/usr/share/arb/lib/pixmaps/.xvpics
+ rm -rf debian/arb-common/usr/lib/arb/lib/pixmaps/.xvpics
# Build architecture-independent files here.
binary-indep: build install
@@ -147,6 +148,9 @@
# dh_installinit -a
dh_installcron -a
dh_installman -a
+ # Man page is not really needed and throwas just a lintian warning
+ # mkdir `pwd`/debian/arb/usr/share/man/man3
+ # perldoc PERL2ARB/ARB.pm > `pwd`/debian/arb/usr/share/man/man3/ARB.3pm
dh_installinfo -a
dh_installchangelogs -a
dh_strip -a
More information about the debian-med-commit
mailing list