diff --git a/.gitignore b/.gitignore index 0750780..ed98b3a 100644 --- a/.gitignore +++ b/.gitignore @@ -41,6 +41,3 @@ trex.json *~ .*.swp /build* -# output of debian build (debuild) -libtrexio-* -libtrexio_* diff --git a/Makefile.am b/Makefile.am index 5a52ab2..c05072d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -91,25 +91,6 @@ EXTRA_DIST += CMakeLists.txt \ cmake/FindTREXIO.cmake -# Include files needed to produce the debian package. -DEB_FILES = \ - debian/changelog \ - debian/compat \ - debian/control \ - debian/copyright \ - debian/patches \ - debian/README.Debian \ - debian/README.md \ - debian/rules \ - debian/source \ - debian/watch - -EXTRA_DIST += $(DEB_FILES) - -debian_from_dist: $(DEB_FILES) $(SOURCES) $(trexio_h) - cp ../trexio-$(PACKAGE_VERSION).tar.gz ../libtrexio_$(PACKAGE_VERSION).orig.tar.gz - debuild - # =============== TESTS =============== # TESTS_C = \ @@ -309,6 +290,24 @@ $(numpy_i): check-numpy: cd tools && ./check_numpy_i.sh +# Include files needed to produce the debian package. +DEB_FILES = \ + helpers-debian/changelog \ + helpers-debian/compat \ + helpers-debian/control \ + helpers-debian/copyright \ + helpers-debian/rules \ + helpers-debian/source \ + helpers-debian/libtrexio0.install \ + helpers-debian/libtrexio-dev.install \ + helpers-debian/source \ + helpers-debian/README.source + +debian_from_dist: $(DEB_FILES) $(SOURCES) $(trexio_h) + cp ../trexio-$(PACKAGE_VERSION).tar.gz ../libtrexio_$(PACKAGE_VERSION).orig.tar.gz + debuild + + CLEANFILES += $(pytrexio_c) \ $(pytrexio_py) \ $(trexio_py) \ diff --git a/configure.ac b/configure.ac index cd0a7b2..a1ef1c5 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ AM_PROG_AR LT_PREREQ([2.2]) LT_INIT -# Activate developer mode when if a dummy file is present (true when cloning the git repository). +# Activate developer mode if a dummy file is present (true when cloning the git repository). # Otherwise, it is the source distribution and the developer mode should not be activated. TEST_IFEXISTS=".devel" AS_IF([test -f $TEST_IFEXISTS], diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index ef0bcce..0000000 --- a/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -libtrexio (2.1.0-1) UNRELEASED; urgency=low - - * Initial release. - - -- Evgeny Posenitskiy Wed, 16 Feb 2022 15:07:02 +0100 diff --git a/debian/control b/debian/control deleted file mode 100644 index 1415deb..0000000 --- a/debian/control +++ /dev/null @@ -1,15 +0,0 @@ -Source: libtrexio -Section: science -Priority: optional -Maintainer: Evgeny Posenitskiy -Build-Depends: gfortran, pkg-config, libhdf5-dev, debhelper (>=11~), dh-autoreconf -Standards-Version: 4.1.4 -Homepage: https://trex-coe.github.io/trexio/ - -Package: libtrexio -Architecture: any -Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: I/O library for quantum chemistry. - This Debian binary package was auto-generated by the - debmake(1) command provided by the debmake package. diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 0544799..0000000 --- a/debian/rules +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/make -f -# You must remove unused comment lines for the released package. -#export DH_VERBOSE = 1 -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - -%: - dh $@ --with autoreconf diff --git a/debian/README.Debian b/helpers-debian/README.Debian similarity index 100% rename from debian/README.Debian rename to helpers-debian/README.Debian diff --git a/debian/README.md b/helpers-debian/README.md similarity index 100% rename from debian/README.md rename to helpers-debian/README.md diff --git a/helpers-debian/README.source b/helpers-debian/README.source new file mode 100644 index 0000000..6af23bb --- /dev/null +++ b/helpers-debian/README.source @@ -0,0 +1,15 @@ +libtrexio for Debian +------------------- + +TREXIO distribution tarballs contain the source code required to build the C +library and the Fortran module based on the ISO_C_BINDING. + +The build system is Autotools and follows the common installation path, i.e. +./autogeh.sh && ./configure && make && make install + +For details about the development version (i.e. compiling from the GitHub +repository clone) contact the upstream maintainers. + + + -- Evgeny Tue, 27 Sep 2022 10:34:39 +0200 + diff --git a/helpers-debian/changelog b/helpers-debian/changelog new file mode 100644 index 0000000..96d2f25 --- /dev/null +++ b/helpers-debian/changelog @@ -0,0 +1,5 @@ +libtrexio (2.2.1-1) UNRELEASED; urgency=medium + + * Initial release (Closes: #1020772) + + -- Evgeny Tue, 27 Sep 2022 10:34:39 +0200 diff --git a/debian/compat b/helpers-debian/compat similarity index 100% rename from debian/compat rename to helpers-debian/compat diff --git a/helpers-debian/control b/helpers-debian/control new file mode 100644 index 0000000..e385b05 --- /dev/null +++ b/helpers-debian/control @@ -0,0 +1,30 @@ +Source: libtrexio +Section: science +Priority: optional +Maintainer: Evgeny +Build-Depends: debhelper-compat (= 12), + gfortran, + pkg-config, + libhdf5-dev +Standards-Version: 4.4.1 +Homepage: https://github.com/TREX-CoE/trexio +#Vcs-Browser: https://salsa.debian.org/debian/libtrexio +#Vcs-Git: https://salsa.debian.org/debian/libtrexio.git + +Package: libtrexio-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: libtrexio0 (= ${binary:Version}), ${misc:Depends} +Description: TREX I/O library for efficient data I/O in quantum chemistry. + . + This package contains the static C library, C headers + and the Fortran modules necessary for developers. + +Package: libtrexio0 +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: TREX I/O library for efficient data I/O in quantum chemistry. + . + This package contains the shared C library. diff --git a/debian/copyright b/helpers-debian/copyright similarity index 92% rename from debian/copyright rename to helpers-debian/copyright index 8b5c36a..fbbccef 100644 --- a/debian/copyright +++ b/helpers-debian/copyright @@ -1,11 +1,30 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: libtrexio -Source: -# -# Please double check copyright with the licensecheck(1) command. +Upstream-Contact: Evgeny +Source: + +Files: debian/* +Copyright: 2022 Evgeny +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". Files: .git_hash AUTHORS + ChangeLog Makefile.am CMakeLists.txt NEWS @@ -35,6 +54,8 @@ Files: .git_hash tests/io_dset_int_text.c tests/io_dset_sparse_hdf5.c tests/io_dset_sparse_text.c + tests/io_determinant_hdf5.c + tests/io_determinant_text.c tests/io_dset_str_hdf5.c tests/io_dset_str_text.c tests/io_num_hdf5.c @@ -47,6 +68,9 @@ Files: .git_hash tests/open_text.c tests/overwrite_all_hdf5.c tests/overwrite_all_text.c + tests/delete_group_hdf5.c + tests/delete_group_text.c + tests/pre_close.c tests/test_f.f90 tests/trexio_f.f90 Copyright: 2020 TREX Center of Excellence @@ -75,9 +99,6 @@ License: BSD-3-Clause CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - . - On Debian systems, the complete text of the BSD 3-clause "New" or "Revised" - License can be found in `/usr/share/common-licenses/BSD'. Files: Makefile.in aclocal.m4 @@ -277,9 +298,6 @@ License: GPL-3.0+ with autoconf exception the same distribution terms that you use for the rest of that program. This Exception is an additional permission under section 7 of the GNU General Public License, version 3 ("GPLv3"). - . - On Debian systems, the complete text of the GNU General Public License - Version 3 can be found in `/usr/share/common-licenses/GPL-3'. Files: m4/ax_pkg_swig.m4 Copyright: 2008 Alan W. Irwin @@ -331,14 +349,11 @@ License: GPL-2.0+ with unknown exception *** check multiple exceptions *** #---------------------------------------------------------------------------- # Files marked as NO_LICENSE_TEXT_FOUND may be covered by the following -# license/copyright files. - #---------------------------------------------------------------------------- # License file: COPYING - BSD 3-Clause License . - Copyright (c) 2021, TREX Center of Excellence - All rights reserved. + Copyright 2020 TREX Center of Excellence + License BSD-3-Clause . Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -364,3 +379,4 @@ License: GPL-2.0+ with unknown exception *** check multiple exceptions *** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/helpers-debian/libtrexio-dev.install b/helpers-debian/libtrexio-dev.install new file mode 100644 index 0000000..b973af4 --- /dev/null +++ b/helpers-debian/libtrexio-dev.install @@ -0,0 +1,4 @@ +usr/include/* +usr/lib/*/lib*.so +usr/lib/*/lib*.a +usr/lib/*/pkgconfig/* diff --git a/helpers-debian/libtrexio0.install b/helpers-debian/libtrexio0.install new file mode 100644 index 0000000..3ddde58 --- /dev/null +++ b/helpers-debian/libtrexio0.install @@ -0,0 +1 @@ +usr/lib/*/lib*.so.* diff --git a/debian/patches/series b/helpers-debian/patches/series similarity index 100% rename from debian/patches/series rename to helpers-debian/patches/series diff --git a/helpers-debian/rules b/helpers-debian/rules new file mode 100755 index 0000000..1a7509a --- /dev/null +++ b/helpers-debian/rules @@ -0,0 +1,21 @@ +#!/usr/bin/make -f + + +# output every command that modifies files on the build system. +#export DH_VERBOSE = 1 + + +# see FEATURE AREAS in dpkg-buildflags(1) +#export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +# see ENVIRONMENT in dpkg-buildflags(1) +# package maintainers to append CFLAGS +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +# package maintainers to append LDFLAGS +#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + + +%: + dh $@ + + diff --git a/debian/source/format b/helpers-debian/source/format similarity index 100% rename from debian/source/format rename to helpers-debian/source/format diff --git a/debian/source/local-options b/helpers-debian/source/local-options similarity index 100% rename from debian/source/local-options rename to helpers-debian/source/local-options diff --git a/debian/watch b/helpers-debian/watch similarity index 100% rename from debian/watch rename to helpers-debian/watch