This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository scala-2.10.
commit ef38a36c6698d935f50f53df9fdb5f6725da24d4 Author: Emmanuel Bourg <[email protected]> Date: Mon Nov 14 15:13:43 2016 +0100 Renamed the versionless jar files in /usr/share/java to scala*-2.10.jar --- debian/rules | 13 +++++++++---- debian/scala-2.10.jlibs | 1 - debian/scala-2.10.poms | 3 ++- debian/scala-library-2.10.jlibs | 1 - debian/scala-library-2.10.poms | 1 - 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/debian/rules b/debian/rules index 75d381a..190236e 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ include $(CURDIR)/build.number BUNDLE_VERSION="$(version.major).$(version.minor).$(version.patch)" %: - dh $@ --with javahelper --with jh_maven_repo_helper + dh $@ --with javahelper --with maven-repo-helper override_dh_auto_build: # Build Jline @@ -34,10 +34,15 @@ override_dh_auto_clean: rm -rf build dists lib/jline.jar buildcharacter.properties override_dh_compress: + # rename the versionless links to avoid conflicts with other versions of Scala + mv debian/scala-2.10/usr/share/java/scalap.jar debian/scala-2.10/usr/share/java/scalap-2.10.jar + mv debian/scala-2.10/usr/share/java/scala-compiler.jar debian/scala-2.10/usr/share/java/scala-compiler-2.10.jar + mv debian/scala-library-2.10/usr/share/java/scala-library.jar debian/scala-library-2.10/usr/share/java/scala-library-2.10.jar + mv debian/scala-library-2.10/usr/share/java/scala-reflect.jar debian/scala-library-2.10/usr/share/java/scala-reflect-2.10.jar + mv debian/scala-library-2.10/usr/share/java/scala-actors.jar debian/scala-library-2.10/usr/share/java/scala-actors-2.10.jar + mv debian/scala-library-2.10/usr/share/java/scala-swing.jar debian/scala-library-2.10/usr/share/java/scala-swing-2.10.jar + dh_compress -X.js -X.scala - # dh_compress is executed after mh_installpoms and mh_linkjars - # ugly hack to fix #654549 - find debian/scala-2.10 \( -type f -or -type l \) -name "scala-library*.jar" -delete get-orig-source: uscan --download-current-version --rename diff --git a/debian/scala-2.10.jlibs b/debian/scala-2.10.jlibs index d8dd724..fbf16c3 100644 --- a/debian/scala-2.10.jlibs +++ b/debian/scala-2.10.jlibs @@ -1,2 +1 @@ -dists/latest/lib/scala-compiler.jar dists/latest/lib/scalap.jar diff --git a/debian/scala-2.10.poms b/debian/scala-2.10.poms index e6db047..a7e1576 100644 --- a/debian/scala-2.10.poms +++ b/debian/scala-2.10.poms @@ -1 +1,2 @@ -debian/scala.pom.xml --usj-name=scala-compiler +debian/scala.pom.xml --has-package-version --java-lib --artifact=build/pack/lib/scala-compiler.jar --usj-name=scala-compiler --package=scala-2.10 +debian/scala-library.pom.xml --has-package-version --java-lib --artifact=build/pack/lib/scala-library.jar --usj-name=scala-library --package=scala-library-2.10 diff --git a/debian/scala-library-2.10.jlibs b/debian/scala-library-2.10.jlibs index c356ff4..4316e13 100644 --- a/debian/scala-library-2.10.jlibs +++ b/debian/scala-library-2.10.jlibs @@ -1,4 +1,3 @@ -dists/latest/lib/scala-library.jar dists/latest/lib/scala-actors.jar dists/latest/lib/scala-reflect.jar dists/latest/lib/scala-swing.jar diff --git a/debian/scala-library-2.10.poms b/debian/scala-library-2.10.poms deleted file mode 100644 index 12b8d35..0000000 --- a/debian/scala-library-2.10.poms +++ /dev/null @@ -1 +0,0 @@ -debian/scala-library.pom.xml --usj-name=scala-library -- 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
