From: R. Steve McKown <rsmckown@gmail.com>
Date: Fri, 7 May 2010 21:47:25 +0000 (-0600)
Subject: debian/rules must use tinyos.files script as-is from upstream.
X-Git-Tag: debian/2.1.1-4.3-1tmi~4
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=e4067b76e1e64139cf7a7f3e10ae6517d73e5a78

debian/rules must use tinyos.files script as-is from upstream.

Before the TMI enhancements were splitting tinyos.files into tinyos.files and
tinyos.filter, the latter containing the patterns to include and exclude.  Now
the TMI enhancements don't mess with these files, so we must use them as is.
This isn't very efficient, but it only happens at build time.
---

diff --git a/debian/rules b/debian/rules
index 206ad31b..5be67415 100755
--- a/debian/rules
+++ b/debian/rules
@@ -148,9 +148,13 @@ binary-arch: checkroot build install
 	rm -rf $(dtmp)/$(srcpkg)
 	$(install_dir) $(dtmp)/$(srcpkg)/DEBIAN
 	$(install_dir) $(dtmp)/$(srcpkg)/opt/tinyos
-	chmod u+x tools/release/extractor
-	tools/release/extractor $(dtmp)/$(srcpkg)/opt/tinyos/$(version) < \
-		tools/release/tinyos.filter >/dev/null
+	cd tools/release && bash tinyos.files tinyos $(version) \
+		$(dtmp)/$(srcpkg)/opt/tinyos/tinyos-$(version).tar.gz
+	tar -C $(dtmp)/$(srcpkg)/opt/tinyos \
+		-xzf $(dtmp)/$(srcpkg)/opt/tinyos/tinyos-$(version).tar.gz
+	rm -f $(dtmp)/$(srcpkg)/opt/tinyos/tinyos-$(version).tar.gz
+	mv $(dtmp)/$(srcpkg)/opt/tinyos/tinyos-$(version) \
+		$(dtmp)/$(srcpkg)/opt/tinyos/$(version)
 	$(install_dir) $(dtmp)/$(srcpkg)/usr/share/lintian/overrides
 	$(install_file) debian/$(srcmetapkg).lintian-overrides \
 		$(dtmp)/$(srcpkg)/usr/share/lintian/overrides/$(srcpkg)