Update Debian files (#100)

* Change debian files to avoid conflicts when packaging

.gitignore

@@ -41,6 +41,3 @@ trex.json
 *~
 .*.swp
 /build*
-# output of debian build (debuild)
-libtrexio-*
-libtrexio_*

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) \

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],

debian/changelog

@@ -1,5 +0,0 @@
-libtrexio (2.1.0-1) UNRELEASED; urgency=low
-
-  * Initial release.
-
- -- Evgeny Posenitskiy <posenitskiy@irsamc.ups-tlse.fr>  Wed, 16 Feb 2022 15:07:02 +0100

debian/control

@@ -1,15 +0,0 @@
-Source: libtrexio
-Section: science
-Priority: optional
-Maintainer: Evgeny Posenitskiy <posenitskiy@irsamc.ups-tlse.fr>
-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.

debian/rules

@@ -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

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 <posenitskiy@irsamc.ups-tlse.fr>  Tue, 27 Sep 2022 10:34:39 +0200
+

helpers-debian/changelog

@@ -0,0 +1,5 @@
+libtrexio (2.2.1-1) UNRELEASED; urgency=medium
+
+  * Initial release (Closes: #1020772)  
+
+ -- Evgeny <posenitskiy@irsamc.ups-tlse.fr>  Tue, 27 Sep 2022 10:34:39 +0200

helpers-debian/control

@@ -0,0 +1,30 @@
+Source: libtrexio
+Section: science
+Priority: optional
+Maintainer: Evgeny <posenitskiy@irsamc.ups-tlse.fr>
+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.

helpers-debian/copyright

@@ -1,11 +1,30 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: libtrexio
-Source: <url://github.com/TREX-CoE/trexio>
+Upstream-Contact: Evgeny <posenitskiy@irsamc.ups-tlse.fr>
-#
+Source: <https://github.com/TREX-CoE/trexio>
-# Please double check copyright with the licensecheck(1) command.
+
+Files: debian/*
+Copyright: 2022 Evgeny <posenitskiy@irsamc.ups-tlse.fr>
+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 <https://www.gnu.org/licenses/>
+ .
+ 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
+ Copyright 2020 TREX Center of Excellence
- All rights reserved.
+ 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.
+

helpers-debian/libtrexio-dev.install

@@ -0,0 +1,4 @@
+usr/include/*
+usr/lib/*/lib*.so
+usr/lib/*/lib*.a
+usr/lib/*/pkgconfig/*

helpers-debian/libtrexio0.install

@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*

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 $@
+
+