[scala] 04/10: Use the 'debian' version of scala-xml and scala-parser-combinators

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository scala.

commit a85ed139ee6a22ecf37381a72a272497fb5815f1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Aug 1 16:19:06 2016 +0200

    Use the 'debian' version of scala-xml and scala-parser-combinators
---
 debian/changelog | 1 +
 debian/rules     | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cfbcf59..7654fa4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ scala (2.11.8-1) UNRELEASED; urgency=medium
   * New upstream release
     - Refreshed the patches
     - New build dependency on libjarjar-java
+    - Use the 'debian' version of scala-xml and scala-parser-combinators
   * 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/rules b/debian/rules
index ef75dea..2572891 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,8 @@ override_dh_auto_build:
 	    -Dextra.repo.url=file:///usr/share/maven-repo \
 	    -Djline.version=2.x \
 	    -Dstarr.version=2.11.x \
+	    -Dscala-parser-combinators.version.number=debian \
+	    -Dscala-xml.version.number=debian \
 	    -Duser.home=debian/tmp \
 	    fastdist-opt docs
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala.git