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

Mehdi Dogguy mehdi at debian.org
Thu Dec 15 22:42:03 UTC 2011


The following commit has been merged in the master branch:
commit 4b58209c4615d2d266a465f8aa94d051d4977116
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Dec 15 17:53:53 2011 +0100

    Fix version number in scala-library.pom.xml

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..447124f
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+debian/scala-library.pom.xml
+debian/scala.pom.xml
diff --git a/debian/rules b/debian/rules
index 4c55924..5e3bdf2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,10 @@ override_dh_auto_build:
 	# Use jQuery from libjs-jquery{,ui}
 	#find -name "jquery.js" -or -name "jquery-ui.js" -delete
 
+	for file in scala scala-library; do \
+		sed "s/@VERSION@/$(BUNDLE_VERSION)/" debian/$${file}.pom.xml.in > debian/$${file}.pom.xml; \
+	done
+
 override_dh_auto_clean:
 	rm -rf build dist
 
diff --git a/debian/scala-library.pom.xml b/debian/scala-library.pom.xml.in
similarity index 89%
rename from debian/scala-library.pom.xml
rename to debian/scala-library.pom.xml.in
index 8c828a5..712b5cc 100644
--- a/debian/scala-library.pom.xml
+++ b/debian/scala-library.pom.xml.in
@@ -4,5 +4,5 @@
     <groupId>org.scala-lang</groupId>
     <artifactId>scala-library</artifactId>
     <packaging>jar</packaging>
-    <version>2.9.1</version>
-</project>
\ No newline at end of file
+    <version>@VERSION@</version>
+</project>
diff --git a/debian/scala.pom.xml b/debian/scala.pom.xml.in
similarity index 90%
rename from debian/scala.pom.xml
rename to debian/scala.pom.xml.in
index 7dce60c..0b3c256 100644
--- a/debian/scala.pom.xml
+++ b/debian/scala.pom.xml.in
@@ -4,5 +4,5 @@
     <groupId>org.scala-lang</groupId>
     <artifactId>scala-compiler</artifactId>
     <packaging>jar</packaging>
-    <version>2.9.1</version>
-</project>
\ No newline at end of file
+    <version>@VERSION@</version>
+</project>

-- 
Scala packaging



More information about the Pkg-scala-commits mailing list