Changeset: eff3888f2e28 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eff3888f2e28
Modified Files:
debian/control
debian/fix-deb.sh
Branch: default
Log Message:
Merge with Aug2018 branch.
diffs (23 lines):
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 5), autotoo
libpcre3-dev, libreadline-dev, liblzma-dev,
libssl-dev, libxml2-dev, pkg-config, python, python-dev, python-numpy,
unixodbc-dev, uuid-dev, zlib1g-dev, liblas-c-dev (>= 1.8.0), r-base,
- libcfitsio3-dev
+ libcfitsio-dev
Standards-Version: 3.8.0
X-Python-Version: >= 2.6
diff --git a/debian/fix-deb.sh b/debian/fix-deb.sh
--- a/debian/fix-deb.sh
+++ b/debian/fix-deb.sh
@@ -39,6 +39,7 @@ wheezy | trusty)
# fix control file because these systems don't have liblas and a
# too old version of libgeos
sed -i -e 's/, libgeos-dev[^,]*//;s/, liblas-c-dev[^,]*//' \
+ -e 's/libcfitsio-dev/libcfitsio3-dev/' \
-e '/^Package:.*lidar/,/^$/d' \
-e '/^Package:.*geom/,/^$/d' debian/control
rm debian/libmonetdb5-server-lidar.install
debian/libmonetdb5-server-geom.install
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
