Gert Wollny pushed to branch master at Debian Med / maxflow
Commits: 9bf84f92 by Gert Wollny at 2018-02-14T11:42:03+01:00 d/watch: Correct name mangling - - - - - ae56c0b4 by Gert Wollny at 2018-02-14T11:43:00+01:00 d/: Add gbp.conf file - - - - - 90f00703 by Gert Wollny at 2018-02-14T11:43:21+01:00 New upstream version 3.0.5 - - - - - 184f9baa by Gert Wollny at 2018-02-14T11:43:21+01:00 Update upstream source from tag 'upstream/3.0.5' Update to upstream version '3.0.5' with Debian dir c5dc743fa69ed33ed834e0644081c4e2214b9725 - - - - - ccd2ed35 by Gert Wollny at 2018-02-14T11:43:42+01:00 d/p: remove obsolete patches - - - - - 3e879fa3 by Gert Wollny at 2018-02-14T11:44:35+01:00 Update changelog for release - - - - - 12 changed files: - .gitignore - + .travis.yml - debian/changelog - − debian/patches/fix-copyright.patch - − debian/patches/series - debian/watch - maxflow.cpp - maxflow.h - maxflow/block.h - maxflow/graph.cpp - maxflow/graph.h - test_maxflow.cpp Changes: ===================================== .gitignore ===================================== --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ build *~ + ===================================== .travis.yml ===================================== --- /dev/null +++ b/.travis.yml @@ -0,0 +1,15 @@ +sudo: required +dist: trusty + +before_script: + - mkdir build + - cd build + - cmake .. + +script: + - make -j2 + +after_success: + - make test + + ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +maxflow (3.0.5-1) unstable; urgency=medium + + * d/watch: Correct name mangling + * d/: Add gbp.conf file + * New upstream version 3.0.5 + * d/p: remove obsolete patches + + -- Gert Wollny <g...@debian.org> Wed, 14 Feb 2018 11:43:55 +0100 + maxflow (3.0.4-2) unstable; urgency=medium * d/control: - update VCS URLs to salsa ===================================== debian/patches/fix-copyright.patch deleted ===================================== --- a/debian/patches/fix-copyright.patch +++ /dev/null @@ -1,70 +0,0 @@ -commit 1b106ff3d6ec910b6975de9842ccba577ed016b2 -Author: Gert Wollny <gw.foss...@gmail.com> -Description: Work around a faulty tarball in debian -Date: Tue Jul 21 19:30:11 2015 +0200 - ---- a/maxflow.cpp -+++ b/maxflow.cpp -@@ -1,6 +1,7 @@ - /* maxflow.cpp */ - /* -- Copyright Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) -+ Copyright 2006-2015 -+ Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) - - This file is part of MAXFLOW. - ---- a/maxflow.h -+++ b/maxflow.h -@@ -1,5 +1,6 @@ - /* -- Copyright Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) -+ Copyright 2006-2015 -+ Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) - - This file is part of MAXFLOW. - ---- a/maxflow/block.h -+++ b/maxflow/block.h -@@ -1,5 +1,6 @@ - /* -- Copyright Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) -+ Copyright 2006-2015 -+ Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) - - This file is part of MAXFLOW. - ---- a/maxflow/graph.cpp -+++ b/maxflow/graph.cpp -@@ -1,7 +1,7 @@ - /* graph.cpp provides the implementation of the template methods */ -- - /* -- Copyright Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) -+ Copyright 2006-2015 -+ Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) - - This file is part of MAXFLOW. - ---- a/maxflow/graph.h -+++ b/maxflow/graph.h -@@ -1,6 +1,7 @@ - /* graph.h */ - /* -- Copyright Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) -+ Copyright 2006-2015 -+ Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) - - This file is part of MAXFLOW. - ---- a/test_maxflow.cpp -+++ b/test_maxflow.cpp -@@ -1,4 +1,8 @@ - /* -+ -+ Copyright 2006-2015, -+ Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) -+ - This file is part of MAXFLOW. - - MAXFLOW is free software: you can redistribute it and/or modify ===================================== debian/patches/series deleted ===================================== --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -fix-copyright.patch ===================================== debian/watch ===================================== --- a/debian/watch +++ b/debian/watch @@ -2,5 +2,6 @@ version=3 # Uncomment to find new files on Github # - when using releases: +opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/maxflow-$1\.tar\.gz/ \ https://github.com/gerddie/maxflow/releases .*/archive/(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz) ===================================== maxflow.cpp ===================================== --- a/maxflow.cpp +++ b/maxflow.cpp @@ -1,6 +1,7 @@ /* maxflow.cpp */ /* - Copyright Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) + Copyright 2006-2015 + Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) This file is part of MAXFLOW. ===================================== maxflow.h ===================================== --- a/maxflow.h +++ b/maxflow.h @@ -1,5 +1,6 @@ /* - Copyright Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) + Copyright 2006-2015 + Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) This file is part of MAXFLOW. ===================================== maxflow/block.h ===================================== --- a/maxflow/block.h +++ b/maxflow/block.h @@ -1,5 +1,6 @@ /* - Copyright Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) + Copyright 2006-2015 + Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) This file is part of MAXFLOW. ===================================== maxflow/graph.cpp ===================================== --- a/maxflow/graph.cpp +++ b/maxflow/graph.cpp @@ -1,7 +1,7 @@ /* graph.cpp provides the implementation of the template methods */ - /* - Copyright Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) + Copyright 2006-2015 + Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) This file is part of MAXFLOW. ===================================== maxflow/graph.h ===================================== --- a/maxflow/graph.h +++ b/maxflow/graph.h @@ -1,6 +1,7 @@ /* graph.h */ /* - Copyright Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) + Copyright 2006-2015 + Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) This file is part of MAXFLOW. ===================================== test_maxflow.cpp ===================================== --- a/test_maxflow.cpp +++ b/test_maxflow.cpp @@ -1,4 +1,8 @@ /* + + Copyright 2006-2015, + Vladimir Kolmogorov (v...@ist.ac.at), Yuri Boykov (y...@csd.uwo.ca) + This file is part of MAXFLOW. MAXFLOW is free software: you can redistribute it and/or modify View it on GitLab: https://salsa.debian.org/med-team/maxflow/compare/44ff700411bc404712e0dbb7fb74a27adc10ea4a...3e879fa396db7778e1df3c80d7a57e0146aeab5a --- View it on GitLab: https://salsa.debian.org/med-team/maxflow/compare/44ff700411bc404712e0dbb7fb74a27adc10ea4a...3e879fa396db7778e1df3c80d7a57e0146aeab5a You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit