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 3d0cfaf05b8c980db2c9d4f4a372edb0e5545bb5
Author: Dominique Dumont <d...@debian.org>
Date:   Tue Oct 13 20:51:26 2015 +0200

    test merge with fill blank (Closes: #795195)
---
 .../dpkg-examples/open-nebula/debian/compat        |   1 +
 .../dpkg-examples/open-nebula/debian/control       |  22 +++
 .../dpkg-examples/open-nebula/debian/copyright     | 214 +++++++++++++++++++++
 .../open-nebula/debian/fill.copyright.blanks.yml   |  18 ++
 .../dpkg-examples/open-nebula/debian/source/format |   1 +
 t/model_tests.d/dpkg-test-conf.pl                  |  23 +++
 6 files changed, 279 insertions(+)

diff --git a/t/model_tests.d/dpkg-examples/open-nebula/debian/compat 
b/t/model_tests.d/dpkg-examples/open-nebula/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/t/model_tests.d/dpkg-examples/open-nebula/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/t/model_tests.d/dpkg-examples/open-nebula/debian/control 
b/t/model_tests.d/dpkg-examples/open-nebula/debian/control
new file mode 100644
index 0000000..98f1762
--- /dev/null
+++ b/t/model_tests.d/dpkg-examples/open-nebula/debian/control
@@ -0,0 +1,22 @@
+Source: opennebula
+Section: utils
+Priority: extra
+Maintainer: Daniel Dehennin <daniel.dehen...@baby-gnu.org>
+Build-Depends: bash-completion,
+               bison,
+               scons
+Standards-Version: 3.9.6.1
+Homepage: http://opennebula.org/
+Vcs-Git: https://github.com/OpenNebula/one.git
+Vcs-Browser: https://github.com/OpenNebula/one
+
+Package: opennebula
+Architecture: any
+Depends: apg,
+         genisoimage,
+         liblog4cpp5,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: controller which executes the OpenNebula cluster services
+ OpenNebula is an open source virtual infrastructure engine that enables the...
+
diff --git a/t/model_tests.d/dpkg-examples/open-nebula/debian/copyright 
b/t/model_tests.d/dpkg-examples/open-nebula/debian/copyright
new file mode 100644
index 0000000..1cb0a03
--- /dev/null
+++ b/t/model_tests.d/dpkg-examples/open-nebula/debian/copyright
@@ -0,0 +1,214 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: OpenNebula
+Upstream-Contact: OpenNebula Project Leads (OpenNebula.org)
+Source: http://downloads.opennebula.org/packages/
+
+Files: *
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+Files: share/vendor/*
+Copyright: 2010, 2011, VMware, Inc.
+License: Expat
+
+Files: share/vendor/ruby/gems/rbvmomi/lib/rbvmomi/vim/*
+Copyright: 2010, 2011, VMware, Inc.
+License: Expat
+
+Files: src/*
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+Files: src/authm_mad/remotes/ldap/*
+Copyright: 2010-2015, C12G Labs S.L
+License: Apache-2.0
+
+Files: src/cli/*
+Copyright: 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+Files: src/cli/one_helper.rb
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+  2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+Files: src/datastore_mad/*
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+Files: src/flow/*
+Copyright: 2010-2015, C12G Labs S.L.
+License: Apache-2.0
+
+Files: src/hm_mad/*
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+Files: src/im_mad/*
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+Files: src/im_mad/collectd/*
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+Files: src/im_mad/remotes/vcenter.d/*
+Copyright: 2010-2015, C12G Labs S.L
+License: Apache-2.0
+
+Files: src/mad/*
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+Files: src/mad/Mad.cc
+  src/mad/MadManager.cc
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+Files: src/mad/ruby/CommandManager.rb
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+Files: src/mad/utils/*
+Copyright: 2010-2015, C12G Labs S.L.
+License: Apache-2.0
+
+Files: src/oca/*
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+Files: src/oca/java/*
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+Files: src/oca/java/build.sh
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+Files: src/oca/java/test/all_tests.sh
+  src/oca/java/test/test.sh
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+Files: src/oca/ruby/opennebula/oneflow_client.rb
+Copyright: 2010-2015, C12G Labs S.L.
+License: Apache-2.0
+
+Files: src/scheduler/include/ClusterPoolXML.h
+  src/scheduler/include/ClusterXML.h
+Copyright: 2002-2015, OpenNebula Project Leads (OpenNebula.org)
+License: Apache-2.0
+
+Files: src/scheduler/src/pool/ClusterPoolXML.cc
+Copyright: 2002-2015, OpenNebula Project Leads (OpenNebula.org)
+License: Apache-2.0
+
+Files: src/sunstone/*
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+Files: src/sunstone/models/SunstoneMarketplace.rb
+Copyright: 2010-2015, C12G Labs S.L
+License: Apache-2.0
+
+Files: src/sunstone/routes/*
+Copyright: 2010-2015, C12G Labs S.L.
+License: Apache-2.0
+
+Files: src/template/*
+Copyright: 1984, 1989, 1990, 2000-2013, Free Software Foundation, Inc
+License: GPL-3+
+
+Files: src/template/Template.cc
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+Files: src/tm_mad/*
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+Files: src/vm/vm_file_var_syntax.cc
+  src/vm/vm_file_var_syntax.h
+  src/vm/vm_var_syntax.cc
+  src/vm/vm_var_syntax.h
+Copyright: 1984, 1989, 1990, 2000-2013, Free Software Foundation, Inc
+License: GPL-3+
+
+Files: src/vmm_mad/*
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+Files: src/vmm_mad/remotes/vcenter/*
+Copyright: 2010-2015, C12G Labs S.L
+License: Apache-2.0
+
+Files: src/vmm_mad/remotes/vmware/*
+Copyright: 2010-2015, C12G Labs S.L
+License: Apache-2.0
+
+Files: src/vmm_mad/remotes/vmware/scripts_common_sh.sh
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+Files: src/vmm_mad/*
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+Files: src/xml/*
+Copyright: 1984, 1989, 1990, 2000-2013, Free Software Foundation, Inc
+License: GPL-3+
+
+Files: src/xml/ObjectXML.cc
+Copyright: 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs
+License: Apache-2.0
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+     http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS"BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache License,
+ Version 2.0 can be found in '/usr/share/common-licenses/Apache-2.0'.
+
+License: Expat
+ The MIT License
+ .
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated
+ documentation files (the "Software"), to deal in the Software
+ without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to
+ whom the Software is furnished to do so, subject to the
+ following conditions:
+ .
+ The above copyright notice and this permission notice shall
+ be included in all copies or substantial portions of the
+ Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT
+ WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+ SHALL THE 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.
+
+License: GPL-3+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 3 dated June, 2007, or (at
+ your option) any later version.
+ .
+ On Debian systems, the complete text of version 3 of the GNU General
+ Public License can be found in '/usr/share/common-licenses/GPL-3'.
diff --git 
a/t/model_tests.d/dpkg-examples/open-nebula/debian/fill.copyright.blanks.yml 
b/t/model_tests.d/dpkg-examples/open-nebula/debian/fill.copyright.blanks.yml
new file mode 100644
index 0000000..cea1c4f
--- /dev/null
+++ b/t/model_tests.d/dpkg-examples/open-nebula/debian/fill.copyright.blanks.yml
@@ -0,0 +1,18 @@
+---
+debian:
+  skip: 1
+Tebian:
+  copyright: 2015, Marcel Mezigue
+  license: Expat
+share/pkgs/openSUSE/systemd/onedsetup:
+  copyright: 2015, Marcel Mezigue
+share/vendor/ruby/gems/rbvmomi/lib/rbvmomi.*\.rb:
+  license: Expat
+.*NOTICE:
+  skip: 1
+share/websockify/:
+  license: LGPL-2
+src/sunstone/:
+  license: Apache-2.0
+  copyright: 2010-2015, C12G Labs S.L.
+
diff --git a/t/model_tests.d/dpkg-examples/open-nebula/debian/source/format 
b/t/model_tests.d/dpkg-examples/open-nebula/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/t/model_tests.d/dpkg-examples/open-nebula/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/t/model_tests.d/dpkg-test-conf.pl 
b/t/model_tests.d/dpkg-test-conf.pl
index 6753b96..90c3eef 100644
--- a/t/model_tests.d/dpkg-test-conf.pl
+++ b/t/model_tests.d/dpkg-test-conf.pl
@@ -144,6 +144,29 @@ my $del_home = sub {
 
     },
 
+    {
+        # Debian bug #795195
+        name => 'open-nebula',
+        update => { in => path('t/scanner/examples/open-nebula.in') },
+        file_contents_like => {
+            'debian/copyright' => [
+                qr!Files: src/im_mad/remotes/az.d/\*!
+            ]
+        },
+        file_check_sub => $del_home,
+        # check that some entries were fixed by update
+        check => {
+            'copyright Files:"share/vendor/*" Copyright' => '2010-2012, 
VMware, Inc.',
+            'copyright Files:"src/sunstone/public/css/novnc-custom.css" 
Copyright' => qr/Mannehed/,
+
+        },
+        file_contents_unlike => {
+            'debian/copyright' => [
+                qr!Files: src/[hit]m_mad/\*!,
+            ],
+        },
+
+    },
 );
 
 my $cache_file = 't/model_tests.d/dependency-cache.txt';

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

_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

Reply via email to