Update autobake.sh to match control file location. Drop lucid and squeeze support.

2 files changed, 6 insertions, 31 deletions

diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh
index d5cbb4ed51e..a716b1ad33d 100755
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -28,47 +28,22 @@ PATCHLEVEL="+maria"
 LOGSTRING="MariaDB build"
 
 # Look up distro-version specific stuff.
-#
-# Libreadline changed to GPLv3. Old GPLv2 version is available, but it
-# is called different things on different versions.
+
 CODENAME="$(lsb_release -sc)"
-case "${CODENAME}" in
-  lucid)  LIBREADLINE_DEV='libreadline5-dev | libreadline-dev' ;;
-  squeeze)  LIBREADLINE_DEV=libreadline5-dev ;;
-  *)  LIBREADLINE_DEV=libreadline-gplv2-dev ;;
-esac
 
 # add libcrack2 (>= 2.9.0) as a build dependency
 # but only where the distribution can possibly satisfy it
 if apt-cache madison cracklib2|grep 'cracklib2 *| *2\.[0-8]\.' >/dev/null 2>&1
 then
-  MAYBE_LIBCRACK=''
+  # Anything in MARIADB_OPTIONAL_DEBS is omitted from the resulting
+  # packages by snipped in rules file
   MARIADB_OPTIONAL_DEBS="${MARIADB_OPTIONAL_DEBS} cracklib-password-check-10.1"
+  sed -i -e "/\\\${MAYBE_LIBCRACK}/d" debian/control
 else
   MAYBE_LIBCRACK='libcrack2-dev (>= 2.9.0),'
+  sed -i -e "s/\\\${MAYBE_LIBCRACK}/${MAYBE_LIBCRACK}/g" debian/control
 fi
 
-# Clean up build file symlinks that are distro-specific. First remove all, then set
-# new links.
-DISTRODIRS="$(ls ./debian/dist)"
-for distrodir in ${DISTRODIRS}; do
-  DISTROFILES="$(ls ./debian/dist/${distrodir})"
-  for distrofile in ${DISTROFILES}; do
-    rm -f "./debian/${distrofile}";
-  done;
-done;
-
-# Set no symlinks for build files in the debian dir, so we avoid adding AppArmor on Debian.
-DISTRO="$(lsb_release -si)"
-echo "Copying distribution specific build files for ${DISTRO}"
-DISTROFILES="$(ls ./debian/dist/${DISTRO})"
-for distrofile in ${DISTROFILES}; do
-  rm -f "./debian/${distrofile}"
-  sed -e "s/\\\${LIBREADLINE_DEV}/${LIBREADLINE_DEV}/g" \
-      -e "s/\\\${MAYBE_LIBCRACK}/${MAYBE_LIBCRACK}/g"             \
-    < "./debian/dist/${DISTRO}/${distrofile}" > "./debian/${distrofile}"
-  chmod --reference="./debian/dist/${DISTRO}/${distrofile}" "./debian/${distrofile}"
-done;
 
 # Adjust changelog, add new version.
 #
diff --git a/debian/control b/debian/control
index d84f31a1864..16eecd712fa 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends: bison,
                procps | hurd,
                psmisc,
                zlib1g-dev (>= 1:1.1.3-5),
-               ${LIBREADLINE_DEV},
+               libreadline-gplv2-dev,
                ${MAYBE_LIBCRACK}
                libjemalloc-dev (>= 3.0.0)
 Standards-Version: 3.8.2