Changeset: 521e2f04207f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=521e2f04207f
Added Files:
debian/libmonetdb5-server-cfitsio.install
Modified Files:
MonetDB.spec
buildtools/ChangeLog.Aug2018
debian/control
debian/rules
Branch: Aug2018
Log Message:
Enable building of cfitsio subpackage for Fedora/EPEL/Debian/Ubuntu.
diffs (80 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -87,8 +87,8 @@
%endif
%if %{fedpkgs}
-# By default, do not create the MonetDB-cfitsio package.
-%bcond_with fits
+# By default, create the MonetDB-cfitsio package.
+%bcond_without fits
%endif
%{!?__python2: %global __python2 %__python}
diff --git a/buildtools/ChangeLog.Aug2018 b/buildtools/ChangeLog.Aug2018
--- a/buildtools/ChangeLog.Aug2018
+++ b/buildtools/ChangeLog.Aug2018
@@ -1,3 +1,7 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Tue Aug 28 2018 Sjoerd Mullender <[email protected]>
+- Build the MonetDB-cfitsio RPM and libmonetdb5-server-cfitsio
+ Debian/Ubuntu package.
+
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Build-Depends: debhelper (>= 5), autotoo
libbam-dev, libbz2-dev, libcurl4-gnutls-dev, libgeos-dev (>= 3.4.0),
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
+ unixodbc-dev, uuid-dev, zlib1g-dev, liblas-c-dev (>= 1.8.0), r-base,
+ libcfitsio3-dev
Standards-Version: 3.8.0
X-Python-Version: >= 2.6
@@ -176,6 +177,20 @@ Description: MonetDB5 SQL GIS support mo
.
This package contains support for reading and writing LiDAR data.
+Package: libmonetdb5-server-cfitsio
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ monetdb5-sql (= ${source:Version})
+Description: MonetDB5 SQL GIS support module
+ MonetDB is a database management system that is developed from a
+ main-memory perspective with use of a fully decomposed storage model,
+ automatic index management, extensibility of data types and search
+ accelerators. It also has an SQL frontend.
+ .
+ This package contains a module for accessing data in the FITS file
+ format.
+
Package: libmonetdb5-server-bam
Section: libs
Architecture: any
diff --git a/debian/libmonetdb5-server-cfitsio.install
b/debian/libmonetdb5-server-cfitsio.install
new file mode 100644
--- /dev/null
+++ b/debian/libmonetdb5-server-cfitsio.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/lib/monetdb5/autoload/*_fits.mal usr/lib/monetdb5/autoload
+debian/tmp/usr/lib/monetdb5/createdb/*_fits.sql usr/lib/monetdb5/createdb
+debian/tmp/usr/lib/monetdb5/fits.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/lib_fits.so usr/lib/monetdb5
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ override_dh_auto_configure:
--enable-developer=no \
--enable-embedded=no \
--enable-embedded-r=no \
- --enable-fits=no \
+ --enable-fits=yes \
--enable-gdk=yes \
--enable-geom=yes \
--enable-lidar=yes \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
