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

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 55a5685149e2a7034e5497f7934464c6f2f08e73
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sun Sep 20 19:26:44 2009 +0200

    Bumped Standard-Version to 3.8.3, use official versions for ironpython and ironruby binary packages

diff --git a/debian/control b/debian/control
index 8c284cc..bf47afd 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends-Indep: mono-devel (>= 2.4.2.3),
                      libmono-system2.0-cil,
                      libmono-system-data2.0-cil,
                      libmono-system-runtime2.0-cil
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-cli-libs/packages/dlr-languages.git
 Vcs-Browser: http://git.debian.org/?p=pkg-cli-libs/packages/dlr-languages.git
 
@@ -32,7 +32,7 @@ Package: ironruby-dbg
 Priority: extra
 Section: debug
 Architecture: all
-Depends: ironruby (= ${source:Version})
+Depends: ironruby (= ${ironruby:Version})
 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 (= ${source:Version})
+Depends: ironpython (= ${ironpython:Version})
 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/copyright b/debian/copyright
index 74dc4d7..1826b39 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,7 @@ Upstream Authors:
   Curt Hagenlocher, John Lam, Haibo Luo, Tomas Matousek, John Messerly,
   Jirapong Nanta, Srivatsn Narayanan, Jimmy Schementi, Oleg Tkachenko,
   Dino Viehland, and everyone else from the community who reports bugs, 
-  builds libraries, and helps enrich IronRuby.
+  builds libraries, and helps enrich IronRuby and IronPython.
 
 Project Contact: Jimmy Schementi <jimmysch at microsoft.com>
 
diff --git a/debian/rules b/debian/rules
index e5ffefd..c64fd52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,19 @@
 #!/usr/bin/make -f
 export DH_VERBOSE=1
 
-DEB_VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
 MAKEFILE = $(firstword $(MAKEFILE_LIST))
 DEBIAN_DIR = $(dir $(MAKEFILE))
 
 SOURCE_DIR = $(DEBIAN_DIR)/..
 
-VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Vers | cut -d\  -f2)
-UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,' | sed 's,+dfsg.*,,')
-NEXT_UPVERSION = $(shell perl -e '$$_=pop; s/(\d+)$$/$$1+1/e; print' $(UPVERSION))
+DEB_VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
+DEB_REVISION = $(shell echo $(DEB_VERSION) | sed 's,.*-,,' )
+VERSION = $(shell echo $(DEB_VERSION) | sed 's,-.*,,' | sed 's,+dfsg.*,,')
+NEXT_UPVERSION = $(shell perl -e '$$_=pop; s/(\d+)$$/$$1+1/e; print' $(VERSION))
 DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2)
 
+IRONRUBY_VERSION = 0.9-$(DEB_REVISION)
+IRONPYTHON_VERSION = 2.6~beta2-$(DEB_REVISION)
 DEB_CLI_ABI_VERSION = 0.9
 DEB_CLI_API_VERSION = 20090805+git.e6b28d27
 
@@ -51,18 +53,27 @@ override_dh_clistrip:
 override_dh_makeclilibs:
 	dh_makeclilibs -p libdlr0.9-cil -m $(DEB_CLI_API_VERSION)
 
-get-orig-source: TARBALL_DIR = $(DEB_SOURCE_NAME)-$(UPVERSION)
+override_dh_gencontrol:
+	dh_gencontrol
+	dh_gencontrol -p ironruby \
+	              -p ironruby-dbg \
+	              -- -v$(IRONRUBY_VERSION) -Vironruby:Version=$(IRONRUBY_VERSION)
+	dh_gencontrol -p ironpython \
+	              -p ironpython-dbg \
+	              -- -v$(IRONPYTHON_VERSION) -Vironpython:Version=$(IRONPYTHON_VERSION)
+
+get-orig-source: TARBALL_DIR = $(DEB_SOURCE_NAME)-$(VERSION)
 get-orig-source:
 	uscan \
 		--package $(DEB_SOURCE_NAME) \
 		--watchfile $(DEBIAN_DIR)/watch \
-		--upstream-version $(UPVERSION) \
-		--download-version $(UPVERSION) \
+		--upstream-version $(VERSION) \
+		--download-version $(VERSION) \
 		--destdir . \
 		--force-download \
 		--rename \
 		--repack
-	mv $(UPVERSION) $(DEB_SOURCE_NAME)_$(UPVERSION).orig.tar.gz
+	mv $(VERSION) $(DEB_SOURCE_NAME)_$(VERSION).orig.tar.gz
 	if [ -d $(TARBALL_DIR) ]; then \
 		echo "$(TARBALL_DIR) is in the way, bailing out!"; \
 		exit 1; \
@@ -72,8 +83,8 @@ get-orig-source:
 		exit 1; \
 	fi
 	mkdir $(TARBALL_DIR)
-	tar -C $(TARBALL_DIR) --strip-components=1 -xzf $(DEB_SOURCE_NAME)_$(UPVERSION).orig.tar.gz
-	rm $(DEB_SOURCE_NAME)_$(UPVERSION).orig.tar.gz
+	tar -C $(TARBALL_DIR) --strip-components=1 -xzf $(DEB_SOURCE_NAME)_$(VERSION).orig.tar.gz
+	rm $(DEB_SOURCE_NAME)_$(VERSION).orig.tar.gz
 	# Remove gems
 	rm -rf $(TARBALL_DIR)/Merlin/External.LCA_RESTRICTED/Languages/Ruby
 	# remove binaries
@@ -85,7 +96,7 @@ get-orig-source:
 		-o -iname '*.resources' \) \
 		-delete
 	mv $(TARBALL_DIR) $(TARBALL_DIR)+dfsg
-	tar -czf $(DEB_SOURCE_NAME)_$(UPVERSION)+dfsg.orig.tar.gz $(TARBALL_DIR)+dfsg
+	tar -czf $(DEB_SOURCE_NAME)_$(VERSION)+dfsg.orig.tar.gz $(TARBALL_DIR)+dfsg
 	rm -r $(TARBALL_DIR)+dfsg
 
 %:

-- 
ironruby