[med-svn] r7313 - trunk/packages/arb/trunk/debian

Nelson A. de Oliveira naoliv at alioth.debian.org
Thu Jul 21 15:53:31 UTC 2011


Author: naoliv
Date: 2011-07-21 15:53:30 +0000 (Thu, 21 Jul 2011)
New Revision: 7313

Modified:
   trunk/packages/arb/trunk/debian/arb-common.install
   trunk/packages/arb/trunk/debian/arb-doc.install
   trunk/packages/arb/trunk/debian/arb.install
   trunk/packages/arb/trunk/debian/changelog
   trunk/packages/arb/trunk/debian/control
   trunk/packages/arb/trunk/debian/copyright
Log:
In arb_CHANGES.txt we have:

"arb build process uses xsltproc instead of sablotron"

Thus replaced sablotron by xsltproc in build-deps.



Modified: trunk/packages/arb/trunk/debian/arb-common.install
===================================================================
--- trunk/packages/arb/trunk/debian/arb-common.install	2011-07-21 13:49:36 UTC (rev 7312)
+++ trunk/packages/arb/trunk/debian/arb-common.install	2011-07-21 15:53:30 UTC (rev 7313)
@@ -1,20 +1,20 @@
+GDEHELP/ARB_GDEmenus                  etc/arb
 GDEHELP/DATA_FILES                    usr/lib/arb/GDEHELP
