Author: osallou Date: 2012-09-21 15:21:29 +0000 (Fri, 21 Sep 2012) New Revision: 12259
Modified: trunk/packages/circos/trunk/debian/changelog trunk/packages/circos/trunk/debian/patches/configpath_add_etc trunk/packages/circos/trunk/debian/patches/fix_examples Log: fix patches for new upstream release Modified: trunk/packages/circos/trunk/debian/changelog =================================================================== --- trunk/packages/circos/trunk/debian/changelog 2012-09-21 15:00:45 UTC (rev 12258) +++ trunk/packages/circos/trunk/debian/changelog 2012-09-21 15:21:29 UTC (rev 12259) @@ -1,4 +1,4 @@ -circos (0.62.1) UNRELEASED; urgency=low +circos (0.62.1) unstable; urgency=low * New upstream release Modified: trunk/packages/circos/trunk/debian/patches/configpath_add_etc =================================================================== --- trunk/packages/circos/trunk/debian/patches/configpath_add_etc 2012-09-21 15:00:45 UTC (rev 12258) +++ trunk/packages/circos/trunk/debian/patches/configpath_add_etc 2012-09-21 15:21:29 UTC (rev 12259) @@ -1,27 +1,28 @@ Description: Add Debian directories in search path Author: Olivier Sallou <[email protected]> -Last-Update: 2011-08-01 +Last-Update: 2012-09-21 +Forwarded: not-needed --- a/lib/Circos/Configuration.pm +++ b/lib/Circos/Configuration.pm -@@ -569,6 +569,7 @@ +@@ -591,6 +591,7 @@ } my @configpath = ( -+ "/etc/circos", - dirname($file), - dirname($file)."/etc", - "$FindBin::RealBin/etc", ++ "/etc/circos", + dirname($file), + dirname($file)."/etc", + "$FindBin::RealBin/etc", --- a/lib/Circos/Utils.pm +++ b/lib/Circos/Utils.pm -@@ -429,7 +429,7 @@ - %params = @_; - } - # look for the file in various directories -- my @dir_1 = (getcwd,$FindBin::RealBin); -+ my @dir_1 = (getcwd,$FindBin::RealBin,"/usr/share/circos"); - my @dir_2 = qw(. .. ../..); - my @dir_3 = qw(. etc data); +@@ -430,7 +430,7 @@ + } + # look for the file in various directories +- my @dir_1 = (getcwd,$FindBin::RealBin); ++ my @dir_1 = (getcwd,$FindBin::RealBin,"/usr/share/circos"); + my @dir_2 = qw(. .. ../.. ../../..); + my @dir_3 = qw(. etc data); + --- a/etc/makehuesteps +++ b/etc/makehuesteps @@ -1,4 +1,4 @@ Modified: trunk/packages/circos/trunk/debian/patches/fix_examples =================================================================== --- trunk/packages/circos/trunk/debian/patches/fix_examples 2012-09-21 15:00:45 UTC (rev 12258) +++ trunk/packages/circos/trunk/debian/patches/fix_examples 2012-09-21 15:21:29 UTC (rev 12259) @@ -4,10 +4,11 @@ in /etc/circos. This path is already added to search path. Author: Olivier Sallou <[email protected]> -Last-Updated: 14/06/12 +Last-Updated: 2012-09-21 +Forwarded: not-needed --- a/example/etc/circos.conf +++ b/example/etc/circos.conf -@@ -246,16 +246,16 @@ +@@ -248,16 +248,16 @@ <<include ticks.conf>> <image> @@ -35,6 +36,6 @@ @@ -1,4 +1,4 @@ #!/bin/bash --../bin/circos -conf etc/circos.conf -debug_group summary,timer,textplace > run.out -+circos -conf etc/circos.conf -debug_group summary,timer,textplace > run.out +-../bin/circos -conf etc/circos.conf -debug_group summary,timer > run.out ++circos -conf etc/circos.conf -debug_group summary,timer > run.out _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
