[libconfig-model-dpkg-perl] 07/07: Merge remote-tracking branch 'origin/master'

[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 4c1e382a140f027d6a1b9fca37e4f04e3c88964c
Merge: f2cdec2 a9be4b8
Author: Dominique Dumont <dod at debian.org>
Date:   Sat Sep 27 19:24:18 2014 +0200

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	debian/changelog

 debian/changelog                                   |  9 ++++++++-
 lib/Config/Model/models/Dpkg/Control/Source.pl     | 12 ++++++------
 t/model_tests.d/dpkg-control-examples/xs-testsuite |  2 +-
 t/model_tests.d/dpkg-control-test-conf.pl          |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --cc debian/changelog
index 9165862,8d80faa..66361d6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,17 +1,19 @@@
- libconfig-model-dpkg-perl (2.056) unstable; urgency=medium
+ libconfig-model-dpkg-perl (2.056) UNRELEASED; urgency=medium
+ 
+   * dpkg-control model: allow autopkgtest-pkg-{ruby,perl}
+     in Testsuite header.
+   * Use autopkgtest-pkg-ruby in tests.
+ 
+  -- gregor herrmann <gregoa at debian.org>  Sat, 27 Sep 2014 19:00:03 +0200
+ 
 -libconfig-model-dpkg-perl (2.055) unstable; urgency=medium
  
    * Dpkg::Copyright: fix automatic import of license summary or text
 -  * control: depends on liconfig-model-perl 2.061
 +  * control:
 +    * depends on liconfig-model-perl 2.061
 +    * depends on libsoftware-license-perl (>= 0.103010-2~)
 +    * removed versioned dep on libconfig-model-tester-pel
  
 - -- Dominique Dumont <dod at debian.org>  Wed, 24 Sep 2014 12:23:19 +0200
 + -- Dominique Dumont <dod at debian.org>  Sat, 27 Sep 2014 12:30:06 +0200
  
  libconfig-model-dpkg-perl (2.054) unstable; urgency=medium
  

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