This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository scala.
commit df112458c5f61ae1e37b8a949d65d9f3f394eee3 Author: Emmanuel Bourg <[email protected]> Date: Fri Jun 19 09:54:42 2015 +0200 Added symlinks in /usr/share/java with the major Scala version (e.g. scala-library-2.11.jar) --- debian/changelog | 2 ++ debian/maven.rules | 2 ++ debian/rules | 19 +++++++++++++++---- debian/scala.links | 10 +++++----- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index e63ee27..558e520 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ scala (2.11.6-2) UNRELEASED; urgency=medium of multiple versions of Scala * Install the files under /usr/share/scala-2.11 and follow the layout of the upstream distribution + * Added symlinks in /usr/share/java with the major Scala version + (e.g. scala-library-2.11.jar) * Removed the JRE dependency of scala-library * Build depend on scala (>= 2.11) * Install the Maven artifacts for scala-actors and scala-reflect diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..3e580ba --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,2 @@ +org.scala-lang * * s/2\.11.*/2.11.x/ * * +org.scala-lang * * s/2\.12.*/2.12.x/ * * diff --git a/debian/rules b/debian/rules index 197ddda..3e2f158 100755 --- a/debian/rules +++ b/debian/rules @@ -14,11 +14,8 @@ override_dh_auto_build: ant -Dversion.number=$(BUNDLE_VERSION) \ -Djunit.version=4.x \ -Dextra.repo.url=file:///usr/share/maven-repo \ - -Dlibrary.starr.jar=/usr/share/java/scala-library.jar \ - -Dreflect.starr.jar=/usr/share/java/scala-reflect.jar \ - -Dcompiler.starr.jar=/usr/share/java/scala-compiler.jar \ -Djline.version=2.x \ - -Dstarr.version=debian \ + -Dstarr.version=2.11.x \ fastdist-opt docs for file in scala-library scala-compiler scala-reflect scala-actors; do \ @@ -29,6 +26,20 @@ override_dh_auto_clean: rm -rf build dists buildcharacter.properties debian/poms/*.pom.xml override_dh_compress: + # rename the versionless links to avoid conflicts with other versions of Scala + mv debian/scala/usr/share/java/scalap.jar debian/scala/usr/share/java/scalap-2.11.jar + mv debian/scala/usr/share/java/scala-compiler.jar debian/scala/usr/share/java/scala-compiler-2.11.jar + mv debian/scala-library/usr/share/java/scala-library.jar debian/scala-library/usr/share/java/scala-library-2.11.jar + mv debian/scala-library/usr/share/java/scala-reflect.jar debian/scala-library/usr/share/java/scala-reflect-2.11.jar + mv debian/scala-library/usr/share/java/scala-actors.jar debian/scala-library/usr/share/java/scala-actors-2.11.jar + + # ...but keep compatibility links until a separate scala-2.11 package is created + cp -a debian/scala/usr/share/java/scalap-2.11.jar debian/scala/usr/share/java/scalap.jar + cp -a debian/scala/usr/share/java/scala-compiler-2.11.jar debian/scala/usr/share/java/scala-compiler.jar + cp -a debian/scala-library/usr/share/java/scala-library-2.11.jar debian/scala-library/usr/share/java/scala-library.jar + cp -a debian/scala-library/usr/share/java/scala-reflect-2.11.jar debian/scala-library/usr/share/java/scala-reflect.jar + cp -a debian/scala-library/usr/share/java/scala-actors-2.11.jar debian/scala-library/usr/share/java/scala-actors.jar + dh_compress -X.js -X.scala gzip --best -n debian/scala/usr/share/scala-2.11/man/man1/*.1 diff --git a/debian/scala.links b/debian/scala.links index d8ac717..898b6c2 100644 --- a/debian/scala.links +++ b/debian/scala.links @@ -3,8 +3,8 @@ usr/share/java/jansi.jar usr/share/scala-2.11/lib/jansi usr/share/java/jline2.jar usr/share/scala-2.11/lib/jline.jar usr/share/java/scala-xml_2.11.jar usr/share/scala-2.11/lib/scala-xml.jar usr/share/java/scala-parser-combinators_2.11.jar usr/share/scala-2.11/lib/scala-parser-combinators.jar -usr/share/java/scala-actors.jar usr/share/scala-2.11/lib/scala-actors.jar -usr/share/java/scala-compiler.jar usr/share/scala-2.11/lib/scala-compiler.jar -usr/share/java/scala-library.jar usr/share/scala-2.11/lib/scala-library.jar -usr/share/java/scala-reflect.jar usr/share/scala-2.11/lib/scala-reflect.jar -usr/share/java/scalap.jar usr/share/scala-2.11/lib/scalap.jar +usr/share/java/scala-actors-2.11.jar usr/share/scala-2.11/lib/scala-actors.jar +usr/share/java/scala-compiler-2.11.jar usr/share/scala-2.11/lib/scala-compiler.jar +usr/share/java/scala-library-2.11.jar usr/share/scala-2.11/lib/scala-library.jar +usr/share/java/scala-reflect-2.11.jar usr/share/scala-2.11/lib/scala-reflect.jar +usr/share/java/scalap-2.11.jar usr/share/scala-2.11/lib/scalap.jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
