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 206ad31b39ba5a62b0d3b220e4f54329ec7ebe16..5be674157000730d85d8bbe78b97e88b687f6566 100755 (executable)
--- 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)