Branch: r14.0.x

c547f6a8 2016-02-09 18:47:32 Slávek Banko
Revert "Allow to build without liblockdev1-dev on Debian and Ubuntu"
We need proper patch to replace lockdev

This reverts commit 215671e3a30a5ba4708274a5a495ba8e3f55f5ed.
M debian/lenny/tdepim/debian/control
M debian/squeeze/tdepim/debian/control
M ubuntu/maverick/tdepim/debian/control
diff --git a/debian/lenny/tdepim/debian/control b/debian/lenny/tdepim/debian/control
index 2783653..491be13 100644
--- a/debian/lenny/tdepim/debian/control
+++ b/debian/lenny/tdepim/debian/control
@@ -7,7 +7,7 @@
 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 | base-files (>= 9),
+ libboost-dev (>= 1.33.1), libgpgme11-dev, liblockdev1-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 b/debian/squeeze/tdepim/debian/control
index 2783653..491be13 100644
--- a/debian/squeeze/tdepim/debian/control
+++ b/debian/squeeze/tdepim/debian/control
@@ -7,7 +7,7 @@
 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 | base-files (>= 9),
+ libboost-dev (>= 1.33.1), libgpgme11-dev, liblockdev1-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 b/ubuntu/maverick/tdepim/debian/control
index 70e97d6..5d6a915 100644
--- a/ubuntu/maverick/tdepim/debian/control
+++ b/ubuntu/maverick/tdepim/debian/control
@@ -7,7 +7,7 @@
 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 | base-files (>= 9),
+ libboost-dev (>= 1.33.1), libgpgme11-dev, liblockdev1-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,