[magics] 41/63: Add python*install files

Alastair McKinstry mckinstry at moszumanska.debian.org
Fri Mar 24 10:41:53 UTC 2017


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

mckinstry pushed a commit to branch debian/master
in repository magics.

commit 073f5663a7063303f648cc13078b8dd0adc7b3e9
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Nov 1 04:08:06 2016 +0000

    Add python*install files
---
 debian/python-magics++.install  | 1 +
 debian/python3-magics++.install | 1 +
 debian/rules                    | 6 +-----
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/python-magics++.install b/debian/python-magics++.install
new file mode 100644
index 0000000..dbdb301
--- /dev/null
+++ b/debian/python-magics++.install
@@ -0,0 +1 @@
+/usr/lib/python2*
diff --git a/debian/python3-magics++.install b/debian/python3-magics++.install
new file mode 100644
index 0000000..fef6392
--- /dev/null
+++ b/debian/python3-magics++.install
@@ -0,0 +1 @@
+/usr/lib/python3*
diff --git a/debian/rules b/debian/rules
index b5db3fb..803eb66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -117,12 +117,8 @@ override_dh_auto_test check:
 	#	export MAGPLUS_HOME=$(CURDIR) ; $(MAKE) -C debian/build-py3  check )
 
 override_dh_auto_install:
-	(cd  debian/build-py3/python && python2 ./setup.py install --prefix=$(CURDIR)/debian/tmp/usr )
+	(cd  debian/build-py2/python && python2 ./setup.py install --prefix=$(CURDIR)/debian/tmp/usr )
 	(cd  debian/build-py3/python && python3 ./setup.py install --prefix=$(CURDIR)/debian/tmp/usr )
-	#$(MAKE) -C debian/build-py3/python clean install PYTHON_INCLUDE_DIR=/usr/include/python3.5 \
-	#		DESTDIR=$(CURDIR)/debian/python3-magics++ \ MAGPLUS_HOME=$(CURDIR) 
-	#$(MAKE) -C debian/build-py2/python clean install PYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-	#		DESTDIR=$(CURDIR)/debian/python-magics++ \ MAGPLUS_HOME=$(CURDIR) 
 	dh_auto_install --builddirectory=debian/build-py3
 	# Move lib stuff
 	mkdir -p debian/tmp/$(LIBDIR)

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



More information about the debian-science-commits mailing list