diff options
author | Michael Tokarev <mjt@tls.msk.ru> | 2014-09-20 08:51:10 +0400 |
---|---|---|
committer | Michael Tokarev <mjt@tls.msk.ru> | 2014-09-20 08:52:12 +0400 |
commit | 636482a5def10cd879e900b83a94cc853fb920cc (patch) | |
tree | c8b9820b09dbfb0db265647db4c666ca7fcba5b2 | |
parent | 20d0ba040d767361c1d0c8a825b2a5e8bfdb39a6 (diff) |
introduce 3.3.2 upstream release
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | debian/patches/remove-bashism-from-makefile.patch | 22 | ||||
-rw-r--r-- | debian/patches/series | 1 |
3 files changed, 7 insertions, 23 deletions
diff --git a/debian/changelog b/debian/changelog index 7caf758e..65ba1bad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mdadm (3.3.2-1) UNRELEASED; urgency=low + + * new minor/bugfix upstream release + * removed remove-bashism-from-makefile.patch (applied upstream) + + -- Michael Tokarev <mjt@tls.msk.ru> Sat, 20 Sep 2014 08:49:59 +0400 + mdadm (3.3-2) unstable; urgency=low * use 63-md-raid-arrays.rules instead of old 64-md-raid.rules diff --git a/debian/patches/remove-bashism-from-makefile.patch b/debian/patches/remove-bashism-from-makefile.patch deleted file mode 100644 index 06dff2f9..00000000 --- a/debian/patches/remove-bashism-from-makefile.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Michael Tokarev <mjt@tls.msk.ru> -Subject: Remove bashism from Makefile - -Makefile uses [ x == y ] construct which does not work -with POSIX shell. Since this is just testing a flag, -replace it with string comparison (=) operator instead. - -Signed-off-By: Michael Tokarev <mjt@tls.msk.ru> - -diff --git a/Makefile b/Makefile -index e8da3a5..c60cc2c 100644 ---- a/Makefile -+++ b/Makefile -@@ -156,7 +156,7 @@ all : check_rundir mdadm mdmon - man : mdadm.man md.man mdadm.conf.man mdmon.man raid6check.man - - check_rundir: -- @if [ ! -d "$(dir $(RUN_DIR))" -a "$(CHECK_RUN_DIR)" == 1 ]; then \ -+ @if [ ! -d "$(dir $(RUN_DIR))" -a "$(CHECK_RUN_DIR)" = 1 ]; then \ - echo "***** Parent of $(RUN_DIR) does not exist. Maybe set different RUN_DIR="; \ - echo "***** e.g. make RUN_DIR=/dev/.mdadm" ; \ - echo "***** or set CHECK_RUN_DIR=0"; exit 1; \ diff --git a/debian/patches/series b/debian/patches/series index fb9bff85..117751e7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ debian-conffile-location.diff debian-no-Werror.diff sha1-includes.diff -remove-bashism-from-makefile.patch use-external-blkid.diff |