[med-svn] [Git][med-team/maxflow][master] 2 commits: Fix the copyright update

[Gert Wollny]

Gert Wollny pushed to branch master at Debian Med / maxflow


Commits:
38498242 by Gert Wollny at 2018-02-13T13:19:12+01:00
Fix the copyright update

- - - - -
1e048ab8 by Gert Wollny at 2018-02-13T13:20:25+01:00
Update changelog

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/fix-copyright.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ maxflow (3.0.4-2) unstable; urgency=medium
   * d/.gitlab-ci.yml added 
   * d/control, d/rules: Remove hard coded debug package
   * d/control: Update uploader email to gewo at debian.org
+  * d/p: Add a copyright patch because the Debian tarball doesn't have 
+    it although it should be there. 
 
  -- Gert Wollny <gewo at debian.org>  Tue, 13 Feb 2018 11:34:48 +0100
 


=====================================
debian/patches/fix-copyright.patch
=====================================
--- /dev/null
+++ b/debian/patches/fix-copyright.patch
@@ -0,0 +1,82 @@
+commit 1b106ff3d6ec910b6975de9842ccba577ed016b2
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Description: Work around a faulty tarball in debian
+Date:   Tue Jul 21 19:30:11 2015 +0200
+
+diff --git a/maxflow.cpp b/maxflow.cpp
+index 28d49f7..711eb90 100644
+--- a/maxflow.cpp
++++ b/maxflow.cpp
+@@ -1,6 +1,7 @@
+ /* maxflow.cpp */
+ /*
+-    Copyright Vladimir Kolmogorov (vnk at ist.ac.at), Yuri Boykov (yuri at csd.uwo.ca) 
++    Copyright 2006-2015 
++    Vladimir Kolmogorov (vnk at ist.ac.at), Yuri Boykov (yuri at csd.uwo.ca) 
+ 
+     This file is part of MAXFLOW.
+ 
+diff --git a/maxflow.h b/maxflow.h
+index f3dd2ed..713d7b0 100644
+--- a/maxflow.h
++++ b/maxflow.h
+@@ -1,5 +1,6 @@
+ /*
+-    Copyright Vladimir Kolmogorov (vnk at ist.ac.at), Yuri Boykov (yuri at csd.uwo.ca) 
++    Copyright 2006-2015 
++    Vladimir Kolmogorov (vnk at ist.ac.at), Yuri Boykov (yuri at csd.uwo.ca) 
+ 
+     This file is part of MAXFLOW.
+ 
+diff --git a/maxflow/block.h b/maxflow/block.h
+index a0ee762..87a7216 100644
+--- a/maxflow/block.h
++++ b/maxflow/block.h
+@@ -1,5 +1,6 @@
+ /*
+-    Copyright Vladimir Kolmogorov (vnk at ist.ac.at), Yuri Boykov (yuri at csd.uwo.ca) 
++    Copyright 2006-2015 
++    Vladimir Kolmogorov (vnk at ist.ac.at), Yuri Boykov (yuri at csd.uwo.ca) 
+ 
+     This file is part of MAXFLOW.
+ 
+diff --git a/maxflow/graph.cpp b/maxflow/graph.cpp
+index 42c4478..40e348c 100644
+--- a/maxflow/graph.cpp
++++ b/maxflow/graph.cpp
+@@ -1,7 +1,7 @@
+ /* graph.cpp  provides the implementation of the template methods */
+-
+ /*
+-    Copyright Vladimir Kolmogorov (vnk at ist.ac.at), Yuri Boykov (yuri at csd.uwo.ca) 
++    Copyright 2006-2015 
++    Vladimir Kolmogorov (vnk at ist.ac.at), Yuri Boykov (yuri at csd.uwo.ca) 
+ 
+     This file is part of MAXFLOW.
+ 
+diff --git a/maxflow/graph.h b/maxflow/graph.h
+index 6a6da37..e723871 100644
+--- a/maxflow/graph.h
++++ b/maxflow/graph.h
+@@ -1,6 +1,7 @@
+ /* graph.h */
+ /*
+-    Copyright Vladimir Kolmogorov (vnk at ist.ac.at), Yuri Boykov (yuri at csd.uwo.ca) 
++    Copyright 2006-2015 
++    Vladimir Kolmogorov (vnk at ist.ac.at), Yuri Boykov (yuri at csd.uwo.ca) 
+ 
+     This file is part of MAXFLOW.
+ 
+diff --git a/test_maxflow.cpp b/test_maxflow.cpp
+index 48f5e61..8cacc2f 100644
+--- a/test_maxflow.cpp
++++ b/test_maxflow.cpp
+@@ -1,4 +1,8 @@
+ /*
++
++    Copyright 2006-2015, 
++    Vladimir Kolmogorov (vnk at ist.ac.at), Yuri Boykov (yuri at csd.uwo.ca)
++
+     This file is part of MAXFLOW.
+ 
+     MAXFLOW is free software: you can redistribute it and/or modify


=====================================
debian/patches/series
=====================================
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-copyright.patch



View it on GitLab: https://salsa.debian.org/med-team/maxflow/compare/1181b798ed8abe730bcc84f31b94a9c45ecd6748...1e048ab8ac54a1377ab5bead43d16a28fc00429a

---
View it on GitLab: https://salsa.debian.org/med-team/maxflow/compare/1181b798ed8abe730bcc84f31b94a9c45ecd6748...1e048ab8ac54a1377ab5bead43d16a28fc00429a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180213/f96b775b/attachment-0001.html>