Fixed FTBFS in Debian/Ubuntu due to missing liblockdev1-dev package. Device locking is now done through 'flock()'

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit a02d02a9479da792b2196de5e84811b012e95b05)

6 files changed, 6 insertions, 6 deletions

diff --git a/debian/lenny/tdepim/debian/control b/debian/lenny/tdepim/debian/control
index 491be1311..c68a5afc7 100644
--- a/debian/lenny/tdepim/debian/control
+++ b/debian/lenny/tdepim/debian/control
@@ -7,7 +7,7 @@ Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Josh Metzler <joshdeb@me
 Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt,
  cdparanoia, gawk, gettext, tdelibs14-trinity-dev, bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev, libogg-dev,
- libboost-dev (>= 1.33.1), libgpgme11-dev, liblockdev1-dev,
+ libboost-dev (>= 1.33.1), libgpgme11-dev,
  libpisock-dev, libreadline5-dev | libreadline6-dev, libsasl2-dev, libssl-dev,
  libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo, dpkg-dev (>= 1.14.4),
  libgpg-error-dev (>= 1.4-2), gpgsm, libical-dev,
diff --git a/debian/lenny/tdepim/debian/control.in b/debian/lenny/tdepim/debian/control.in
index f62841b08..6651f7252 100644
--- a/debian/lenny/tdepim/debian/control.in
+++ b/debian/lenny/tdepim/debian/control.in
@@ -8,7 +8,7 @@ Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, automake1.9,
  cdparanoia, gawk, gettext, tdelibs4-dev, bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev,
  libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
- libboost-dev (>= 1.33.1), libgnokii3-dev, libgpgme11-dev, liblockdev1-dev,
+ libboost-dev (>= 1.33.1), libgnokii3-dev, libgpgme11-dev,
  libpisock-dev, libreadline5-dev, libsasl2-dev, libssl-dev,
  libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo, dpkg-dev (>= 1.14.4),
  libgpg-error-dev (>= 1.4-2ubuntu7), gpgsm
diff --git a/debian/squeeze/tdepim/debian/control b/debian/squeeze/tdepim/debian/control
index 491be1311..c68a5afc7 100644
--- a/debian/squeeze/tdepim/debian/control
+++ b/debian/squeeze/tdepim/debian/control
@@ -7,7 +7,7 @@ Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Josh Metzler <joshdeb@me
 Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt,
  cdparanoia, gawk, gettext, tdelibs14-trinity-dev, bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev, libogg-dev,
- libboost-dev (>= 1.33.1), libgpgme11-dev, liblockdev1-dev,
+ libboost-dev (>= 1.33.1), libgpgme11-dev,
  libpisock-dev, libreadline5-dev | libreadline6-dev, libsasl2-dev, libssl-dev,
  libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo, dpkg-dev (>= 1.14.4),
  libgpg-error-dev (>= 1.4-2), gpgsm, libical-dev,
diff --git a/debian/squeeze/tdepim/debian/control.in b/debian/squeeze/tdepim/debian/control.in
index f62841b08..6651f7252 100644
--- a/debian/squeeze/tdepim/debian/control.in
+++ b/debian/squeeze/tdepim/debian/control.in
@@ -8,7 +8,7 @@ Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, automake1.9,
  cdparanoia, gawk, gettext, tdelibs4-dev, bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev,
  libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
- libboost-dev (>= 1.33.1), libgnokii3-dev, libgpgme11-dev, liblockdev1-dev,
+ libboost-dev (>= 1.33.1), libgnokii3-dev, libgpgme11-dev,
  libpisock-dev, libreadline5-dev, libsasl2-dev, libssl-dev,
  libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo, dpkg-dev (>= 1.14.4),
  libgpg-error-dev (>= 1.4-2ubuntu7), gpgsm
diff --git a/ubuntu/maverick/tdepim/debian/control b/ubuntu/maverick/tdepim/debian/control
index 5d6a91520..40c1658c7 100644
--- a/ubuntu/maverick/tdepim/debian/control
+++ b/ubuntu/maverick/tdepim/debian/control
@@ -7,7 +7,7 @@ Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Josh Metzler <joshdeb@me
 Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt,
  cdparanoia, gawk, gettext, tdelibs14-trinity-dev, bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev, libogg-dev,
- libboost-dev (>= 1.33.1), libgpgme11-dev, liblockdev1-dev,
+ libboost-dev (>= 1.33.1), libgpgme11-dev,
  libpisock-dev, libreadline5-dev | libreadline6-dev, libsasl2-dev, libssl-dev,
  libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo, dpkg-dev (>= 1.14.4),
  libgpg-error-dev (>= 1.4-2), gpgsm, libical-dev,
diff --git a/ubuntu/maverick/tdepim/debian/control.in b/ubuntu/maverick/tdepim/debian/control.in
index f62841b08..6651f7252 100644
--- a/ubuntu/maverick/tdepim/debian/control.in
+++ b/ubuntu/maverick/tdepim/debian/control.in
@@ -8,7 +8,7 @@ Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, automake1.9,
  cdparanoia, gawk, gettext, tdelibs4-dev, bison, byacc, bzip2,
  flex, groff-base, libopensync0-dev,
  libbluetooth2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
- libboost-dev (>= 1.33.1), libgnokii3-dev, libgpgme11-dev, liblockdev1-dev,
+ libboost-dev (>= 1.33.1), libgnokii3-dev, libgpgme11-dev,
  libpisock-dev, libreadline5-dev, libsasl2-dev, libssl-dev,
  libtool (>= 1.5), libxpm-dev, libxss-dev, sharutils, texinfo, dpkg-dev (>= 1.14.4),
  libgpg-error-dev (>= 1.4-2ubuntu7), gpgsm