Author: osallou-guest Date: 2014-01-17 08:14:12 +0000 (Fri, 17 Jan 2014) New Revision: 15803
Added: trunk/packages/logol/trunk/debian/patches/remove_rubygems_usage Modified: trunk/packages/logol/trunk/debian/changelog trunk/packages/logol/trunk/debian/control trunk/packages/logol/trunk/debian/patches/series Log: remove rubygems dependencies, go to standards 3.9.5 Modified: trunk/packages/logol/trunk/debian/changelog =================================================================== --- trunk/packages/logol/trunk/debian/changelog 2014-01-16 21:08:39 UTC (rev 15802) +++ trunk/packages/logol/trunk/debian/changelog 2014-01-17 08:14:12 UTC (rev 15803) @@ -1,3 +1,11 @@ +logol (1.6.9-3) unstable; urgency=low + + * d/control,d/patches: Remove rubygems dependency, thanks to + Cédric Boutillier <[email protected]> (Closes: #735579). + * Upgrade to Standards 3.9.5. + + -- Olivier Sallou <[email protected]> Fri, 17 Jan 2014 09:07:38 +0100 + logol (1.6.9-2) unstable; urgency=low * Fix prolog doc generation (Closes: #730916). Modified: trunk/packages/logol/trunk/debian/control =================================================================== --- trunk/packages/logol/trunk/debian/control 2014-01-16 21:08:39 UTC (rev 15802) +++ trunk/packages/logol/trunk/debian/control 2014-01-17 08:14:12 UTC (rev 15803) @@ -5,18 +5,25 @@ Uploaders: Olivier Sallou <[email protected]> Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/logol/trunk/ Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/logol/ -Build-Depends: debhelper (>= 8.0.0),default-jdk (>= 1:1.6),ant,ruby (>=1.8),rubygems, gawk, swi-prolog (>=6.4.1-3), - libbiojava-java, libdrmaa-java, antlr3, libcommons-cli-java, libcommons-collections3-java, libcommons-configuration-java, - libcommons-lang-java, libcommons-logging-java, libxalan2-java, libxerces2-java, junit4, libgnumail-java, - liblog4j1.2-java,texlive, texlive-latex-extra, tex4ht, libncursesw5-dev, ruby-cassiopee (>=0.1.12), ant-optional -Standards-Version: 3.9.4 +Build-Depends: debhelper (>= 8.0.0),default-jdk (>= 1:1.6),ant,ruby, + gawk, swi-prolog (>=6.4.1-3), + libbiojava-java, libdrmaa-java, antlr3, libcommons-cli-java, + libcommons-collections3-java, libcommons-configuration-java, + libcommons-lang-java, libcommons-logging-java, libxalan2-java, + libxerces2-java, junit4, libgnumail-java, + liblog4j1.2-java,texlive, texlive-latex-extra, tex4ht, + libncursesw5-dev, ruby-cassiopee (>=0.1.12), ant-optional +Standards-Version: 3.9.5 Homepage: http://logol.genouest.org Package: logol Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java6-runtime, ruby (>=1.8),rubygems, gawk, - libbiojava-java, libdrmaa-java, antlr3, libcommons-cli-java, libcommons-collections3-java, libcommons-configuration-java, - libcommons-lang-java, libcommons-logging-java, libxalan2-java, libxerces2-java, libgnumail-java, liblog4j1.2-java, +Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre | java6-runtime, + ruby, gawk, + libbiojava-java, libdrmaa-java, antlr3, libcommons-cli-java, + libcommons-collections3-java, libcommons-configuration-java, + libcommons-lang-java, libcommons-logging-java, libxalan2-java, + libxerces2-java, libgnumail-java, liblog4j1.2-java, ruby-cassiopee (>=0.1.12), logol-bin Description: Pattern matching tool using Logol language Logol is a pattern matching tool using the Logol language. Added: trunk/packages/logol/trunk/debian/patches/remove_rubygems_usage =================================================================== --- trunk/packages/logol/trunk/debian/patches/remove_rubygems_usage (rev 0) +++ trunk/packages/logol/trunk/debian/patches/remove_rubygems_usage 2014-01-17 08:14:12 UTC (rev 15803) @@ -0,0 +1,28 @@ +Subject: Remove explicit use of rubygems +Description: Supported version of Ruby in Jessie+ are higher that 1.9 + and they all automatically load rubygems +Author: Cédric Boutillier <[email protected]> +Last-Update: 2014-01-16 + +--- a/tools/logolIndex.rb ++++ b/tools/logolIndex.rb +@@ -1,5 +1,4 @@ + #!/usr/bin/env ruby +-require 'rubygems' + require 'optparse' + require 'logger' + require 'cassiopee-mt' +--- a/tools/logolSearch.rb ++++ b/tools/logolSearch.rb +@@ -22,9 +22,9 @@ + DIR=File.expand_path(File.dirname(__FILE__)) + + if muteOnly == 1 +- cmd = "ruby -rubygems "+DIR+"/logolIndex.rb --search "+sequence+".index --min "+minStart+" --max "+maxStart+" --pattern "+motifFileName+" --error "+nbError+" --hamming" ++ cmd = "ruby "+DIR+"/logolIndex.rb --search "+sequence+".index --min "+minStart+" --max "+maxStart+" --pattern "+motifFileName+" --error "+nbError+" --hamming" + else +- cmd = "ruby -rubygems "+DIR+"/logolIndex.rb --search "+sequence+".index --min "+minStart+" --max "+maxStart+" --pattern "+motifFileName+" --error "+nbError ++ cmd = "ruby "+DIR+"/logolIndex.rb --search "+sequence+".index --min "+minStart+" --max "+maxStart+" --pattern "+motifFileName+" --error "+nbError + end + + Open3.popen3(cmd) do |stdin,stdout,stderr, wait_thr| Modified: trunk/packages/logol/trunk/debian/patches/series =================================================================== --- trunk/packages/logol/trunk/debian/patches/series 2014-01-16 21:08:39 UTC (rev 15802) +++ trunk/packages/logol/trunk/debian/patches/series 2014-01-17 08:14:12 UTC (rev 15803) @@ -3,3 +3,4 @@ setDebianDirs fix_doc_generation fix_pldoc +remove_rubygems_usage _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
