diff -u vzctl-3.0.22/debian/changelog vzctl-3.0.22/debian/changelog --- vzctl-3.0.22/debian/changelog +++ vzctl-3.0.22/debian/changelog @@ -1,3 +1,26 @@ +vzctl (3.0.22-13ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes (LP: #293338): + - etc/bash_completion.d/vzctl.sh.in: + Use "/bin/ls" instead of "ls", so an existing alias for "ls" + does not get used. + - src/lib/ub.c: Fix typo: s/successefully/successfully/ + - src/lib/config.c, src/lib/util.c: Explicitly include limits.h + + -- Nathan Handler Mon, 03 Nov 2008 17:02:04 -0600 + +vzctl (3.0.22-13) unstable; urgency=medium + + * Corrected bashism in vznetcfg. Closes: #499250. + + -- Ola Lundqvist Sat, 25 Oct 2008 16:20:55 +0200 + +vzctl (3.0.22-12) unstable; urgency=low + + * Correction of bashisms in some helper scripts, closes: #501374. + + -- Ola Lundqvist Sat, 18 Oct 2008 15:27:43 +0200 + vzctl (3.0.22-11ubuntu1) intrepid; urgency=low * Merge from debian unstable, remaining changes (LP: #261362): diff -u vzctl-3.0.22/bin/vznetcfg.in vzctl-3.0.22/bin/vznetcfg.in --- vzctl-3.0.22/bin/vznetcfg.in +++ vzctl-3.0.22/bin/vznetcfg.in @@ -17,7 +17,7 @@ # VZNETCFG='@PKGCONFDIR@/vznet.conf' -[ -f "$VZNETCFG" ] && source "$VZNETCFG" +[ -f "$VZNETCFG" ] && . "$VZNETCFG" usage() { only in patch2: unchanged: --- vzctl-3.0.22.orig/etc/dists/scripts/etcnet-add_ip.sh +++ vzctl-3.0.22/etc/dists/scripts/etcnet-add_ip.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright (C) 2006-2007 Dmitry V. Levin # # This program is free software; you can redistribute it and/or modify