[Python-apps-commits] r9750 - in packages/s3ql-beta/trunk/debian (4 files)

[nikratio-guest at users.alioth.debian.org]

    Date: Saturday, June 15, 2013 @ 21:27:27
  Author: nikratio-guest
Revision: 9750

Various fixes to build system.

Modified:
  packages/s3ql-beta/trunk/debian/changelog
  packages/s3ql-beta/trunk/debian/control
  packages/s3ql-beta/trunk/debian/rules
  packages/s3ql-beta/trunk/debian/s3ql-beta.docs

Modified: packages/s3ql-beta/trunk/debian/changelog
===================================================================
--- packages/s3ql-beta/trunk/debian/changelog	2013-06-15 21:11:23 UTC (rev 9749)
+++ packages/s3ql-beta/trunk/debian/changelog	2013-06-15 21:27:27 UTC (rev 9750)
@@ -1,4 +1,4 @@
-s3ql (2.1-1) UNRELEASED; urgency=low
+s3ql-beta (2.1-1) UNRELEASED; urgency=low
 
   * New upstream release from upstream's 2.x development branch. (New source
     package because 1.x branch is still maintained and recommended for

Modified: packages/s3ql-beta/trunk/debian/control
===================================================================
--- packages/s3ql-beta/trunk/debian/control	2013-06-15 21:11:23 UTC (rev 9749)
+++ packages/s3ql-beta/trunk/debian/control	2013-06-15 21:27:27 UTC (rev 9750)
@@ -15,7 +15,7 @@
                python3-llfuse (>= 0.37),
                python3-crypto,
                python3-pytest,
-               cython (>= 0.18),
+               cython (>= 0.17),
                texlive-latex-base,
                texlive-latex-recommended,
                texlive-latex-extra,

Modified: packages/s3ql-beta/trunk/debian/rules
===================================================================
--- packages/s3ql-beta/trunk/debian/rules	2013-06-15 21:11:23 UTC (rev 9749)
+++ packages/s3ql-beta/trunk/debian/rules	2013-06-15 21:27:27 UTC (rev 9750)
@@ -13,19 +13,19 @@
 
 build_cython:
 	dh_testdir
-	python setup.py build_cython
+	python3 setup.py build_cython
 	touch $@
 
 build-python: 
 	dh_testdir
-	python-dbg setup.py build -g
-	python setup.py build -g
+	python3-dbg setup.py build -g
+	python3 setup.py build -g
 	touch $@
 
 build_sphinx:
 	dh_testdir
-	python setup.py build_ext --inplace
-	python setup.py build_sphinx
+	python3 setup.py build_ext --inplace
+	python3 setup.py build_sphinx
 	touch $@
 
 override_dh_auto_install: 
@@ -35,19 +35,19 @@
 	dh_installdirs
 
 	# Note: Install non -dbg last, so that scripts don't get a -dbg interpreter
-	python-dbg setup.py install --force --root=debian/tmp \
+	python3-dbg setup.py install --force --root=debian/tmp \
                --install-lib=/usr/lib/s3ql-beta \
                --install-scripts=/usr/lib/s3ql-beta \
                --no-compile -O0 --install-layout=deb
 
-	python setup.py install --force --root=debian/tmp \
+	python3 setup.py install --force --root=debian/tmp \
                --install-lib=/usr/lib/s3ql-beta \
                --install-scripts=/usr/lib/s3ql-beta \
                --no-compile -O0 --install-layout=deb
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	py.test3 tests/
+	py.test-3 tests/
 endif
 
 override_dh_install:

Modified: packages/s3ql-beta/trunk/debian/s3ql-beta.docs
===================================================================
--- packages/s3ql-beta/trunk/debian/s3ql-beta.docs	2013-06-15 21:11:23 UTC (rev 9749)
+++ packages/s3ql-beta/trunk/debian/s3ql-beta.docs	2013-06-15 21:27:27 UTC (rev 9750)
@@ -1,4 +1,4 @@
 doc/html/
-doc/contrib/
+contrib/
 doc/manual.pdf
 CREDITS.txt