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 b6c192e9962bad0af846101873fc47d77e7d4bc7 Author: Emmanuel Bourg <[email protected]> Date: Wed Jun 17 23:24:11 2015 +0200 Install the Maven artifacts for scala-actors, scala-reflect, scala-swing and jline --- debian/clean | 2 - debian/poms/jline.pom.xml.in | 54 +++++++++++++++++++++++++++ debian/poms/scala-actors.pom.xml.in | 51 ++++++++++++++++++++++++++ debian/poms/scala-compiler.pom.xml.in | 59 ++++++++++++++++++++++++++++++ debian/{ => poms}/scala-library.pom.xml.in | 0 debian/poms/scala-reflect.pom.xml.in | 51 ++++++++++++++++++++++++++ debian/poms/scala-swing.pom.xml.in | 51 ++++++++++++++++++++++++++ debian/rules | 7 ++-- debian/scala-2.10.install | 1 - debian/scala-2.10.links | 3 ++ debian/scala-2.10.poms | 8 +++- debian/scala-library-2.10.jlibs | 3 -- debian/scala.pom.xml.in | 8 ---- 13 files changed, 279 insertions(+), 19 deletions(-) diff --git a/debian/clean b/debian/clean deleted file mode 100644 index 447124f..0000000 --- a/debian/clean +++ /dev/null @@ -1,2 +0,0 @@ -debian/scala-library.pom.xml -debian/scala.pom.xml diff --git a/debian/poms/jline.pom.xml.in b/debian/poms/jline.pom.xml.in new file mode 100644 index 0000000..3a4a335 --- /dev/null +++ b/debian/poms/jline.pom.xml.in @@ -0,0 +1,54 @@ +<?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>jline</artifactId> + <packaging>jar</packaging> + <version>@VERSION@</version> + <name>jline</name> + <description>Like readline, but better</description> + <url>http://www.scala-lang.org/</url> + <inceptionYear>2011</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> + <license> + <name>The BSD License</name> + <url>http://www.opensource.org/licenses/bsd-license.php</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.fusesource.jansi</groupId> + <artifactId>jansi</artifactId> + <version>1.4</version> + <!--<scope>provided</scope>--> + </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-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..a19866b --- /dev/null +++ b/debian/poms/scala-compiler.pom.xml.in @@ -0,0 +1,59 @@ +<?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> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>jline</artifactId> + <version>@VERSION@</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/poms/scala-swing.pom.xml.in b/debian/poms/scala-swing.pom.xml.in new file mode 100644 index 0000000..80562fa --- /dev/null +++ b/debian/poms/scala-swing.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-swing</artifactId> + <packaging>jar</packaging> + <version>2.10.5</version> + <name>Scala Swing library</name> + <description>Swing for Scala</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/2.10.5/</info.apiURL> + </properties> + <dependencies> + <dependency> + <groupId>org.scala-lang</groupId> + <artifactId>scala-library</artifactId> + <version>2.10.5</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 5ff3f29..23a609f 100755 --- a/debian/rules +++ b/debian/rules @@ -26,17 +26,18 @@ override_dh_auto_build: -Dhas.java7=true \ fastdist-opt - 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 scala-swing jline; 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 lib/jline.jar buildcharacter.properties + rm -rf build dists lib/jline.jar buildcharacter.properties debian/poms/*.pom.xml 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-2.10/usr/share/java/scala-jline.jar debian/scala-2.10/usr/share/java/scala-jline-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 diff --git a/debian/scala-2.10.install b/debian/scala-2.10.install index cda3756..776e5ea 100644 --- a/debian/scala-2.10.install +++ b/debian/scala-2.10.install @@ -3,6 +3,5 @@ build/pack/bin/scala usr/share/scala-2.10/bin/ build/pack/bin/scalac usr/share/scala-2.10/bin/ build/pack/bin/scaladoc usr/share/scala-2.10/bin/ build/pack/bin/scalap usr/share/scala-2.10/bin/ -lib/jline.jar usr/share/scala-2.10/lib/ dists/latest/man usr/share/scala-2.10/ diff --git a/debian/scala-2.10.links b/debian/scala-2.10.links index cfddbc7..f98b951 100644 --- a/debian/scala-2.10.links +++ b/debian/scala-2.10.links @@ -4,3 +4,6 @@ usr/share/java/scala-library-2.10.jar usr/share/scala-2.10/lib/ usr/share/java/scala-reflect-2.10.jar usr/share/scala-2.10/lib/scala-reflect.jar usr/share/java/scala-swing-2.10.jar usr/share/scala-2.10/lib/scala-swing.jar usr/share/java/scalap-2.10.jar usr/share/scala-2.10/lib/scalap.jar +usr/share/java/scala-jline-2.10.jar usr/share/scala-2.10/lib/jline.jar +usr/share/java/jansi.jar usr/share/scala-2.10/lib/jansi.jar +usr/share/java/hawtjni-runtime.jar usr/share/scala-2.10/lib/hawtjni-runtime.jar diff --git a/debian/scala-2.10.poms b/debian/scala-2.10.poms index a7e1576..2a9be28 100644 --- a/debian/scala-2.10.poms +++ b/debian/scala-2.10.poms @@ -1,2 +1,6 @@ -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 +debian/poms/scala-compiler.pom.xml --has-package-version --java-lib --artifact=build/pack/lib/scala-compiler.jar --usj-name=scala-compiler --package=scala-2.10 +debian/poms/jline.pom.xml --has-package-version --java-lib --artifact=lib/jline.jar --usj-name=scala-jline --package=scala-2.10 +debian/poms/scala-actors.pom.xml --has-package-version --java-lib --artifact=build/pack/lib/scala-actors.jar --usj-name=scala-actors --package=scala-library-2.10 +debian/poms/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 +debian/poms/scala-reflect.pom.xml --has-package-version --java-lib --artifact=build/pack/lib/scala-reflect.jar --usj-name=scala-reflect --package=scala-library-2.10 +debian/poms/scala-swing.pom.xml --has-package-version --java-lib --artifact=build/pack/lib/scala-swing.jar --usj-name=scala-swing --package=scala-library-2.10 diff --git a/debian/scala-library-2.10.jlibs b/debian/scala-library-2.10.jlibs deleted file mode 100644 index 4316e13..0000000 --- a/debian/scala-library-2.10.jlibs +++ /dev/null @@ -1,3 +0,0 @@ -dists/latest/lib/scala-actors.jar -dists/latest/lib/scala-reflect.jar -dists/latest/lib/scala-swing.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> -- 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
