[med-svn] r5900 - trunk/packages/beast-mcmc/trunk/debian

[Andreas Tille]

Author: tille
Date: 2011-02-05 07:56:04 +0000 (Sat, 05 Feb 2011)
New Revision: 5900

Modified:
   trunk/packages/beast-mcmc/trunk/debian/beast-doc.install
   trunk/packages/beast-mcmc/trunk/debian/beast-mcmc.install
   trunk/packages/beast-mcmc/trunk/debian/beast-mcmc.menu
   trunk/packages/beast-mcmc/trunk/debian/control
   trunk/packages/beast-mcmc/trunk/debian/rules
Log:
Add more docs which are available as pdf; fix lintian issues in menu


Modified: trunk/packages/beast-mcmc/trunk/debian/beast-doc.install
===================================================================
--- trunk/packages/beast-mcmc/trunk/debian/beast-doc.install	2011-02-05 07:17:51 UTC (rev 5899)
+++ trunk/packages/beast-mcmc/trunk/debian/beast-doc.install	2011-02-05 07:56:04 UTC (rev 5900)
@@ -1,3 +1,6 @@
 doc/*.pdf			usr/share/doc/beast-mcmc
+doc/StarBEAST/*.pdf		usr/share/doc/beast-mcmc
+doc/PackageStructure/*.pdf	usr/share/doc/beast-mcmc
+doc/EBSP/*.pdf			usr/share/doc/beast-mcmc
 #doc/Virus\ Practical\ Tex/*.pdf	usr/share/doc/beast-mcmc
 examples/release/*.xml		usr/share/doc/beast-mcmc/examples

Modified: trunk/packages/beast-mcmc/trunk/debian/beast-mcmc.install
===================================================================
--- trunk/packages/beast-mcmc/trunk/debian/beast-mcmc.install	2011-02-05 07:17:51 UTC (rev 5899)
+++ trunk/packages/beast-mcmc/trunk/debian/beast-mcmc.install	2011-02-05 07:56:04 UTC (rev 5900)
@@ -1,4 +1,4 @@
 release/Linux/scripts/* 	usr/bin
-release/common/icons/beast.png	usr/share/pixmaps
+debian/*.xpm			usr/share/pixmaps
 lib/*.jar			usr/share/beast-mcmc/lib
 build/dist/*.jar		usr/share/beast-mcmc/lib

Modified: trunk/packages/beast-mcmc/trunk/debian/beast-mcmc.menu
===================================================================
--- trunk/packages/beast-mcmc/trunk/debian/beast-mcmc.menu	2011-02-05 07:17:51 UTC (rev 5899)
+++ trunk/packages/beast-mcmc/trunk/debian/beast-mcmc.menu	2011-02-05 07:56:04 UTC (rev 5900)
@@ -2,9 +2,9 @@
   needs="x11"\
   section="Applications/Science/Biology"\
   title="BEAST"\
-  command="xterm -e bash -c \"/usr/bin/beast-mcmc; read\""\
+  command="x-terminal-emulator -e sh -c \"/usr/bin/beast-mcmc; read\""\
   hints="Bayesian evolutionary analysis sampling trees"\
-  icon="/usr/share/pixmaps/beast.png"
+  icon="/usr/share/pixmaps/beast.xpm"
         
 ?package(beast-mcmc):\
   needs="x11"\
@@ -12,4 +12,4 @@
   title="BEAUti"\
   command="/usr/bin/beauti"\
   hints="Bayesian Evolutionary Analysis Utility"\
-  icon="/usr/share/pixmaps/beast.png"
+  icon="/usr/share/pixmaps/beauti.xpm"

Modified: trunk/packages/beast-mcmc/trunk/debian/control
===================================================================
--- trunk/packages/beast-mcmc/trunk/debian/control	2011-02-05 07:17:51 UTC (rev 5899)
+++ trunk/packages/beast-mcmc/trunk/debian/control	2011-02-05 07:56:04 UTC (rev 5900)
@@ -5,7 +5,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Felix Feyertag <felix.feyertag at googlemail.com>,
  Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, quilt, openjdk-6-jdk, ant, ant-optional, libgcj10-dev
+Build-Depends: debhelper (>= 7.1), cdbs, quilt, openjdk-6-jdk, ant, ant-optional, libgcj10-dev
 Standards-Version: 3.9.1
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/beast-mcmc/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/beast-mcmc/trunk/
@@ -14,7 +14,7 @@
 
 Package: beast-mcmc
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, beast-mcmc-lib
+Depends: ${shlibs:Depends}, ${misc:Depends}, beast-mcmc-lib, xterm | x-terminal-emulator
 Suggests: beast-doc
 Description: Bayesian MCMC phylogenetic inference
  BEAST is a cross-platform program for Bayesian MCMC analysis of molecular 
@@ -50,6 +50,7 @@
 
 Package: beast-doc
 Architecture: all
+Section: doc
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Enhances: beast-mcmc
 Description: Bayesian MCMC phylogenetic inference - documentation

Modified: trunk/packages/beast-mcmc/trunk/debian/rules
===================================================================
--- trunk/packages/beast-mcmc/trunk/debian/rules	2011-02-05 07:17:51 UTC (rev 5899)
+++ trunk/packages/beast-mcmc/trunk/debian/rules	2011-02-05 07:56:04 UTC (rev 5900)
@@ -39,7 +39,7 @@
 	# dh_install seems to fail in moving this fail for whatever reason
 	cp -a doc/Virus\ Practical\ Tex/*.pdf $(CURDIR)/debian/$(DOCPACKAGE)/usr/share/doc/beast-mcmc
 	# rename beast to beast-mcmc
-	mv $(CURDIR)/release/Linux/scripts/beast $(CURDIR)/release/Linux/scripts/beast-mcmc
+	mv $(CURDIR)/debian/$(PACKAGE)/usr/bin/beast $(CURDIR)/debian/$(PACKAGE)/usr/bin/beast-mcmc
 
 get-orig-source:
 	rm -rf get-orig-source $(TARBALL)