Correctly pull version numbers from debian/changelog containing dashes.

[tinyos-2.x.git] / rules

diff --git a/rules b/rules
index 8551eb128b8ff275ca007641bfd65162055fcbf8..fa24813cde4932870ba6b2559b8d36c2c0715a3b 100755 (executable)
--- a/rules
+++ b/rules
@@ -34,7 +34,7 @@ dtmp := debian/tmp
 # For now, the solution is quite hackish: copy the source directory to the
 # build directory before running configure.
 tempdir := $(shell tempfile $(PACKAGE))
-version := $(shell head -1 debian/changelog | sed -e s'|^.*(\([^-)]*\).*$$|\1|')
+version := $(shell head -1 debian/changelog | sed -e s'|^.*(\(.*\)-.*).*$$|\1|')
 
 configure-stamp: patch-stamp
        $(checkdir)
@@ -110,6 +110,8 @@ binary-arch: checkroot build install
        $(install_file) debian/$(srcpkg).lintian-overrides \
                $(dtmp)/$(srcpkg)/usr/share/lintian/overrides/$(srcpkg)
        $(install_dir) $(dtmp)/$(srcpkg)/usr/share/doc/$(srcpkg)/
+       $(install_file) debian/changelog \
+               $(dtmp)/$(srcpkg)/usr/share/doc/$(srcpkg)/changelog.Debian
        $(install_file) debian/copyright \
                $(dtmp)/$(srcpkg)/usr/share/doc/$(srcpkg)/
        $(install_file) tools/README debian/README.Debian \