This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to annotated tag debian/2.11.6-1 in repository scala.
commit 330ebde1896f6f1335635d7ffa2da9e7e990d483 Author: Emmanuel Bourg <ebo...@apache.org> Date: Wed Jun 17 23:24:11 2015 +0200 Install the Maven artifacts for scala-actors and scala-reflect --- debian/changelog | 1 + debian/poms/scala-actors.pom.xml.in | 51 ++++++++++++++++++++++ debian/poms/scala-compiler.pom.xml.in | 70 ++++++++++++++++++++++++++++++ debian/{ => poms}/scala-library.pom.xml.in | 0 debian/poms/scala-reflect.pom.xml.in | 51 ++++++++++++++++++++++ debian/rules | 8 ++-- debian/scala-library.dirs | 1 - debian/scala-library.jlibs | 3 -- debian/scala-library.poms | 4 +- debian/scala.jlibs | 1 - debian/scala.pom.xml.in | 8 ---- debian/scala.poms | 2 +- 12 files changed, 181 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index 723a8cb..21f5859 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ scala (2.11.6-2) UNRELEASED; urgency=medium - Require a Java 7+ runtime - Refreshed debian/copyright * Removed the JRE dependency of scala-library + * Install the Maven artifacts for scala-actors and scala-reflect * The package has been adopted by the Java Team (Closes: #754935) * Adapted debian/orig-tar.sh for Scala 2.11 diff --git a/debian/poms/scala-actors.pom.xml.in b/debian/poms/scala-actors.pom.xml.in new file mode 100644 index 0000000..a0ebcec --- /dev/null +++ b/debian/poms/scala-actors.pom.xml.in @@ -0,0 +1,51 @@ +<?xml version="1.0"?> +<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.scala-lang</groupId> + <artifactId>scala-actors</artifactId> + <packaging>jar</packaging> + <version>@VERSION@</version> + <name>Scala Actors library</name> + <description>Deprecated Actors Library for Scala</description> + <url>http://www.scala-lang.org/</url> + <inceptionYear>2006</inceptionYear> + <organization> + <name>LAMP/EPFL</name> + <url>http://lamp.epfl.ch/</url> + </organization> + <licenses> + <license> + <name>BSD 3-Clause</name> + <url>http://www.scala-lang.org/license.html</url> + <distribution>repo</distribution> + </license> + </licenses> + <scm> + <connection>scm:git:git://github.com/scala/scala.git</connection> + <url>https://github.com/scala/scala.git</url> + </scm> + <issueManagement> + <system>JIRA</system> + <url>https://issues.scala-lang.org/</url> + </issueManagement> + <properties> + <info.apiURL>http://www.scala-lang.org/api/@VERSION@/</info.apiURL> + </properties> + <dependencies> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + <version>@VERSION@</version> + </dependency> + </dependencies> + <developers> + <developer> + <id>lamp</id> + <name>EPFL LAMP</name> + </developer> + <developer> + <id>Typesafe</id> + <name>Typesafe, Inc.</name> + </developer> + </developers> +</project> diff --git a/debian/poms/scala-compiler.pom.xml.in b/debian/poms/scala-compiler.pom.xml.in new file mode 100644 index 0000000..a0b0618 --- /dev/null +++ b/debian/poms/scala-compiler.pom.xml.in @@ -0,0 +1,70 @@ +<?xml version="1.0"?> +<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.scala-lang</groupId> + <artifactId>scala-compiler</artifactId> + <packaging>jar</packaging> + <version>@VERSION@</version> + <name>Scala Compiler</name> + <description>Compiler for the Scala Programming Language</description> + <url>http://www.scala-lang.org/</url> + <inceptionYear>2002</inceptionYear> + <organization> + <name>LAMP/EPFL</name> + <url>http://lamp.epfl.ch/</url> + </organization> + <licenses> + <license> + <name>BSD 3-Clause</name> + <url>http://www.scala-lang.org/license.html</url> + <distribution>repo</distribution> + </license> + </licenses> + <scm> + <connection>scm:git:git://github.com/scala/scala.git</connection> + <url>https://github.com/scala/scala.git</url> + </scm> + <issueManagement> + <system>JIRA</system> + <url>https://issues.scala-lang.org/</url> + </issueManagement> + <dependencies> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + <version>@VERSION@</version> + </dependency> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-reflect</artifactId> + <version>@VERSION@</version> + </dependency> + <!-- TODO modularize compiler: these dependencies will disappear when the compiler is modularized --> + <dependency> <!-- for scala-compiler-doc --> + <groupId>org.scala-lang.modules</groupId> + <artifactId>scala-xml_2.11</artifactId> + <version>1.0.3</version> + </dependency> + <dependency> <!-- for scala-compiler-doc --> + <groupId>org.scala-lang.modules</groupId> + <artifactId>scala-parser-combinators_2.11</artifactId> + <version>1.0.3</version> + </dependency> + <dependency> <!-- for scala-compiler-repl; once it moves there, make it required --> + <groupId>jline</groupId> + <artifactId>jline</artifactId> + <version>2.12.1</version> + <optional>true</optional> + </dependency> + </dependencies> + <developers> + <developer> + <id>lamp</id> + <name>EPFL LAMP</name> + </developer> + <developer> + <id>Typesafe</id> + <name>Typesafe, Inc.</name> + </developer> + </developers> +</project> diff --git a/debian/scala-library.pom.xml.in b/debian/poms/scala-library.pom.xml.in similarity index 100% rename from debian/scala-library.pom.xml.in rename to debian/poms/scala-library.pom.xml.in diff --git a/debian/poms/scala-reflect.pom.xml.in b/debian/poms/scala-reflect.pom.xml.in new file mode 100644 index 0000000..c21caef --- /dev/null +++ b/debian/poms/scala-reflect.pom.xml.in @@ -0,0 +1,51 @@ +<?xml version="1.0"?> +<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.scala-lang</groupId> + <artifactId>scala-reflect</artifactId> + <packaging>jar</packaging> + <version>@VERSION@</version> + <name>Scala Compiler</name> + <description>Compiler for the Scala Programming Language</description> + <url>http://www.scala-lang.org/</url> + <inceptionYear>2002</inceptionYear> + <organization> + <name>LAMP/EPFL</name> + <url>http://lamp.epfl.ch/</url> + </organization> + <licenses> + <license> + <name>BSD 3-Clause</name> + <url>http://www.scala-lang.org/license.html</url> + <distribution>repo</distribution> + </license> + </licenses> + <scm> + <connection>scm:git:git://github.com/scala/scala.git</connection> + <url>https://github.com/scala/scala.git</url> + </scm> + <issueManagement> + <system>JIRA</system> + <url>https://issues.scala-lang.org/</url> + </issueManagement> + <properties> + <info.apiURL>http://www.scala-lang.org/api/@VERSION@/</info.apiURL> + </properties> + <dependencies> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + <version>@VERSION@</version> + </dependency> + </dependencies> + <developers> + <developer> + <id>lamp</id> + <name>EPFL LAMP</name> + </developer> + <developer> + <id>Typesafe</id> + <name>Typesafe, Inc.</name> + </developer> + </developers> +</project> diff --git a/debian/rules b/debian/rules index 7efa2d8..f997839 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 Scala @@ -20,12 +20,12 @@ override_dh_auto_build: -Djline.version=2.x \ fastdist-opt docs - for file in scala scala-library; do \ - sed "s/@VERSION@/$(BUNDLE_VERSION)/" debian/$${file}.pom.xml.in > debian/$${file}.pom.xml; \ + for file in scala-library scala-compiler scala-reflect scala-actors; do \ + sed "s/@VERSION@/$(BUNDLE_VERSION)/" debian/poms/$${file}.pom.xml.in > debian/poms/$${file}.pom.xml; \ done override_dh_auto_clean: - rm -rf build dists buildcharacter.properties + rm -rf build dists buildcharacter.properties debian/poms/*.pom.xml override_dh_compress: dh_compress -X.js -X.scala diff --git a/debian/scala-library.dirs b/debian/scala-library.dirs deleted file mode 100644 index 13c9f03..0000000 --- a/debian/scala-library.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/java diff --git a/debian/scala-library.jlibs b/debian/scala-library.jlibs deleted file mode 100644 index 6969441..0000000 --- a/debian/scala-library.jlibs +++ /dev/null @@ -1,3 +0,0 @@ -build/pack/lib/scala-library.jar -build/pack/lib/scala-actors.jar -build/pack/lib/scala-reflect.jar diff --git a/debian/scala-library.poms b/debian/scala-library.poms index 12b8d35..cd1cb79 100644 --- a/debian/scala-library.poms +++ b/debian/scala-library.poms @@ -1 +1,3 @@ -debian/scala-library.pom.xml --usj-name=scala-library +debian/poms/scala-actors.pom.xml --has-package-version --java-lib --artifact=build/pack/lib/scala-actors.jar +debian/poms/scala-library.pom.xml --has-package-version --java-lib --artifact=build/pack/lib/scala-library.jar +debian/poms/scala-reflect.pom.xml --has-package-version --java-lib --artifact=build/pack/lib/scala-reflect.jar diff --git a/debian/scala.jlibs b/debian/scala.jlibs index 5714bdc..17dbd54 100644 --- a/debian/scala.jlibs +++ b/debian/scala.jlibs @@ -1,2 +1 @@ -build/pack/lib/scala-compiler.jar build/pack/lib/scalap.jar diff --git a/debian/scala.pom.xml.in b/debian/scala.pom.xml.in deleted file mode 100644 index 0b3c256..0000000 --- a/debian/scala.pom.xml.in +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.scala-lang</groupId> - <artifactId>scala-compiler</artifactId> - <packaging>jar</packaging> - <version>@VERSION@</version> -</project> diff --git a/debian/scala.poms b/debian/scala.poms index e6db047..fac336e 100644 --- a/debian/scala.poms +++ b/debian/scala.poms @@ -1 +1 @@ -debian/scala.pom.xml --usj-name=scala-compiler +debian/poms/scala-compiler.pom.xml --has-package-version --java-lib --artifact=build/pack/lib/scala-compiler.jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala.git _______________________________________________ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits