[libconfig-model-dpkg-perl] 08/33: added test for copyright upgrade + update to check that customization are kept
dod at debian.org
dod at debian.org
Mon Mar 30 17:41:37 UTC 2015
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 08d38b1e9feacbbf5211e195c22f7e9eaba86714
Author: Dominique Dumont <dod at debian.org>
Date: Thu Mar 26 13:09:57 2015 +0100
added test for copyright upgrade + update to check that customization are kept
---
.../pan-copyright-upgrade-update/debian/compat | 1 +
.../pan-copyright-upgrade-update/debian/control | 30 +++
.../pan-copyright-upgrade-update/debian/copyright | 235 +++++++++++++++++++++
.../debian/fix.scanned.copyright | 7 +
.../pan-copyright-upgrade-update/debian/rules | 17 ++
.../debian/source/format | 1 +
t/model_tests.d/dpkg-test-conf.pl | 21 ++
7 files changed, 312 insertions(+)
diff --git a/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/debian/compat b/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/debian/control b/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/debian/control
new file mode 100644
index 0000000..aa735d3
--- /dev/null
+++ b/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/debian/control
@@ -0,0 +1,30 @@
+Source: pan
+Maintainer: Dominique Dumont <dod at debian.org>
+Section: news
+Priority: optional
+Build-Depends: autotools-dev,
+ debhelper (>= 9),
+ intltool,
+ libgmime-2.6-dev,
+ libgtk2.0-dev,
+ libgtkspell-dev,
+ libnotify-dev,
+ libgnome-keyring-dev,
+ libdbus-1-dev
+Standards-Version: 3.9.3
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/pan.git
+Vcs-Git: git://anonscm.debian.org/collab-maint/pan.git
+Homepage: http://pan.rebelbase.com/
+
+Package: pan
+Architecture: any
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ gnome-keyring
+Description: newsreader based on GTK2, which looks like Forte Agent
+ Pan is a newsreader, loosely based on Agent and Gravity, which attempts to be
+ pleasant to use for new and advanced users alike. It has all the typical
+ features found in newsreaders and also supports offline newsreading,
+ sophisticated filtering, multiple connections, and a number of extra features
+ for power users and alt.binaries fans.
+
diff --git a/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/debian/copyright b/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/debian/copyright
new file mode 100644
index 0000000..d3b6938
--- /dev/null
+++ b/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/debian/copyright
@@ -0,0 +1,235 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: pan
+Upstream-Contact: Charles Kerr <charles at rebelbase.com>
+Source: http://pan.rebelbase.com/
+
+Files: *
+Copyright: 1994-2001, Frank Pilhofer. The author may
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2012 Dominique Dumont <dod at debian.org>
+ 2007-2009 Mario Iseli <admin at marioiseli.com>
+ Norbert Tretkowski <nobse at debian.org>
+ 2000-2006 Søren Boll Overgaard <boll at debian.org>
+License: GPL-2
+
+Files: pan/*
+Copyright: 2002-2007, Charles Kerr <charles at rebelbase.com>
+License: GPL-2
+
+Files: pan/data/cert-store.cc
+ pan/data/cert-store.h
+Copyright: 2011, Heinrich Müller <henmull at src.gnome.org>
+ 2002-2006, Charles Kerr <charles at rebelbase.com>
+License: GPL-2
+
+Files: pan/general/e-util.cc
+ pan/general/e-util.h
+Copyright: 2000, 2001, Ximian, Inc
+License: LGPL-2
+
+Files: pan/general/locking.h
+ pan/general/worker-pool.cc
+ pan/general/worker-pool.h
+Copyright: 2007, Calin Culianu <calin at ajvar.org>
+ 2002-2007, Charles Kerr <charles at rebelbase.com>
+License: LGPL-2+
+Comment: Header file mentions Lesser GPL version 2. Actually the first version
+ of Lesser GPL is 2.1
+
+Files: pan/general/map-vector.h
+Copyright: 2001, Andrei Alexandrescu
+License: show-copyright
+ yada yada show-copyright stuff
+
+Files: pan/general/sorted-vector.h
+Copyright: 2002, Martin Holzherr (holzherr at infobrain.com).
+License: public-domain
+ Permission is granted to use, distribute and modify this code provided
+ that: this copyright notice appears,
+
+Files: pan/gui/e-action-combo-box.c
+ pan/gui/e-action-combo-box.h
+Copyright: 2008, Novell, Inc
+License: LGPL-2
+
+Files: pan/gui/e-charset-combo-box.c
+ pan/gui/e-charset-combo-box.h
+ pan/gui/e-charset.c
+ pan/gui/e-charset.h
+Copyright: 1999-2008, Novell, Inc.
+License: LGPL-2 or LGPL-3
+
+Files: pan/gui/e-charset-dialog.c
+ pan/gui/e-cte-dialog.c
+Copyright: 2001, Ximian, Inc
+License: GPL-2
+
+Files: pan/gui/license.h
+Copyright: 1989, 1991, Free Software Foundation
+License: GPL-2
+Comment: This file is actually "#define LICENSE <whole GPL-2 text>"
+
+Files: pan/gui/xface.c
+Copyright: , messages are not removed, and no monies are exchanged
+ , James Ashton - Sydney University - June 1990
+License: show-copyright
+ Permission is given to distribute these sources, as long as the
+ copyright messages are not removed, and no monies are exchanged.
+Comment: This file is a derived work from files in libcompface package. This file
+ is bundling compface.h and compface.c from libcompface and some more code.
+ The original copyright and license statement was kept, including a
+ non-dfsg statement: "as long as [...] no monies are exchanged". The
+ problem posed by this statement has been raised in #72019
+ .
+ The license issue has been clarified by James Ashton for libcompface
+ package (See
+ http://packages.debian.org/changelogs/pool/main/libc/libcompface/current/copyright).
+ Since this file is derived work from libcompface, this statement also
+ applies to this file.
+ .
+ For completeness, here's the clarification mail:
+ .
+ > From: James Ashton <James.Ashton at syseng.anu.edu.au>
+ > Subject: Re: libcompface license (again)
+ > Date: Thu, 22 Feb 2001 09:32:23 +1100 (EST)
+ >
+ > >Hi,
+ > >I'm maintaining the debian pkg of your compface lib, and I've talket to you
+ > >before about it's license. And now ouer legal people have found another
+ > >problem. The sourcefiles contains a diffrent copyright notice than the
+ > >redmefile. They say:
+ > >
+ > >> * Permission is given to distribute these sources, as long as the
+ > >> * copyright messages are not removed, and no monies are exchanged.=20
+ > >
+ > >The problem is the last part "no monies are exchanged". As you probably=20
+ > >know we do allow third party companies to produce debian CDs and sell them.
+ > >So this statement would inmply that we can't have your libcompface in
+ > debian
+ > >at all.
+ >
+ > I'm happy to remove the phrase no monies are exchanged' from the
+ > source and allow distribution as per the README file. Do you need more
+ > from me than just this email?
+ > --
+ > James Ashton VK1XJA System Administrator
+ > http://wwwsyseng.anu.edu.au/~jaa Department of Systems Engineering
+ > Voice +61 2 6125 8675 Research School of Information Sciences and Engineering
+ > FAX +61 2 6125 8660 Australian National University
+ > Email James.Ashton at anu.edu.au Canberra ACT 0200 Australia
+
+Files: pan/tasks/decoder.cc
+ pan/tasks/decoder.h
+ pan/tasks/encoder.cc
+ pan/tasks/encoder.h
+Copyright: 2007, Calin Culianu <calin at ajvar.org>
+ 2002-2007, Charles Kerr <charles at rebelbase.com>
+License: LGPL-2+
+
+Files: pan/tasks/socket-impl-main.cc
+ pan/tasks/socket-impl-main.h
+ pan/tasks/socket-impl-openssl.cc
+Copyright: 2011, Heinrich Müller <henmull at src.gnome.org>
+ 2002-2006, Charles Kerr <charles at rebelbase.com>
+License: GPL-2
+
+Files: pan/tasks/socket-impl-openssl.h
+Copyright: 2011, Heinrich Müller <henmull at src.gnome.org>
+ 2002-2006, Charles Kerr <charles at rebelbase.com>
+ 2002, vjt (irssi project)
+License: GPL-2
+
+Files: pan/tasks/task-article.cc
+ pan/tasks/task-article.h
+ pan/tasks/task-upload.cc
+ pan/tasks/task-upload.h
+Copyright: 2007, Calin Culianu <calin at ajvar.org>
+ 2002-2007, Charles Kerr <charles at rebelbase.com>
+License: GPL-2
+
+Files: pan/usenet-utils/MersenneTwister.h
+Copyright: 2000-2009, Richard J. Wagner
+ 1997-2002, Makoto Matsumoto and Takuji Nishimura
+License: BSD-2-clause
+
+Files: pan/usenet-utils/ssl-utils.h
+Copyright: 2011, Heinrich Müller <henmull at src.gnome.org>
+ 2002-2006, Charles Kerr <charles at rebelbase.com>
+ 2002-2005, 2007, 2008, 2010, Free Software
+ 2002, vjt (irssi project)
+License: GPL-2
+
+Files: uulib/crc32.c
+Copyright: 1995-2005, Mark Adler
+License: Zlib
+
+Files: uulib/fptools.*
+Copyright: Unknown
+License: GPL-1
+Comment: No copyright owner is specified in the files. Only the license is mentioned.
+
+License: BSD-2-clause
+ yada yada
+
+License: GPL-1
+ 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 1, February 1989
+ .
+ On Debian systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'.
+
+License: GPL-2
+ 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 2 dated June, 1991.
+ .
+ On Debian systems, the complete text of version 2 of the GNU General
+ Public License can be found in '/usr/share/common-licenses/GPL-2'.
+
+License: GPL-2+
+ 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 2 dated June, 1991, or (at your
+ option) any later version.
+ .
+ On Debian systems, the complete text of version 2 of the GNU General
+ Public License can be found in '/usr/share/common-licenses/GPL-2'.
+
+License: LGPL-2
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published by the
+ Free Software Foundation; version 2 of the License.
+ .
+ On Debian systems, the complete text of version 2 of the GNU Library
+ Public License can be found in `/usr/share/common-licenses/LGPL-2'.
+
+License: LGPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or (at
+ your option) any later version.
+ .
+ On Debian systems, the complete text of version 2 of the GNU Lesser
+ Public License can be found in `/usr/share/common-licenses/LGPL-2'.
+
+License: LGPL-2.1
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by the
+ Free Software Foundation; version 2.1 of the License.
+ .
+ On Debian systems, the complete text of version 2.1 of the GNU Lesser
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+License: LGPL-3
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published by the
+ Free Software Foundation; version 3 of the License.
+ .
+ On Debian systems, the complete text of version 3 of the GNU Library
+ Public License can be found in `/usr/share/common-licenses/LGPL-3'.
+
+License: Zlib
+ yada yada
diff --git a/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/debian/fix.scanned.copyright b/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/debian/fix.scanned.copyright
new file mode 100644
index 0000000..eee7d7c
--- /dev/null
+++ b/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/debian/fix.scanned.copyright
@@ -0,0 +1,7 @@
+# MIT license text is filled by Config::Model
+#! copyright License:MIT
+#
+! copyright Files:"pan/general/map-vector.h" Copyright=~"s/\n.*Addison-Wesley//"
+# License short_name=MIT full_license~
+#! copyright Files:~/.*/ Copyright=~s/\s*all\s*rights\s*reserved\s*//i
+
diff --git a/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/debian/rules b/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/debian/rules
new file mode 100755
index 0000000..c949e44
--- /dev/null
+++ b/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+ dh $@ --with autotools-dev
+
+# --with-gnutls is forbidden until pan goes to license GPL-2+ (#699892)
+override_dh_auto_configure:
+ dh_auto_configure -- --enable-gkr --enable-silent-rules --enable-libnotify --with-dbus
\ No newline at end of file
diff --git a/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/debian/source/format b/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/t/model_tests.d/dpkg-examples/pan-copyright-upgrade-update/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 ddf5f82..3111cb5 100644
--- a/t/model_tests.d/dpkg-test-conf.pl
+++ b/t/model_tests.d/dpkg-test-conf.pl
@@ -68,6 +68,27 @@ my $del_home = sub {
"copyright License:GPL-2 text" => qr/GNU/,
},
file_check_sub => $del_home,
+ },
+ {
+ # should that be pan-copyright-upgrate ? :-p
+ name => 'pan-copyright-upgrade-update',
+ update => { in => path('t/scanner/examples/pan.in') },
+ check => {
+ "copyright License:GPL-2 text" => {value => undef, mode => 'custom'},
+ "copyright License:GPL-2 text" => qr/GNU/,
+ 'copyright Files:pan/general/map-vector.h Copyright' => "2001, Andrei Alexandrescu",
+ 'copyright Files:pan/general/map-vector.h License short_name' => 'show-copyright',
+ 'copyright Files:pan/general/map-vector.h License full_license'
+ => 'yada yada show-copyright stuff',
+ 'copyright Files:pan/general/sorted-vector.h Copyright'
+ => '2002, Martin Holzherr (holzherr at infobrain.com).',
+ 'copyright Files:pan/general/sorted-vector.h License short_name' => 'public-domain'
+ },
+ wr_check => {
+ "copyright License:GPL-2 text" => {value => undef, mode => 'custom'},
+ "copyright License:GPL-2 text" => qr/GNU/,
+ },
+ file_check_sub => $del_home,
}
);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.git
More information about the Pkg-perl-cvs-commits
mailing list