[med-svn] [brig] 01/01: Do not refer to cgview.jar (in a wrong location but rather call the wrapper.

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository brig.

commit b42f6171cd644387630b021f2069c0e89790167e
Author: Andreas Tille <TilleA at rki.de>
Date:   Fri Jan 29 14:18:32 2016 +0100

    Do not refer to cgview.jar (in a wrong location but rather call the wrapper.
---
 debian/changelog                    |  6 +-----
 debian/patches/path_to_cgview.patch | 17 +++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 26081dc..dc874b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,5 @@
 brig (0.95+dfsg-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #<bug>)
-  Hmmm, this source basically includes the source of
-     git://anonscm.debian.org/debian-med/cgview.git
-  The actual brig source needs to be fetched from SVN:
-     svn export svn://svn.code.sf.net/p/brig/code/ brig
 
- -- Andreas Tille <tille at debian.org>  Fri, 27 Nov 2015 08:36:19 +0100
+ -- Andreas Tille <tille at debian.org>  Fri, 29 Jan 2016 14:16:51 +0100
diff --git a/debian/patches/path_to_cgview.patch b/debian/patches/path_to_cgview.patch
new file mode 100644
index 0000000..46eb49a
--- /dev/null
+++ b/debian/patches/path_to_cgview.patch
@@ -0,0 +1,17 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 29 Jan 2016 14:16:51 +0100
+Description: Do not refer to cgview.jar (in a wrong location but
+ rather call the wrapper.
+
+--- a/src/brig/BRIG.java
++++ b/src/brig/BRIG.java
+@@ -1399,8 +1399,7 @@ public class BRIG extends Thread{
+         }
+         BRIG.PROFILE.getRootElement().getAttributeValue("cgXML");
+ 
+-        String exec = "java " + mem + "  -jar cgview" + File.separator
+-                + "cgview.jar -f "+imgFormat +  "  -i " + cgXML + " -o "
++        String exec = "cgview -f "+imgFormat +  "  -i " + cgXML + " -o "
+                 + outputFile + "." + imgFormat;
+      /*   if (inter.compareTo("yes") == 0) {
+             new File(output + SL + FetchFilename(query) + "HTML").mkdir();
diff --git a/debian/patches/series b/debian/patches/series
index 31ad4af..5472a88 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 use_debian_packaged_jars.patch
 adapt_profile_location.patch
+path_to_cgview.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/brig.git