This is an automated email from the git hooks/post-receive script. plessy pushed a commit to branch master in repository jellyfish.
commit 8daf55976345b649e81f3c8a0d90e42e36923200 Author: Charles Plessy <[email protected]> Date: Wed Jun 17 18:05:56 2015 +0900 Imported Upstream version 2.2.1 --- configure.ac | 2 +- swig/Makefile.am | 6 +++--- swig/python/__init__.py | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 71f7e4b..9c6a865 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([jellyfish], [2.2.0], [[email protected]]) +AC_INIT([jellyfish], [2.2.1], [[email protected]]) AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([subdir-objects foreign parallel-tests color-tests]) diff --git a/swig/Makefile.am b/swig/Makefile.am index af7ed5e..63bbb1e 100644 --- a/swig/Makefile.am +++ b/swig/Makefile.am @@ -22,7 +22,7 @@ PYTHON_BUILT = python/swig_wrap.cpp python/jellyfish.py BUILT_SOURCES += $(PYTHON_BUILT) pythonextdir = $(PYTHON_SITE_PKG)/jellyfish -pythonext_SCRIPTS = python/jellyfish.pyc python/__init__.pyc +pythonext_SCRIPTS = python/__init__.pyc pythonext_LTLIBRARIES = python/_jellyfish.la python__jellyfish_la_SOURCES = python/swig_wrap.cpp $(SWIG_SRC) python__jellyfish_la_CPPFLAGS = $(PYTHON_CPPFLAGS) -I$(top_srcdir)/include @@ -32,10 +32,10 @@ CLEANFILES += $(PYTHON_BUILT) $(dist_pythonext_DATA) python/jellyfish.py PYTHONC_V_GEN = $(pythonc_v_GEN_$(V)) pythonc_v_GEN_ = $(pythonc_v_GEN_$(AM_DEFAULT_VERBOSITY)) pythonc_v_GEN_0 = @echo " PYTHONC " $@; -%.pyc: %.py +%/__init__.pyc: %/jellyfish.py $(PYTHONC_V_GEN)$(PYTHON) -c 'import py_compile, sys; py_compile.compile(sys.argv[1], sys.argv[2])' $< $@ python/jellyfish.py: python/swig_wrap.cpp -EXTRA_DIST += python/jellyfish.py python/__init__.py +EXTRA_DIST += python/jellyfish.py endif # Ruby support diff --git a/swig/python/__init__.py b/swig/python/__init__.py deleted file mode 100644 index afb0598..0000000 --- a/swig/python/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from jellyfish import * -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/jellyfish.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
