[libconfig-model-dpkg-perl] 01/02: Merge branch 'master' of ssh://git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl

[dod at debian.org]

This is an automated email from the git hooks/post-receive script.

dod pushed a commit to branch master
in repository libconfig-model-dpkg-perl.

commit 63e59d3357e2f5e1b9e3a7a2e8afeeb40b6f2661
Merge: 684215e 05bfbd0
Author: Dominique Dumont <dod at debian.org>
Date:   Mon Oct 28 14:34:19 2013 +0100

    Merge branch 'master' of ssh://git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl
    
    Conflicts:
    	debian/changelog

 debian/changelog                                         |   11 +++++++++--
 debian/control                                           |    2 +-
 lib/Config/Model/models/Dpkg/Control/Source.pl           |    6 +++---
 t/dependency-check.t                                     |    2 +-
 t/model_tests.d/dependency-cache.txt                     |    2 +-
 t/model_tests.d/dpkg-control-examples/built-using        |    2 +-
 t/model_tests.d/dpkg-control-examples/dbg-dep            |    2 +-
 t/model_tests.d/dpkg-control-examples/libclass-meta-perl |    2 +-
 t/model_tests.d/dpkg-control-examples/non-free           |    2 +-
 t/model_tests.d/dpkg-control-examples/ruby               |    2 +-
 t/model_tests.d/dpkg-control-examples/xs-testsuite       |    2 +-
 t/model_tests.d/dpkg-examples/t0/debian/control          |    2 +-
 12 files changed, 22 insertions(+), 15 deletions(-)

diff --cc debian/changelog
index 4952837,548f92a..2dc46c8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,22 +1,22 @@@
- libconfig-model-dpkg-perl (2.042) unstable; urgency=low
+ libconfig-model-dpkg-perl (2.042) UNRELEASED; urgency=low
  
 -  [ Dominique Dumont ]
 -  * Added doc to 'patch' dpkg parameter
 -  * skip comments in debian/series files (Closes: #725147)
 -  * test comments in debian/patches/series
 -
    [ Bas Couwenberg ]
    * Homepage is also allowed for binary packages.
    * XB-Python-Version is allowed but deprecated for binary packages.
  
    [ Dominique Dumont ]
    * copyright backend: improved error message
 +  * Added doc to 'patch' dpkg parameter
 +  * skip comments in debian/series files (Closes: #725147)
 +
-  -- Dominique Dumont <dod at debian.org>  Sun, 13 Oct 2013 20:56:27 +0200
++  [ Dominique Dumont ]
++  * copyright backend: improved error message
+ 
+   [ Salvatore Bonaccorso ]
+   * Set Standards-Version to 3.9.5 for the dpkg-control model
+   * Bump Standards-Version to 3.9.5
+ 
+  -- Dominique Dumont <dod at debian.org>  Mon, 28 Oct 2013 10:52:57 +0100
  
  libconfig-model-dpkg-perl (2.041) unstable; urgency=low
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git