[Pkg-cli-libs-commits] [SCM] ironruby branch, master, updated. debian/0.9.0+dfsg-1-61-g1304f40

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 1304f403536b0501091fc11af448612d82d821b7
Author: Matthias Klose <doko at debian.org>
Date:   Sun Sep 20 22:33:50 2009 +0200

    Some more packaging cleanup.

diff --git a/debian/changelog b/debian/changelog
index 0943392..8224cd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,5 +10,9 @@ dlr-languages (20090805+git.e6b28d27+dfsg-1) UNRELEASED; urgency=low
     + Moved Matthias Klose to Uploaders as it's team maintained now.
     + Removed Andrew Mitchell from Uploaders. (Closes: #503491)
   * Added Dynamic Language Runtime packaging.
+  * Use the ironpython and ironruby version numbers for the binary packages.
 
- -- C.J. Adams-Collier <cjac at colliertech.org>  Mon, 27 Jul 2009 15:25:10 -0700
+  [ Matthias Klose ]
+  * Some more packaging cleanup.
+
+ -- C.J. Adams-Collier <cjac at colliertech.org>  Sun, 20 Sep 2009 19:57:17 +0200
diff --git a/debian/control b/debian/control
index bf47afd..4f658c0 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Package: ironruby-dbg
 Priority: extra
 Section: debug
 Architecture: all
-Depends: ironruby (= ${ironruby:Version})
+Depends: ironruby (= ${ironruby:Version}), ${misc:Depends}
 Homepage: http://www.ironruby.net/
 Description: Ruby implementation targeting the .NET and Mono platforms - debugging symbols
  This package contains the debugging symbols of the ironruby package.
@@ -61,7 +61,7 @@ Package: ironpython-dbg
 Priority: extra
 Section: debug 
 Architecture: all
-Depends: ironpython (= ${ironpython:Version})
+Depends: ironpython (= ${ironpython:Version}), ${misc:Depends}
 Homepage: http://www.codeplex.com/IronPython
 Description: Python implementation targeting the .NET and Mono platforms - debugging symbols
  This package contains the debugging symbols of the ironpython package.
diff --git a/debian/rules b/debian/rules
index e8c86f3..9512b60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,6 +44,9 @@ override_dh_clean: unpatch
 		-o -iname '*.pdb' \
 		-o -iname '*.mdb' \
 		-o -iname '*.resources' \) -delete
+	rm -f Merlin/Main/Languages/IronPython/IronPython.sln.proj
+	rm -f Merlin/Main/Languages/IronPython/Scripts/ipy*
+	rm -f Merlin/Main/Languages/Ruby/Ruby.sln.proj
 	dh_clean
 
 override_dh_clistrip:
diff --git a/debian/watch b/debian/watch
index 3427751..354491b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
+opts=dversionmangle=s/\+dfsg// \
 http://github.com/mletterle/ironruby/downloads .*/mletterle/ironruby/tarball/(\d{8}\+git\.[\da-f]{8})

-- 
ironruby