[med-svn] [prottest] 01/01: Build thanks to Markus Koschany

[Andreas Tille]

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

tille pushed a commit to branch master
in repository prottest.

commit eaeb3ccbc38b1e8a442296102dfa0b1a454db5ed
Author: Andreas Tille <tille at debian.org>
Date:   Fri Oct 16 23:51:48 2015 +0200

    Build thanks to Markus Koschany
---
 debian/changelog                     |  2 +-
 debian/install                       |  2 +-
 debian/manifest                      |  2 +-
 debian/patches/build.patch           | 27 +++++++++++++++++++++++++++
 debian/patches/series                |  2 +-
 debian/patches/use_debian_jars.patch | 11 -----------
 6 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8f28a28..7c91830 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ prottest (3.4+dfsg-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #?????)
 
- -- Andreas Tille <tille at debian.org>  Sat, 05 Sep 2015 00:35:44 +0200
+ -- Andreas Tille <tille at debian.org>  Fri, 16 Oct 2015 23:38:00 +0200
diff --git a/debian/install b/debian/install
index 44972b6..153cdb8 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1 @@
-prottest.jar	usr/share/java
+dist/prottest*.jar	usr/share/java
diff --git a/debian/manifest b/debian/manifest
index 9749ef5..122a841 100644
--- a/debian/manifest
+++ b/debian/manifest
@@ -1,2 +1,2 @@
-usr/share/java/prottest.jar:
+usr/share/java/prottest-3.4.jar:
  Class-Path: /usr/share/java/AbsoluteLayout.jar /usr/share/java/mpj.jar /usr/share/java/pal-cvs.jar /usr/share/java/alter.jar
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
new file mode 100644
index 0000000..735df53
--- /dev/null
+++ b/debian/patches/build.patch
@@ -0,0 +1,27 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Fri, 16 Oct 2015 23:05:52 +0200
+Subject: build using Debian packaged jars
+
+---
+ buildconf/project.properties | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/buildconf/project.properties
++++ b/buildconf/project.properties
+@@ -19,11 +19,11 @@ dist.dir=dist
+ dist.jar=${dist.dir}/prottest-3.4.jar
+ dist.javadoc.dir=${dist.dir}/javadoc
+ excludes=
+-file.reference.AbsoluteLayout.jar=lib/AbsoluteLayout.jar
+-file.reference.appframework-1.0.3.jar=lib/appframework-1.0.3.jar
+-file.reference.alter.jar=lib/alter.jar
+-file.reference.mpj.jar=lib/mpj.jar
+-file.reference.pal.jar=lib/pal.jar
++file.reference.AbsoluteLayout.jar=/usr/share/java/AbsoluteLayout.jar
++file.reference.appframework-1.0.3.jar=/usr/share/java/bsaf.jar
++file.reference.alter.jar=/usr/share/java/alter.jar
++file.reference.mpj.jar=/usr/share/java/mpj.jar
++file.reference.pal.jar=/usr/share/java/pal-cvs.jar
+ file.reference.ProtTest-HPC-src=src
+ file.reference.swing-worker-1.1.jar=lib/swing-worker-1.1.jar
+ includes=**
diff --git a/debian/patches/series b/debian/patches/series
index 9e2d452..5879227 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-use_debian_jars.patch
+build.patch
diff --git a/debian/patches/use_debian_jars.patch b/debian/patches/use_debian_jars.patch
deleted file mode 100644
index 180d3bf..0000000
--- a/debian/patches/use_debian_jars.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/manifest.mf
-+++ b/manifest.mf
-@@ -2,7 +2,6 @@ Manifest-Version: 1.0
- Ant-Version: Apache Ant 1.7.1
- Created-By: 19.0-b09 (Sun Microsystems Inc.)
- Main-Class: es.uvigo.darwin.prottest.ProtTest
--Class-Path: lib/AbsoluteLayout.jar lib/appframework-1.0.3.jar lib/mpj.
-- jar lib/pal.jar lib/alter.jar lib/swing-worker-1.1.jar
-+Class-Path: /usr/share/java/AbsoluteLayout.jar /usr/share/java/mpj.jar /usr/share/java/pal-cvs.jar /usr/share/java/alter.jar lib/swing-worker-1.1.jar
- X-COMMENT: Main-Class will be added automatically by build
- 

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