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

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit bd08d489cbc3baf9ca8ba6fd95f1c56a4a42bffa
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Wed Jan 4 11:11:50 2012 +0100

    Do not link to scala-library.jar in scala package (Closes: #654549).

diff --git a/debian/changelog b/debian/changelog
index f914c8d..26d3e08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+scala (2.9.1.dfsg-3) unstable; urgency=low
+
+  * Do not link to scala-library.jar in scala package (Closes: #654549).
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Wed, 04 Jan 2012 11:10:22 +0100
+
 scala (2.9.1.dfsg-2) unstable; urgency=low
 
   [ Frank S. Thomas ]
diff --git a/debian/rules b/debian/rules
index fa7be84..cee25e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,9 @@ override_dh_auto_clean:
 
 override_dh_compress:
 	dh_compress -X.js -X.scala
+	# dh_compress is executed after mh_installpoms and mh_linkjars
+	# ugly hack to fix #654549
+	find debian/scala \( -type f -or -type l \) -name "scala-library*.jar" -delete
 
 %:
 	dh $@ --with javahelper --with jh_maven_repo_helper

-- 
Scala packaging