This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository prottest.
commit 51cdeac40a9375ba1fb611404fc1d0ae89c5d1e5 Author: Andreas Tille <[email protected]> Date: Tue May 10 11:51:45 2016 +0200 Try to provide Debian packaged JARs to Build system but failed --- debian/patches/build.patch | 44 ++++++++++++++------------------------------ debian/patches/series | 1 + 2 files changed, 15 insertions(+), 30 deletions(-) diff --git a/debian/patches/build.patch b/debian/patches/build.patch index bc44a8a..a4b0aba 100644 --- a/debian/patches/build.patch +++ b/debian/patches/build.patch @@ -1,36 +1,20 @@ -From: Markus Koschany <[email protected]> -Date: Fri, 16 Oct 2015 23:05:52 +0200 +From: Markus Koschany <[email protected]>, + Andreas Tille <[email protected]> +Last_Update: Mon, 09 May 2016 21:03:00 +0200 Subject: build using Debian packaged jars --- buildconf/project.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---- a/buildconf/project.properties -+++ b/buildconf/project.properties -@@ -20,11 +20,11 @@ dist.dir=dist - dist.jar=${dist.dir}/prottest-${application.version}.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=** -@@ -60,7 +60,7 @@ javadoc.windowtitle= - # The library definition has always preference over this property. - libs.absolutelayout.classpath=lib/AbsoluteLayout.jar - #libs.CopyLibs.classpath=lib/org-netbeans-modules-java-j2seproject-copylibstask.jar --libs.CopyLibs.classpath=lib/copylibs.jar -+#libs.CopyLibs.classpath=lib/copylibs.jar - main.class=es.uvigo.darwin.prottest.ProtTest - manifest.file=manifest.mf - meta.inf.dir=${src.dir}/META-INF +--- 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/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 + X-COMMENT: Main-Class will be added automatically by build + diff --git a/debian/patches/series b/debian/patches/series index 6f3a075..ca3349b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ use_debian_packaged_phyml.patch +build.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/prottest.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
