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

[Elmar Pruesse]

Author: epruesse-guest
Date: 2014-09-07 16:50:36 +0000 (Sun, 07 Sep 2014)
New Revision: 17950

Added:
   trunk/packages/arb/trunk/debian/patches/60_use_packaged_phyml
Modified:
   trunk/packages/arb/trunk/debian/changelog
   trunk/packages/arb/trunk/debian/patches/series
Log:
use the phyml packaged in debian for all interfaces in ARB


Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================
--- trunk/packages/arb/trunk/debian/changelog	2014-09-07 16:23:18 UTC (rev 17949)
+++ trunk/packages/arb/trunk/debian/changelog	2014-09-07 16:50:36 UTC (rev 17950)
@@ -50,6 +50,8 @@
      - 50_private_nameservers
          change configuration to put nameservers into users home dirs
          (avoids need for shared writeable directory)
+     - 60_use_debian_phyml
+         use phyml from debian package for both interfaces in ARB
   * debian/rules:
      - create config.makefile from override_dh_configure target
      - use "make tarfile" in override_dh_install

Added: trunk/packages/arb/trunk/debian/patches/60_use_packaged_phyml
===================================================================
--- trunk/packages/arb/trunk/debian/patches/60_use_packaged_phyml	                        (rev 0)
+++ trunk/packages/arb/trunk/debian/patches/60_use_packaged_phyml	2014-09-07 16:50:36 UTC (rev 17950)
@@ -0,0 +1,21 @@
+Description: use phyml package instead of version source distributed with ARB
+Author: Elmar Pruesse <elmar at pruesse.net>
+Origin: other
+--- a/GDE/Makefile
++++ b/GDE/Makefile
+@@ -5,7 +5,6 @@
+ 	AxML/AxML.dummy \
+ 
+ ARCHS_COMMON_NO_DEPENDS = \
+-	PHYML20130708/PHYML20130708.dummy \
+ 
+ # --------------------------------------------------------------------------------
+ # If a package is available as debian package it should go here
+@@ -26,6 +25,7 @@
+ 	FASTTREE/FASTTREE.dummy \
+ 	MAFFT/MAFFT.dummy \
+ 	MUSCLE/MUSCLE.dummy \
++	PHYML20130708/PHYML20130708.dummy \
+ 	PROBCONS/PROBCONS.dummy \
+ 
+ # --------------------------------------------------------------------------------

Modified: trunk/packages/arb/trunk/debian/patches/series
===================================================================
--- trunk/packages/arb/trunk/debian/patches/series	2014-09-07 16:23:18 UTC (rev 17949)
+++ trunk/packages/arb/trunk/debian/patches/series	2014-09-07 16:50:36 UTC (rev 17950)
@@ -3,3 +3,4 @@
 30_upstream_r12814__desktop_keywords
 40_upstream_r12815__lintian_spelling
 50_private_nameservers
+60_use_packaged_phyml