This is an automated email from the git hooks/post-receive script. gert-guest pushed a commit to branch master in repository mia.
commit 3c23521a7d64f6313e9db574aadb4594b0a76203 Author: Gert Wollny <[email protected]> Date: Sun Jul 24 22:55:31 2016 +0000 split out doctools into seperate package --- debian/changelog | 1 + debian/control | 13 +++++++++++-- debian/libmia-2.4-dev.install | 1 - debian/libmia-2.4-dev.lintian-overrides | 9 --------- debian/mia-doctools.install | 2 ++ debian/rules | 9 ++++----- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index 35be581..f1e02ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ mia (2.4.2-1) UNRELEASED; urgency=medium * Remove patches that were applied upstream * Add patch to replace boost::regex by std::regex * Add conflict for dev package + * split out the doctools scripts into extra package -- Gert Wollny <[email protected]> Sat, 23 Jul 2016 14:40:04 +0000 diff --git a/debian/control b/debian/control index 5c1801f..61821c0 100644 --- a/debian/control +++ b/debian/control @@ -62,8 +62,8 @@ Depends: libmia-2.4-0 (= ${binary:Version}), libfftw3-dev, libblas-dev, ${misc:Depends} -Recommends: libmia-2.4-doc -Suggests: python-lxml +Recommends: libmia-2.4-doc, + mia-doctools Conflicts: libmia-2.2-dev Replaces: libmia-2.2-dev Description: library for 2D and 3D gray scale image processing, development files @@ -102,6 +102,15 @@ Description: Command line tools for gray scale image processing various statistics over images. This package also contains the nipype interfaces for these command line tools. +Package: mia-doctools +Architecture: all +Depends: python-lxml +Conflicts: libmia-2.2-dev +Description: Helper scripts for run-time document creation + A set of scripts that can be used to create man-pages and on-line + documentation for programs that make use of the mia command line + parser and plug-in infrastructure + Package: mia-tools-doc Architecture: all Section: doc diff --git a/debian/libmia-2.4-dev.install b/debian/libmia-2.4-dev.install index fd7d648..c903ce5 100644 --- a/debian/libmia-2.4-dev.install +++ b/debian/libmia-2.4-dev.install @@ -2,4 +2,3 @@ usr/include/* usr/lib/*/lib*.so usr/lib/*/mia-2.4/include/* usr/lib/*/pkgconfig/* -usr/share/mia-doctools/* diff --git a/debian/libmia-2.4-dev.lintian-overrides b/debian/libmia-2.4-dev.lintian-overrides deleted file mode 100644 index e7383c5..0000000 --- a/debian/libmia-2.4-dev.lintian-overrides +++ /dev/null @@ -1,9 +0,0 @@ -# -# The package provides some python scripts that may be of use -# for someone who wants to use the automatic documentation -# and nipype interface creation, but this is not required to -# use the package. -# python-lxml is suggested instead. -# -libmia-2.4-dev binary: python-script-but-no-python-dep - diff --git a/debian/mia-doctools.install b/debian/mia-doctools.install new file mode 100644 index 0000000..36ada13 --- /dev/null +++ b/debian/mia-doctools.install @@ -0,0 +1,2 @@ +usr/share/mia-doctools/* + diff --git a/debian/rules b/debian/rules index 91fd1aa..9687c9a 100755 --- a/debian/rules +++ b/debian/rules @@ -6,13 +6,12 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -fvisibility=hidden # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# currently need to build all # deduce documentation option (build-indep target) -#ifeq "" "$(filter %-doc,$(shell dh_listpackages))" -# BUILDDOC = OFF -#else +ifeq "" "$(filter %-doc,$(shell dh_listpackages))" + BUILDDOC = OFF +else BUILDDOC = ON -#endif +endif .PHONY: override_dh_strip override_dh_shlibdeps override_dh_auto_test -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mia.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
