[amp] 01/01: I changed debian/rules to fix permissions, and added a description to the patch for Makefile.

Muammar El Khatib muammar at moszumanska.debian.org
Tue Aug 1 15:08:36 UTC 2017


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

muammar pushed a commit to branch master
in repository amp.

commit b7f680018fe3d8f693c8d16f9fcf54d6b7d0577f
Author: Muammar El Khatib <muammarelkhatib at gmail.com>
Date:   Tue Aug 1 11:04:58 2017 -0400

    I changed debian/rules to fix permissions, and added a description to
    the patch for Makefile.
---
 debian/patches/01_Makefile.patch | 7 +++++--
 debian/rules                     | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/patches/01_Makefile.patch b/debian/patches/01_Makefile.patch
index 157d822..e0b277a 100644
--- a/debian/patches/01_Makefile.patch
+++ b/debian/patches/01_Makefile.patch
@@ -1,3 +1,6 @@
+Description: Modified Makefile to use f2py3.6
+Author: Muammar El Khatib <muammar at debian.org>
+Last-Update: 2017-08-01
 Index: amp/amp/Makefile
 ===================================================================
 --- amp.orig/amp/Makefile
@@ -8,6 +11,6 @@ Index: amp/amp/Makefile
  	+$(MAKE) -C descriptor
 -	f2py3 -c -m fmodules model.f90 descriptor/cutoffs.f90 descriptor/gaussian.f90 descriptor/zernike.f90 model/neuralnetwork.f90
 +	f2py3.6 -c -m fmodules model.f90 descriptor/cutoffs.f90 descriptor/gaussian.f90 descriptor/zernike.f90 model/neuralnetwork.f90
- 
+
  AMPDIR:=$(shell pwd)
- 
+
diff --git a/debian/rules b/debian/rules
index 1f2f003..3253fa3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,8 @@ override_dh_python3:
 	cd $(CURDIR)/amp/; \
 	make python3
 	dh_python3
-	dh_numpy
+	dh_numpy3
+	dh_fixperms
 
 override_dh_auto_test:
 	PYBUILD_SYSTEM=custom \
@@ -31,7 +32,7 @@ override_dh_auto_test:
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rf amp.egg-info/ python3/
+	rm -rf amp.egg-info/
 	find . -name "*.json" -delete
 	find . -name "*-train-log.txt" -delete
 	find . -name "*.pyc" -delete

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



More information about the debian-science-commits mailing list