This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch scala-2.11 in repository scala-2.10.
commit ce29bead12be82217b260d1eaeef81d420b7efb4 Author: Emmanuel Bourg <[email protected]> Date: Mon Aug 1 16:16:44 2016 +0200 New build dependency on libjarjar-java --- debian/changelog | 1 + debian/control | 1 + debian/patches/0011-use-local-dependencies.patch | 14 ++++++++++++++ debian/patches/series | 1 + 4 files changed, 17 insertions(+) diff --git a/debian/changelog b/debian/changelog index 41fc710..cfbcf59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ scala (2.11.8-1) UNRELEASED; urgency=medium * Team upload. * New upstream release - Refreshed the patches + - New build dependency on libjarjar-java * Standards-Version updated to 3.9.8 * Use a secure Vcs-Git URL * Improved the description for scala-library and scala-doc diff --git a/debian/control b/debian/control index fb55ac0..053e33f 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: ant-contrib, ant-optional, bnd (>= 2.1.0), + libjarjar-java, libmaven-ant-tasks-java, junit4, libjline2-java, diff --git a/debian/patches/0011-use-local-dependencies.patch b/debian/patches/0011-use-local-dependencies.patch new file mode 100644 index 0000000..d27db61 --- /dev/null +++ b/debian/patches/0011-use-local-dependencies.patch @@ -0,0 +1,14 @@ +Description: Use the local version of the dependencies +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/build.xml ++++ b/build.xml +@@ -280,7 +280,7 @@ + <artifact:dependencies pathId="jarjar.classpath"> + <remoteRepository id="central" url="file:///usr/share/maven-repo"/> + <localRepository path="${user.home}/.m2/repository"/> +- <dependency groupId="com.googlecode.jarjar" artifactId="jarjar" version="1.3"/> ++ <dependency groupId="com.googlecode.jarjar" artifactId="jarjar" version="debian"/> + </artifact:dependencies> + + <!-- JUnit --> diff --git a/debian/patches/series b/debian/patches/series index fa1cd6a..562029d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 0008-disable-lib-fetching.patch 0009-local-repository.patch 0010-bnd-2.1.0.patch +0011-use-local-dependencies.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala-2.10.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
