Merge branch 'master' of gitorious.org:xen-tools/xen-tools

Conflicts: debian/changelog
2026-05-01 14:16:09 +00:00 · 2013-03-14 00:01:05 +01:00
parent 76d9d59510 01e525106b
commit f0691c9a38
3 changed files with 9 additions and 40 deletions
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,7 @@ xen-tools (4.4~dev-1) UNRELEASED; urgency=low
    - Fix export of environment variables. Previously they could contain
      dashes and then were only accessible from within Perl, but not from
      within Bash.
+    - Uses Test::NoTabs; add according build-dependency.
  * Add debian/gbp.conf to be able to to build xen-tools with
    git-buildpackage.
  * Clean up debian/rules:
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 7.0.0),
               libfile-slurp-perl,
               libfile-which-perl,
               libmoose-perl,
+               libtest-notabs-perl,
               libtest-pod-coverage-perl,
               libtest-pod-perl,
               libtext-template-perl