This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository bnd.
commit 7d1b8d4a90c02e54b3c6a7947135a9feab343927 Author: Markus Koschany <[email protected]> Date: Mon May 18 14:19:12 2015 +0200 Drop ant-contrib.patch and use a symlink instead. --- debian/patches/ant-contrib.patch | 21 --------------------- debian/patches/series | 1 - debian/rules | 1 + 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/debian/patches/ant-contrib.patch b/debian/patches/ant-contrib.patch deleted file mode 100644 index a4512b2..0000000 --- a/debian/patches/ant-contrib.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Thu, 14 May 2015 15:38:25 +0200 -Subject: ant-contrib - ---- - cnf/build.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cnf/build.xml b/cnf/build.xml -index 44d9552..17a1761 100644 ---- a/cnf/build.xml -+++ b/cnf/build.xml -@@ -25,7 +25,7 @@ - - <taskdef resource="net/sf/antcontrib/antlib.xml"> - <classpath> -- <pathelement location="${workspacedir}/cnf/ant-contrib/ant-contrib-1.0b3.jar" /> -+ <pathelement location="/usr/share/java/ant-contrib.jar" /> - </classpath> - </taskdef> - diff --git a/debian/patches/series b/debian/patches/series index d946fde..5856851 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,7 +6,6 @@ display_bsn_on_missing_bundle.patch fix-encoding.patch no-ee.j2se.patch no-osgi.r5.patch -ant-contrib.patch findbugs.patch embedded-repo.patch FTBFS.patch diff --git a/debian/rules b/debian/rules index ce67745..e0403d8 100755 --- a/debian/rules +++ b/debian/rules @@ -59,6 +59,7 @@ debian/stamp-bootstrap: ln -s /usr/share/java/osgi.compendium.jar cnf/repo/osgi.cmpn/osgi.cmpn-4.3.0.jar # ln -s /usr/share/java/ee.foundation.jar cnf/repo/ee.minimum/ee.minimum-1.2.1.jar ln -s /usr/share/java/ant.jar cnf/repo/org.apache.tools.ant/org.apache.tools.ant-1.7.1.jar + ln -s /usr/share/java/ant-contrib.jar cnf/ant-contrib/ant-contrib-1.0b3.jar ln -s /usr/lib/eclipse/plugins/org.eclipse.core.runtime_*.jar cnf/repo/org.eclipse.core.runtime/org.eclipse.core.runtime-3.3.100.jar ln -s /usr/lib/eclipse/plugins/org.eclipse.core.resources_*.jar cnf/repo/org.eclipse.core.resources/org.eclipse.core.resources-3.3.1.jar ln -s /usr/lib/eclipse/plugins/org.eclipse.core.commands_*.jar cnf/repo/org.eclipse.core.commands/org.eclipse.core.commands-3.3.3.jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
