Merge changes from patch

diff --git a/src/nom/debian/changelog b/src/nom/debian/changelog
index 9581ed68a994b6b1523c8a1f26f96502eb95d4d5..e1d610fc18a08e593f1d2baa4776a224843fd2b3 100644 (file)
--- a/src/nom/debian/changelog
+++ b/src/nom/debian/changelog
@@ -1,5 +1,5 @@
 rust-nom (4.0.0-1) unstable; urgency=medium
 
-  * Package nom 4.0.0 from crates.io using debcargo 2.2.3
+  * Package nom 4.0.0 from crates.io using debcargo 2.2.5
 
- -- Emmanouil Kampitakis <info+debian@kampitakis.de>  Tue, 10 Jul 2018 22:30:17 +0000
+ -- Emmanouil Kampitakis <info+debian@kampitakis.de>  Wed,  1 Aug 2018 23:43:14 +0000

diff --git a/src/nom/debian/copyright b/src/nom/debian/copyright
index 823ba357748b581e94905050d69db493707cd453..0252a2d3283981cc89ce97e0639986fa63490a18 100644 (file)
--- a/src/nom/debian/copyright
+++ b/src/nom/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: contact@geoffroycouprie.com
 Source: https://github.com/Geal/nom
 
 Files: *
-Copyright: 2015-2016 contact@geoffroycouprie.com
+Copyright: 2015-2016 Geoffroy Couprie <contact@geoffroycouprie.com>
 License: MIT
 
 Files: debian/*
@@ -30,4 +30,4 @@ License: MIT
  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.IXME fill me in using ./copyright.debcargo.hint as a guide
+ SOFTWARE.