[Python-modules-commits] r31749 - in packages/python-nacl/trunk/debian (control rules)

[mithrandi at users.alioth.debian.org]

    Date: Monday, February 2, 2015 @ 00:56:28
  Author: mithrandi
Revision: 31749

Make it build.

Modified:
  packages/python-nacl/trunk/debian/control
  packages/python-nacl/trunk/debian/rules

Modified: packages/python-nacl/trunk/debian/control
===================================================================
--- packages/python-nacl/trunk/debian/control	2015-02-02 00:56:16 UTC (rev 31748)
+++ packages/python-nacl/trunk/debian/control	2015-02-02 00:56:28 UTC (rev 31749)
@@ -12,7 +12,12 @@
  python3-setuptools,
  python-cffi,
  python3-cffi,
- sphinx-common
+ python-pytest,
+ python3-pytest,
+ python-six,
+ python3-six,
+ sphinx-common,
+ libsodium-dev
 Standards-Version: 3.9.6
 Homepage: https://github.com/pyca/pynacl/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-nacl/trunk/

Modified: packages/python-nacl/trunk/debian/rules
===================================================================
--- packages/python-nacl/trunk/debian/rules	2015-02-02 00:56:16 UTC (rev 31748)
+++ packages/python-nacl/trunk/debian/rules	2015-02-02 00:56:28 UTC (rev 31749)
@@ -1,14 +1,25 @@
 #!/usr/bin/make -f
 
-export PYBUILD_NAME=python-nacl
+export PYBUILD_NAME=nacl
 export PYBUILD_TEST_PYTEST=1
 export PYBUILD_TEST_ARGS={dir}/tests/
 
+# Make sure PyNaCl uses the system libsodium instead of trying to use the
+# vendored copy
+export SODIUM_INSTALL=system
 
+
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
 
+override_dh_clean:
+	dh_clean
+	# Remove the vendored libsodium just to make sure we don't build
+	# against it
+	rm -rf src/libsodium
+
+
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf src/nacl/_lib/__pycache__