diff options
author | Sergei Golubchik <serg@mariadb.org> | 2015-02-16 23:18:00 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-17 23:49:55 +0100 |
commit | 87eb82d4d52dd9ed1c954b0068898a4ec7a02df2 (patch) | |
tree | 8e04b93e23c38ba72e9cd80781cd311e76d68310 /debian | |
parent | a0e93bceb7bdbe52485ac8b822e70748c0b08830 (diff) | |
download | mariadb-git-87eb82d4d52dd9ed1c954b0068898a4ec7a02df2.tar.gz |
cleanup: remove old debian/ubuntu names from debian/* files
namely, remove the code to support:
etch, lenny, hardy, intrepid, jaunty, karmic, maverick, natty
Diffstat (limited to 'debian')
-rwxr-xr-x | debian/autobake-deb.sh | 10 | ||||
-rw-r--r-- | debian/dist/Debian/control | 2 | ||||
-rw-r--r-- | debian/dist/Ubuntu/control | 2 |
3 files changed, 4 insertions, 10 deletions
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 3ee877af482..5189b5d3856 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -33,16 +33,11 @@ LOGSTRING="MariaDB build" # is called different things on different versions. CODENAME="$(lsb_release -sc)" case "${CODENAME}" in - etch) LIBREADLINE_DEV=libreadline-dev ;; - lenny|hardy|intrepid|jaunty|karmic|lucid) LIBREADLINE_DEV='libreadline5-dev | libreadline-dev' ;; - squeeze|maverick|natty) LIBREADLINE_DEV=libreadline5-dev ;; + lucid) LIBREADLINE_DEV='libreadline5-dev | libreadline-dev' ;; + squeeze) LIBREADLINE_DEV=libreadline5-dev ;; *) LIBREADLINE_DEV=libreadline-gplv2-dev ;; esac -case "${CODENAME}" in - etch|lenny|hardy|intrepid|jaunty|karmic) CMAKE_DEP='' ;; - *) CMAKE_DEP='cmake (>= 2.7), ' ;; -esac # Clean up build file symlinks that are distro-specific. First remove all, then set # new links. @@ -61,7 +56,6 @@ DISTROFILES="$(ls ./debian/dist/${DISTRO})" for distrofile in ${DISTROFILES}; do rm -f "./debian/${distrofile}" sed -e "s/\\\${LIBREADLINE_DEV}/${LIBREADLINE_DEV}/g" \ - -e "s/\\\${CMAKE_DEP}/${CMAKE_DEP}/g" \ < "./debian/dist/${DISTRO}/${distrofile}" > "./debian/${distrofile}" chmod --reference="./debian/dist/${DISTRO}/${distrofile}" "./debian/${distrofile}" done; diff --git a/debian/dist/Debian/control b/debian/dist/Debian/control index f64bff827db..a35a8fc011c 100644 --- a/debian/dist/Debian/control +++ b/debian/dist/Debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net> XSBC-Original-Maintainer: Maria Developers <maria-developers@lists.launchpad.net> Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net> -Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0) +Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, cmake (>= 2.7), libaio-dev, libjemalloc-dev (>= 3.0.0) Standards-Version: 3.8.3 Homepage: http://mariadb.org/ Vcs-Browser: https://github.com/MariaDB/server/tree/10.1/ diff --git a/debian/dist/Ubuntu/control b/debian/dist/Ubuntu/control index 36b08d05f31..71f700b409f 100644 --- a/debian/dist/Ubuntu/control +++ b/debian/dist/Ubuntu/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: MariaDB Developers <maria-developers@lists.launchpad.net> XSBC-Original-Maintainer: Maria Developers <maria-developers@lists.launchpad.net> Uploaders: MariaDB Developers <maria-developers@lists.launchpad.net> -Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, ${CMAKE_DEP}libaio-dev, libjemalloc-dev (>= 3.0.0) +Build-Depends: libtool (>= 1.4.2-7), procps | hurd, debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), ${LIBREADLINE_DEV}, libssl-dev, libpam0g-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, ghostscript | gs-gpl, dpatch, gawk, bison, lsb-release, hardening-wrapper, cmake (>= 2.7), libaio-dev, libjemalloc-dev (>= 3.0.0) Standards-Version: 3.8.2 Homepage: http://mariadb.org/ Vcs-Browser: http://bazaar.launchpad.net/~maria-captains/maria/10.1/files |