Changeset: 4fee47043968 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4fee47043968 Modified Files: debian/control debian/fix-deb.sh Branch: Jun2016 Log Message:
Add required version and improve fix-deb.sh. diffs (50 lines): diff --git a/debian/control b/debian/control --- a/debian/control +++ b/debian/control @@ -8,10 +8,10 @@ Vcs-Hg: http://dev.monetdb.org/hg/MonetD # for Build-Depends and Depends syntax, see # http://www.debian.org/doc/debian-policy/ch-relationships.html Build-Depends: debhelper (>= 5), autotools-dev, bison, libatomic-ops-dev, - libbam-dev, libbz2-dev, libcurl4-gnutls-dev, libgeos-dev (>= 3.0.0), + libbam-dev, libbz2-dev, libcurl4-gnutls-dev, libgeos-dev (>= 3.4.0), libgsl0-dev, libpcre3-dev, libreadline-dev, libssl-dev, libxml2-dev, perl, pkg-config, python, python3, - unixodbc-dev, uuid-dev, zlib1g-dev, liblas-c-dev + unixodbc-dev, uuid-dev, zlib1g-dev, liblas-c-dev (>= 1.8.0) Standards-Version: 3.8.0 X-Python-Version: >= 2.6 X-Python3-Version: >= 3.0 diff --git a/debian/fix-deb.sh b/debian/fix-deb.sh --- a/debian/fix-deb.sh +++ b/debian/fix-deb.sh @@ -1,26 +1,19 @@ if [ -f /etc/lsb-release ]; then source /etc/lsb-release - CODENAME=${DISTRIB_CODENAME} + ID=${DISTRIB_ID,,} + VERSION_ID=$DISTRIB_RELEASE elif [ -f /etc/os-release ]; then source /etc/os-release - if [[ ${UBUNTU_CODENAME:+defined} == defined ]]; then - CODENAME=$UBUNTU_CODENAME - else - CODENAME="${VERSION#*(}" - CODENAME="${CODENAME%)}" - fi else echo "don't know what distro this is" exit 1 fi -case $CODENAME in -trusty | wheezy) +if [[ \( $ID == debian && $VERSION_ID -lt 8 \) || \( $ID == ubuntu && $VERSION_ID \< 15.10 \) ]]; then # fix control file because these systems don't have liblas and a # too old version of libgeos sed -i 's/, libgeos-dev[^,]*//;s/, liblas-c-dev[^,]*//' debian/control sed -i '/^Package:.*lidar/,/^$/d' debian/control sed -i '/^Package:.*geom/,/^$/d' debian/control rm debian/libmonetdb5-server-lidar.install debian/libmonetdb5-server-geom.install - ;; -esac +fi _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