-GDEHELP/ARB_GDEmenus                  etc/arb
+HELP_SOURCE/oldhelp/*.hlp             usr/lib/arb/HELP_SOURCE/oldhelp
+HELP_SOURCE/oldhelp/prompt            usr/lib/arb/HELP_SOURCE/oldhelp
+PERL2ARB/ARB.pm                       usr/lib/arb/lib
 PERL_SCRIPTS                          usr/lib/arb
 SH/[a-z]*                             usr/lib/arb/SH
-HELP_SOURCE/oldhelp/*.hlp             usr/lib/arb/HELP_SOURCE/oldhelp
-HELP_SOURCE/oldhelp/prompt            usr/lib/arb/HELP_SOURCE/oldhelp
+debian/About                          usr/share/doc/arb/
+debian/bin/arb_create_debian_conffile usr/lib/arb/SH
+demo.arb                              usr/share/doc/arb/examples
 lib/[d-gi-kmoqt-z]*                   usr/lib/arb/lib
+lib/arb_default/*                     usr/lib/arb/lib/arb_default
+lib/config.Linux                      usr/lib/arb/lib
+lib/help                              usr/lib/arb/lib
+lib/nas/names.dat*                    var/lib/arb/nas
 lib/pi*                               usr/share/arb/lib
+lib/pts                               var/lib/arb
 lib/rna3d                             usr/share/arb/lib
 lib/s[a-tv-z]*                        usr/lib/arb/lib
-lib/pts                               var/lib/arb
-lib/arb_default/*                     usr/lib/arb/lib/arb_default
-lib/help                              usr/lib/arb/lib
-PERL2ARB/ARB.pm                       usr/lib/arb/lib
-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
-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-doc.install
===================================================================
--- trunk/packages/arb/trunk/debian/arb-doc.install	2011-07-21 13:49:36 UTC (rev 7312)
+++ trunk/packages/arb/trunk/debian/arb-doc.install	2011-07-21 15:53:30 UTC (rev 7313)
@@ -1,2 +1,2 @@
+HELP_SOURCE/oldhelp/arb.pdf.gz usr/share/doc/arb/help
 lib/help_html/*                usr/share/doc/arb/html
-HELP_SOURCE/oldhelp/arb.pdf.gz usr/share/doc/arb/help

Modified: trunk/packages/arb/trunk/debian/arb.install
===================================================================
--- trunk/packages/arb/trunk/debian/arb.install	2011-07-21 13:49:36 UTC (rev 7312)
+++ trunk/packages/arb/trunk/debian/arb.install	2011-07-21 15:53:30 UTC (rev 7313)
@@ -1,7 +1,7 @@
 bin/[A-LN-Zabcd-z]*            usr/lib/arb/bin
+debian/arb.xpm                 usr/share/arb
 debian/bin/arb                 usr/bin
 debian/bin/arb-add-pt-server   usr/bin
 debian/bin/arb-kill            usr/bin
-debian/arb.xpm                 usr/share/arb
+debian/conf/arb.conf           etc/arb
 debian/conf/arb_tcp.dat        etc/arb
-debian/conf/arb.conf           etc/arb

Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================
--- trunk/packages/arb/trunk/debian/changelog	2011-07-21 13:49:36 UTC (rev 7312)
+++ trunk/packages/arb/trunk/debian/changelog	2011-07-21 15:53:30 UTC (rev 7313)
@@ -1,3 +1,10 @@
+arb (5.2-2) UNRELEASED; urgency=low
+
+  * Fix FTBFS: replaced sablotron by xsltproc in debian/control
+    (Closes: #634999)
+
+ -- Nelson A. de Oliveira <naoliv at debian.org>  Thu, 21 Jul 2011 12:50:37 -0300
+
 arb (5.2-1) unstable; urgency=low
 
   * New upstream version

Modified: trunk/packages/arb/trunk/debian/control
===================================================================
--- trunk/packages/arb/trunk/debian/control	2011-07-21 13:49:36 UTC (rev 7312)
+++ trunk/packages/arb/trunk/debian/control	2011-07-21 15:53:30 UTC (rev 7313)
@@ -4,10 +4,26 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>
-Build-Depends: dpkg-dev (>= 1.15.4), debhelper (>= 7.1), quilt (>= 0.47),
- libxml2-utils, lynx, sablotron, libtiff4-dev, libxaw7-dev, openjdk-6-jdk | default-jdk,
- freeglut3-dev | libglu-dev, libglew1.5-dev, libpng12-dev, x11proto-print-dev,
- libxpm-dev, libxp-dev, libglw1-mesa-dev, perl-doc, chrpath, xutils-dev, libmotif-dev
+Build-Depends: chrpath,
+               debhelper (>= 7.1),
+               dpkg-dev (>= 1.15.4),
+               freeglut3-dev | libglu-dev,
+               libglew1.5-dev,
+               libglw1-mesa-dev,
+               libmotif-dev,
+               libpng12-dev,
+               libtiff4-dev,
+               libxaw7-dev,
+               libxml2-utils,
+               libxp-dev,
+               libxpm-dev,
+               lynx,
+               openjdk-6-jdk | default-jdk,
+               perl-doc,
+               quilt (>= 0.47),
+               x11proto-print-dev,
+               xsltproc,
+               xutils-dev
 Standards-Version: 3.9.1
 Homepage: http://www.arb-home.de/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/arb/trunk/?rev=0&sc=0
@@ -16,10 +32,18 @@
 
 Package: arb
 Architecture: any
-Depends: ${shlibs:Depends}, libarb (= ${binary:Version}), arb-common (= ${source:Version}),
- phylip (>= 3.6b), fastdnaml (>= 1.2.2-4), readseq (>= 1-1), tree-puzzle (>=5.0-3), molphy,
- ssh, transfig, ${misc:Depends}
-Recommends: xfig, bioperl
+Depends: arb-common (= ${source:Version}),
+         fastdnaml (>= 1.2.2-4),
+         libarb (= ${binary:Version}),
+         molphy,
+         phylip (>= 3.6b),
+         readseq (>= 1-1),
+         ssh,
+         transfig,
+         tree-puzzle (>=5.0-3),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: bioperl, xfig
 Suggests: arb-database, gnuplot, gv, phyml
 Description: Integrated package for sequence database handling and analysis
  The ARB software is a graphically oriented package comprising various tools
@@ -30,7 +54,7 @@
  .
  The ARB project (latin, "arbor"=tree) is a joint initiative of the Lehrstuhl
  fuer Mikrobiologie http://www.mikro.biologie.tu-muenchen.de/ and the
- Lehrstuhl fuer Rechnertechnik und Rechnerorganisation 
+ Lehrstuhl fuer Rechnertechnik und Rechnerorganisation
  http://wwwbode.informatik.tu-muenchen.de/ of the Technical University
  of Munich.
 
@@ -47,7 +71,7 @@
  .
  The ARB project (latin, "arbor"=tree) is a joint initiative of the Lehrstuhl
  fuer Mikrobiologie http://www.mikro.biologie.tu-muenchen.de/ and the
- Lehrstuhl fuer Rechnertechnik und Rechnerorganisation 
+ Lehrstuhl fuer Rechnertechnik und Rechnerorganisation
  http://wwwbode.informatik.tu-muenchen.de/ of the Technical University
  of Munich.
  .
@@ -55,8 +79,13 @@
 
 Package: arb-common
 Architecture: all
-Depends: arb-doc (= ${source:Version}), adduser, ghostscript | postscript-preview, gv | postscript-viewer,
- perl-modules, ${perl:Depends}, ${misc:Depends}
+Depends: adduser,
+         arb-doc (= ${source:Version}),
+         ghostscript | postscript-preview,
+         gv | postscript-viewer,
+         perl-modules,
+         ${misc:Depends},
+         ${perl:Depends}
 Recommends: arb
 Description: Integrated package for sequence database handling and analysis
  The ARB software is a graphically oriented package comprising various tools
@@ -70,7 +99,9 @@
 Package: arb-doc
 Architecture: all
 Section: non-free/doc
-Depends: ${misc:Depends}, ghostscript | postscript-preview, gv | postscript-viewer
+Depends: ghostscript | postscript-preview,
+         gv | postscript-viewer,
+         ${misc:Depends}
 Suggests: arb
 Description: Integrated package for sequence database handling and analysis
  The ARB software is a graphically oriented package comprising various tools

Modified: trunk/packages/arb/trunk/debian/copyright
===================================================================
--- trunk/packages/arb/trunk/debian/copyright	2011-07-21 13:49:36 UTC (rev 7312)
+++ trunk/packages/arb/trunk/debian/copyright	2011-07-21 15:53:30 UTC (rev 7313)
@@ -88,7 +88,7 @@
 X-Comment: Copyright notices for programs distributes together with ARB
 
 Files: GDE/*
-License: 
+License:
   * The Genetic Data Environment (GDE) software and documentation are not in the
     public domain. Portions of this code are owned and copyrighted by the
     The Board of Trustees of the University of Illinois and by Steven Smith.
@@ -179,7 +179,7 @@
 Files: GDE/TREEPUZZLE/*
 Copyright: (C) 1995-1999 Korbinian Strimmer and Arndt von Haeseler
  (C) 1999-2001 Heiko A. Schmidt, Korbinian Strimmer,Martin Vingron,
-           Arndt von Haeseler           
+           Arndt von Haeseler
 License: GPL
 X-Comment: On Debian systems, the complete text of the GNU Public
  License can be found in `/usr/share/common-licenses/GPL-2'.




More information about the debian-med-commit mailing list