[Pkg-scala-commits] [SCM] Scala packaging branch, master, updated. debian/2.9.1.dfsg-1-14-gf1e1282

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit d35a8ce6121958746802d0cbccb5f26accb44cdc
Author: Thomas Koch <thomas at koch.ro>
Date:   Wed Dec 14 12:02:19 2011 +0100

    Install to maven repo
    Closes: 652024

diff --git a/debian/control b/debian/control
index 73e710f..6446b96 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,8 @@ Build-Depends:
  ant-contrib,
  ant-optional,
  libmaven-ant-tasks-java,
- debhelper (>= 7.0.50)
+ debhelper (>= 7.0.50),
+ javahelper, maven-repo-helper
 Homepage: http://www.scala-lang.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-scala/packages/scala.git
 Vcs-Git: git://git.debian.org/git/pkg-scala/packages/scala.git
diff --git a/debian/rules b/debian/rules
index 7d060d8..04dd97c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,4 +17,4 @@ override_dh_compress:
 	dh_compress -X.js -X.scala
 
 %:
-	dh $@
+	dh $@ --with javahelper --with jh_maven_repo_helper
diff --git a/debian/scala-library.install b/debian/scala-library.install
deleted file mode 100644
index 4ebb0e4..0000000
--- a/debian/scala-library.install
+++ /dev/null
@@ -1,4 +0,0 @@
-dists/latest/lib/scala-library.jar	usr/share/java/
-dists/latest/lib/scala-dbc.jar		usr/share/java/
-dists/latest/lib/scala-swing.jar	usr/share/java/
-dists/latest/lib/scala-partest.jar	usr/share/java/
diff --git a/debian/scala-library.jlibs b/debian/scala-library.jlibs
new file mode 100644
index 0000000..93fe40a
--- /dev/null
+++ b/debian/scala-library.jlibs
@@ -0,0 +1,4 @@
+dists/latest/lib/scala-library.jar
+dists/latest/lib/scala-dbc.jar
+dists/latest/lib/scala-swing.jar
+dists/latest/lib/scala-partest.jar
diff --git a/debian/scala-library.pom.xml b/debian/scala-library.pom.xml
new file mode 100644
index 0000000..8c828a5
--- /dev/null
+++ b/debian/scala-library.pom.xml
@@ -0,0 +1,8 @@
+<?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-library</artifactId>
+    <packaging>jar</packaging>
+    <version>2.9.1</version>
+</project>
\ No newline at end of file
diff --git a/debian/scala-library.poms b/debian/scala-library.poms
new file mode 100644
index 0000000..12b8d35
--- /dev/null
+++ b/debian/scala-library.poms
@@ -0,0 +1 @@
+debian/scala-library.pom.xml --usj-name=scala-library
diff --git a/debian/scala.install b/debian/scala.install
index fe90e3c..11e1386 100644
--- a/debian/scala.install
+++ b/debian/scala.install
@@ -3,6 +3,4 @@ dists/latest/bin/scala              usr/bin/
 dists/latest/bin/scalac             usr/bin/
 dists/latest/bin/scaladoc           usr/bin/
 dists/latest/bin/scalap             usr/bin/
-dists/latest/lib/scala-compiler.jar usr/share/java/
-dists/latest/lib/scalap.jar         usr/share/java/
 lib/jline.jar                       usr/share/java/scala/
diff --git a/debian/scala.jlibs b/debian/scala.jlibs
new file mode 100644
index 0000000..d8dd724
--- /dev/null
+++ b/debian/scala.jlibs
@@ -0,0 +1,2 @@
+dists/latest/lib/scala-compiler.jar
+dists/latest/lib/scalap.jar
diff --git a/debian/scala.pom.xml b/debian/scala.pom.xml
new file mode 100644
index 0000000..7dce60c
--- /dev/null
+++ b/debian/scala.pom.xml
@@ -0,0 +1,8 @@
+<?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>2.9.1</version>
+</project>
\ No newline at end of file
diff --git a/debian/scala.poms b/debian/scala.poms
new file mode 100644
index 0000000..e6db047
--- /dev/null
+++ b/debian/scala.poms
@@ -0,0 +1 @@
+debian/scala.pom.xml --usj-name=scala-compiler

-- 
Scala packaging