[cod-tools] 01/01: Switching from overridden default install rule in debian/rules to debian/*.install based partition into packages.

[Andrius Merkys]

This is an automated email from the git hooks/post-receive script.

merkys-guest pushed a commit to branch master
in repository cod-tools.

commit 0b1575ade3f82b88d0f24477704ef2f92550c8c9
Author: Andrius Merkys <andrius.merkys at gmail.com>
Date:   Wed Sep 27 15:21:19 2017 +0300

    Switching from overridden default install rule in debian/rules to debian/*.install based partition into packages.
---
 debian/cod-tools.install                    | 23 ++++++++++++++++++++
 debian/codcif.install                       |  6 ++++++
 debian/libcexceptions0.install              |  6 ++++++
 debian/libcod-cif-parser-bison-perl.install |  2 ++
 debian/libcod-cif-parser-yapp-perl.install  |  1 +
 debian/libcod-precision-perl.install        |  1 +
 debian/libcod-usermessage-perl.install      |  1 +
 debian/libgetoptions0.install               |  2 ++
 debian/patches/prefix-to-destdir.diff       |  8 +++++++
 debian/patches/series                       |  1 +
 debian/python-pycodcif.install              |  1 +
 debian/rules                                | 33 -----------------------------
 12 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/debian/cod-tools.install b/debian/cod-tools.install
new file mode 100644
index 0000000..6ebe0ae
--- /dev/null
+++ b/debian/cod-tools.install
@@ -0,0 +1,23 @@
+usr/bin
+usr/share/perl5/STAR
+usr/share/perl5/COD/Algebra*
+usr/share/perl5/COD/Atom*
+usr/share/perl5/COD/AuthorNames.pm
+usr/share/perl5/COD/Cell*
+usr/share/perl5/COD/CIF/*.pm
+usr/share/perl5/COD/CIF/Data
+usr/share/perl5/COD/CIF/Tags
+usr/share/perl5/COD/CromerMann.pm
+usr/share/perl5/COD/ErrorHandler.pm
+usr/share/perl5/COD/Escape.pm
+usr/share/perl5/COD/Formulae
+usr/share/perl5/COD/Fractional.pm
+usr/share/perl5/COD/MorganFingerprints.pm
+usr/share/perl5/COD/Overlays
+usr/share/perl5/COD/RDF.pm
+usr/share/perl5/COD/Serialise.pm
+usr/share/perl5/COD/ShowStruct.pm
+usr/share/perl5/COD/SOptions.pm
+usr/share/perl5/COD/Spacegroups
+usr/share/perl5/COD/SUsage.pm
+usr/share/perl5/COD/ToolsVersion.pm
diff --git a/debian/codcif.install b/debian/codcif.install
new file mode 100644
index 0000000..1aa3233
--- /dev/null
+++ b/debian/codcif.install
@@ -0,0 +1,6 @@
+usr/lib/libcodcif.a
+usr/include/cif*.h
+usr/include/common.h
+usr/include/datablock.h
+usr/include/version.h
+usr/include/yy.h
diff --git a/debian/libcexceptions0.install b/debian/libcexceptions0.install
new file mode 100644
index 0000000..597b5f1
--- /dev/null
+++ b/debian/libcexceptions0.install
@@ -0,0 +1,6 @@
+usr/lib/libcexceptions.a
+usr/include/allocx.h
+usr/include/cexceptions.h
+usr/include/cxprintf.h
+usr/include/stdiox.h
+usr/include/stringx.h
diff --git a/debian/libcod-cif-parser-bison-perl.install b/debian/libcod-cif-parser-bison-perl.install
new file mode 100644
index 0000000..73a35c0
--- /dev/null
+++ b/debian/libcod-cif-parser-bison-perl.install
@@ -0,0 +1,2 @@
+usr/lib/*/perl5/*/auto/COD/CIF/Parser/Bison/Bison.so
+usr/lib/*/perl5/*/COD/CIF/Parser/Bison.pm
diff --git a/debian/libcod-cif-parser-yapp-perl.install b/debian/libcod-cif-parser-yapp-perl.install
new file mode 100644
index 0000000..5097ffc
--- /dev/null
+++ b/debian/libcod-cif-parser-yapp-perl.install
@@ -0,0 +1 @@
+usr/share/perl5/COD/CIF/Parser/Yapp.pm
diff --git a/debian/libcod-precision-perl.install b/debian/libcod-precision-perl.install
new file mode 100644
index 0000000..f8c1eda
--- /dev/null
+++ b/debian/libcod-precision-perl.install
@@ -0,0 +1 @@
+usr/share/perl5/COD/Precision.pm
diff --git a/debian/libcod-usermessage-perl.install b/debian/libcod-usermessage-perl.install
new file mode 100644
index 0000000..4b814b3
--- /dev/null
+++ b/debian/libcod-usermessage-perl.install
@@ -0,0 +1 @@
+usr/share/perl5/COD/UserMessage.pm
diff --git a/debian/libgetoptions0.install b/debian/libgetoptions0.install
new file mode 100644
index 0000000..17c54fc
--- /dev/null
+++ b/debian/libgetoptions0.install
@@ -0,0 +1,2 @@
+usr/lib/libgetoptions.a
+usr/include/getoptions.h
diff --git a/debian/patches/prefix-to-destdir.diff b/debian/patches/prefix-to-destdir.diff
new file mode 100644
index 0000000..44adad6
--- /dev/null
+++ b/debian/patches/prefix-to-destdir.diff
@@ -0,0 +1,8 @@
+--- a/Makeconf
++++ b/Makeconf
+@@ -53,3 +53,5 @@
+ LIBCOD_PERL = libcod-cif-parser-bison-perl
+ LIBCODCIF   = libcodcif
+ PYCODCIF    = pycodcif
++
++PREFIX = ${DESTDIR}/usr
diff --git a/debian/patches/series b/debian/patches/series
index fc84163..290014c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+prefix-to-destdir.diff
 disable-test-network-access.diff
 create-empty-dirs.diff
diff --git a/debian/python-pycodcif.install b/debian/python-pycodcif.install
new file mode 100644
index 0000000..96a2dca
--- /dev/null
+++ b/debian/python-pycodcif.install
@@ -0,0 +1 @@
+usr/lib/python2.7
diff --git a/debian/rules b/debian/rules
index 9fc06c9..b1f9747 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,39 +7,6 @@
 %:
 	dh $@ --with python2
 
-override_dh_auto_install:
-	${MAKE} install PREFIX=../../../debian/libcexceptions0/usr \
-		PACKAGE=cexceptions EXTRA_LIB_DIRS=lib \
-		--directory src/externals/cexceptions
-	${MAKE} install PREFIX=../../../debian/libgetoptions0/usr \
-		PACKAGE=getoptions EXTRA_LIB_DIRS=lib \
-		--directory src/externals/getoptions
-	${MAKE} install PREFIX=../../../debian/codcif/usr \
-		--directory src/components/codcif
-
-	${MAKE} install-libcod-cif-parser-bison-perl \
-		PREFIX=debian/libcod-cif-parser-bison-perl/usr
-	${MAKE} install-libcod-cif-parser-yapp-perl \
-		PREFIX=debian/libcod-cif-parser-yapp-perl/usr
-
-	mkdir -p debian/libcod-precision-perl/usr/share/perl5/COD/
-	install src/lib/perl5/COD/Precision.pm \
-		debian/libcod-precision-perl/usr/share/perl5/COD/
-
-	mkdir -p debian/libcod-usermessage-perl/usr/share/perl5/COD/
-	install src/lib/perl5/COD/UserMessage.pm \
-		debian/libcod-usermessage-perl/usr/share/perl5/COD/
-
-	${MAKE} -f Makelocal-SWIG-module install \
-		PREFIX=../../../debian/python-pycodcif/usr \
-		--directory src/components/pycodcif
-
-	# Installing all cod-tools scipts and modules by default except
-	# SPGLib.pm and cif_find_symmetry:
-	${MAKE} install-cod-tools PREFIX=debian/cod-tools/usr
-	find debian/cod-tools/usr -name SPGLib.pm -exec rm {} \;
-	find debian/cod-tools/usr -name cif_find_symmetry -exec rm {} \;
-
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGELOG
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cod-tools.git