This is an automated email from the git hooks/post-receive script. johanvdw-guest pushed a commit to branch master in repository saga.
commit 312c88f8a1cf4ec36d7e0b2541f730b473b8e19b Merge: 3146db3 610ebd3 Author: Johan Van de Wauw <johan.vandew...@gmail.com> Date: Mon Jul 6 14:21:47 2015 +0200 Merge branch 'experimental' Conflicts: debian/control debian/rules debian/changelog | 20 +++++ debian/control | 22 ++--- debian/copyright | 99 ++++++++++++---------- debian/gbp.conf | 16 ++++ .../0001-Fix-gcc-errors-from-upstream.patch | 48 ----------- ...tch => 0001-Remove-references-to-libfire.patch} | 6 +- ...atch => 0002-Use-debian-version-of-grib2.patch} | 0 ...ch => 0003-Use-qhull-instead-of-triangle.patch} | 0 .../0004-Use-debian-version-of-libsvm.patch | 31 +++++++ debian/patches/0099-no-hdf5.patch | 13 +++ debian/patches/series | 9 +- debian/rules | 14 +-- debian/saga_cmd.pod | 66 +++++++++++++-- debian/watch | 2 +- 14 files changed, 218 insertions(+), 128 deletions(-) diff --cc debian/control index 35c3fc1,d549e4c..fd05809 --- a/debian/control +++ b/debian/control @@@ -16,10 -16,13 +16,12 @@@ Build-Depends: libwxgtk3.0-dev libqhull-dev, libhpdf-dev, python-dev, - dh-autoreconf - Standards-Version: 3.9.5 - Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/saga.git - Vcs-Git: git://anonscm.debian.org/pkg-grass/saga.git - liblas-dev, + dh-autoreconf, + libsvm-dev, + libvigraimpex-dev + Standards-Version: 3.9.6 + Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/saga.git + Vcs-Git: git://anonscm.debian.org/pkg-grass/saga.git -b experimental Homepage: http://www.saga-gis.org/ Package: saga diff --cc debian/rules index f4a24c5,b536800..922b3c8 --- a/debian/rules +++ b/debian/rules @@@ -16,10 -16,12 +16,12 @@@ UPSTREAM_VERSION ?=$(shell uscan --deh debian/% :: debian/%.in sed -e 's/@VERSION@/$(VERSION)/' $< >$@ - override_dh_auto_build: - pod2man --section=1 --release=$(VERSION) --center " " debian/saga_cmd.pod >saga_cmd.1 + override_dh_auto_build: man + dh_auto_build + + man: - pod2man --section=1 --release=$(VERSION) --center " " debian/saga_cmd.pod >saga_cmd.1 pod2man --section=1 --release=$(VERSION) --center " " debian/saga_gui.pod >saga_gui.1 + dh_auto_build override_dh_python2: dh_python2 --no-guessing-versions -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/saga.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel