[cod-tools] 118/142: branches/single-source-build/ Relying on source's way of installing CIF parsers and cod-tools scripts and Perl modules. Manually excluding SPGLib and cif_find_symmetry as they should be in a separate package. Adding manpages. Updating to source revision 5298.

[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 820c8d79bb5e56dc446073d3c5bec322a329e35d
Author: Andrius Merkys <andrius.merkys at gmail.com>
Date:   Mon May 22 09:05:05 2017 +0000

    branches/single-source-build/
    Relying on source's way of installing CIF parsers and cod-tools scripts
    and Perl modules. Manually excluding SPGLib and cif_find_symmetry as they
    should be in a separate package.
    Adding manpages.
    Updating to source revision 5298.
    
    
    git-svn-id: svn+ssh://saulius-grazulis.lt/home/andrius/svn-repositories/cod-deb-packaging/branches/single-source-build@118 26752c47-bcd6-4c9c-b022-347364b77eb5
---
 debian/cod-tools.manpages |  1 +
 debian/rules              | 20 +++++++++-----------
 fetch-source              |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/debian/cod-tools.manpages b/debian/cod-tools.manpages
new file mode 100644
index 0000000..a70e6f3
--- /dev/null
+++ b/debian/cod-tools.manpages
@@ -0,0 +1 @@
+doc/man/*.1
diff --git a/debian/rules b/debian/rules
index 5030b09..3fe77ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,16 +28,10 @@ override_dh_auto_install:
 	${MAKE} install PREFIX=../../../debian/codcif/usr \
 		--directory src/components/codcif
 
-	mkdir -p debian/libcod-cif-parser-bison-perl/${vendorlib}/COD/CIF/Parser
-	mkdir -p debian/libcod-cif-parser-bison-perl/${vendorarch}/auto/COD/CIF/Parser/Bison
-	install --mode 640 src/lib/perl5/COD/CIF/Parser/Bison/lib/COD/CIF/Parser/Bison.pm \
-	    debian/libcod-cif-parser-bison-perl/${vendorlib}/COD/CIF/Parser/
-	install --mode 640 src/lib/perl5/COD/CIF/Parser/Bison/lib/auto/COD/CIF/Parser/Bison/Bison.so \
-	    debian/libcod-cif-parser-bison-perl/${vendorarch}/auto/COD/CIF/Parser/Bison/
-
-	mkdir -p debian/libcod-cif-parser-yapp-perl/${vendorlib}/COD/CIF/Parser
-	install --mode 640 src/lib/perl5/COD/CIF/Parser/Yapp/lib/COD/CIF/Parser/Yapp.pm \
-	    debian/libcod-cif-parser-yapp-perl/${vendorlib}/COD/CIF/Parser/
+	${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/
@@ -48,4 +42,8 @@ override_dh_auto_install:
 	${MAKE} -f Makelocal-SWIG-module install PREFIX=../../../debian/pycodcif/usr \
 		--directory src/components/pycodcif
 
-	${MAKE} install-codtools PREFIX=debian/cod-tools/usr
+	# Installing all cod-tools 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 {} \;
diff --git a/fetch-source b/fetch-source
index a533f97..c0cd7ae 100755
--- a/fetch-source
+++ b/fetch-source
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-svn export -r5291 svn://www.crystallography.net/cod-tools/trunk source
+svn export -r5298 svn://www.crystallography.net/cod-tools/trunk source

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