[SCM] morituri/master: debian patch to not hardcode python
js at users.alioth.debian.org
js at users.alioth.debian.org
Sun Oct 19 20:09:56 UTC 2014
The following commit has been merged in the master branch:
commit e9854f5e74b3bf9049cf821d316d6783633c6476
Author: Jonas Smedegaard <dr at jones.dk>
Date: Tue Jan 22 22:51:33 2013 +0100
debian patch to not hardcode python
http://patch-tracker.debian.org/patch/series/view/morituri/0.1.3-2/1001_no_hardcode_python_binary.patch
diff --git a/Makefile.am b/Makefile.am
index 0352bfd..dc8e9f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,10 +18,10 @@ _trial_temp/coverage: $(top_srcdir)/morituri/*.py $(top_srcdir)/morituri/*/*.py
trial --coverage morituri.test
coverage: _trial_temp/coverage
- python misc/show-coverage.py `ls _trial_temp/coverage/morituri* | grep -v morituri.test | grep -v morituri.extern`
+ $(PYTHON) misc/show-coverage.py `ls _trial_temp/coverage/morituri* | grep -v morituri.test | grep -v morituri.extern`
pep8:
- for file in $(SOURCES); do python misc/pep8.py --repeat $$file; done
+ for file in $(SOURCES); do $(PYTHON) misc/pep8.py --repeat $$file; done
clean-local:
@rm -rf _trial_temp
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 818a0a8..c115c2c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -24,7 +24,7 @@ morituri.ics: $(top_srcdir)/morituri.doap
man_MANS = rip.1
rip.1: $(top_srcdir)/morituri/extern/python-command/scripts/help2man $(top_srcdir)/morituri
- PYTHONPATH=$(top_srcdir) python $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1
+ PYTHONPATH=$(top_srcdir) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1
clean-local:
@rm -rf reference
--
morituri packaging
More information about the pkg-multimedia-commits
mailing list