[med-svn] [Git][med-team/jmodeltest][master] fix package name for alter-lib usage

[Olivier Sallou]

Olivier Sallou pushed to branch master at Debian Med / jmodeltest


Commits:
fec17e63 by Olivier Sallou at 2018-12-17T14:39:20Z
fix package name for alter-lib usage

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/fix_alter-lib.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,7 @@
 jmodeltest (2.1.10+dfsg-7) UNRELEASED; urgency=medium
 
   * alter-sequence-alignment now has two JARs - add alter-lib.jar to manifest
+    d/patches/fix_alter-lib.patch
     Closes: #906371
   * Standards-Version: 4.2.1
 


=====================================
debian/patches/fix_alter-lib.patch
=====================================
@@ -0,0 +1,23 @@
+Subject: alter-lib makes use of different package name
+Description: the use of alter-lib.jar needs to modify the package name
+ on parser and converter call
+Author: Olivier Sallou <osallou at debian.org>
+Last-Updated: 2018-12-17
+Forwarded: no
+--- a/src/main/java/es/uvigo/darwin/jmodeltest/ModelTestService.java
++++ b/src/main/java/es/uvigo/darwin/jmodeltest/ModelTestService.java
+@@ -25,10 +25,10 @@
+ import java.io.IOException;
+ import java.io.PrintStream;
+ 
+-import parser.ParseException;
+-import converter.Converter;
+-import converter.DefaultFactory;
+-import converter.Factory;
++import es.uvigo.ei.sing.alter.parser.ParseException;
++import es.uvigo.ei.sing.alter.converter.Converter;
++import es.uvigo.ei.sing.alter.converter.DefaultFactory;
++import es.uvigo.ei.sing.alter.converter.Factory;
+ import es.uvigo.darwin.jmodeltest.exception.AlignmentParseException;
+ import es.uvigo.darwin.jmodeltest.io.NullPrintStream;
+ import es.uvigo.darwin.jmodeltest.selection.AIC;


=====================================
debian/patches/series
=====================================
@@ -4,3 +4,4 @@ adapt_config.patch
 replace_natbib_bst_by_plainnat.patch
 remove_BrowserLauncher_reference.patch
 latex_encoding.patch
+fix_alter-lib.patch



View it on GitLab: https://salsa.debian.org/med-team/jmodeltest/commit/fec17e636278e5effb18392b612d539551ff74d7

-- 
View it on GitLab: https://salsa.debian.org/med-team/jmodeltest/commit/fec17e636278e5effb18392b612d539551ff74d7
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181217/7eac1ec5/attachment-0001.html>