[libconfig-model-dpkg-perl] 08/11: test copyright update from scratch + fix.scanned.copyright

dod at debian.org dod at debian.org
Fri Mar 20 16:25:54 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 6232c0a07b787fa16c18f8b55903c28ddd885da0
Author: Dominique Dumont <dod at debian.org>
Date:   Mon Mar 16 19:30:26 2015 +0100

    test copyright update from scratch + fix.scanned.copyright
---
 t/model_tests.d/dependency-cache.txt               |  8 ++++++
 .../pan-copyright-from-scratch/debian/compat       |  1 +
 .../pan-copyright-from-scratch/debian/control      | 30 ++++++++++++++++++++++
 .../pan-copyright-from-scratch/debian/copyright    |  0
 .../debian/fix.scanned.copyright                   |  7 +++++
 .../pan-copyright-from-scratch/debian/rules        | 17 ++++++++++++
 .../debian/source/format                           |  1 +
 .../pan-copyright-from-scratch/debian/watch        |  2 ++
 t/model_tests.d/dpkg-test-conf.pl                  | 18 +++++++++++++
 9 files changed, 84 insertions(+)

diff --git a/t/model_tests.d/dependency-cache.txt b/t/model_tests.d/dependency-cache.txt
index 24b402e..145a031 100644
--- a/t/model_tests.d/dependency-cache.txt
+++ b/t/model_tests.d/dependency-cache.txt
@@ -1,3 +1,4 @@
+autotools-dev => squeeze 20100122.1 wheezy 20120608.1 jessie 20140911.1 sid 20140911.1
 clustalw => etch/non-free 1.83-1.2 lenny/non-free 2.0.9-1 squeeze/non-free 2.0.12-1 wheezy 2.1+lgpl-2 sid 2.1+lgpl-2 sid 2.1+lgpl-2+b1
 debhelper => squeeze 8.0.0 squeeze-backports 9.20120909~bpo60+1 wheezy 9.20120909 jessie 9.20120909 sid 9.20130518
 dh-autoreconf => squeeze 2 wheezy 7 sid 7
@@ -6,7 +7,9 @@ dpkg-dev => squeeze 1.15.8.13 squeeze-backports 1.16.1.2~bpo60+1 wheezy 1.16.9 s
 frozen-bubble => etch 2.1.0-1 lenny 2.1.0-2 lenny 2.1.0-2+b1 squeeze 2.2.0-2 wheezy 2.2.0-2 sid 2.2.0-2 wheezy 2.2.0-2+b1 sid 2.2.0-2+b1
 gcc-4.6 => wheezy 4.6.3-11 sid 4.6.3-14
 gdm => etch 2.16.4-1 lenny 2.20.7-4lenny1 squeeze 2.20.11-4 wheezy 2.20.11-4
+gnome-keyring => squeeze 2.30.3-5 wheezy 3.4.1-5 sid 3.12.2-1 jessie 3.14.0-1+b1 sid 3.14.0-1+b1
 hal => lenny 0.5.11-8 squeeze 0.5.14-3 wheezy 0.5.14-5 sid 0.5.14-5
+intltool => squeeze 0.41.1-1 wheezy 0.50.2-2 jessie 0.50.2-2 sid 0.50.2-2
 libalien-wxwidgets-perl => lenny 0.37-1 squeeze 0.50+dfsg-1 wheezy 0.54+dfsg-1 sid 0.54+dfsg-1
 libatk1.0-dev => lenny 1.22.0-1 backports/lenny 1.30.0-1~bpo50+1 squeeze 1.30.0-1 wheezy 2.2.0-2 sid 2.2.0-2 wheezy 2.2.0-2+b1 sid 2.2.0-2+b1 experimental 2.3.93-1
 libcairo-perl => lenny 1.060-1 squeeze 1.070-1 wheezy 1.090-1 sid 1.090-1
@@ -17,6 +20,7 @@ libconfig-model-perl => squeeze 1.205-1 wheezy 1.244-1 sid 1.247-1
 libconfig-model-tkui-perl => squeeze 1.310-1 wheezy 1.324-1 sid 1.324-1
 libcpan-meta-perl => squeeze 2.101670-1 sid 2.102400-1
 libdata-types-perl => squeeze 0.08-1 wheezy 0.09-1 sid 0.09-1
+libdbus-1-dev => squeeze 1.2.24-4+squeeze2 squeeze-lts 1.2.24-4+squeeze3 wheezy 1.6.8-1+deb7u5 wheezy-p-u 1.6.8-1+deb7u6 wheezy-security 1.6.8-1+deb7u6 jessie 1.8.16-1 sid 1.8.16-1 experimental 1.9.14-1
 libdist-zilla-perl => squeeze 4.101900-1 sid 4.200000-1
 libdmx-dev => etch 1:1.0.2-2 lenny 1:1.0.2-3 squeeze 1:1.1.0-2 wheezy 1:1.1.1-1 sid 1:1.1.1-1
 libextutils-depends-perl => lenny 0.300-1 squeeze 0.301-1 wheezy 0.304-1 sid 0.304-1
@@ -39,7 +43,10 @@ libglib-perl => lenny 1:1.190-2 squeeze 2:1.223-1 backports/squeeze 2:1.242-1~bp
 libglib2.0-dev => lenny-security 2.16.6-1+lenny1 lenny 2.16.6-3 backports/lenny 2.22.4-1~bpo50+1 backports/lenny 2.24.2-1~bpo50+1 squeeze 2.24.2-1 wheezy 2.30.2-6 sid 2.30.2-6 experimental 2.31.20-1
 libglu1-mesa => etch 6.5.1-0.6 lenny 7.0.3-7 squeeze 7.7.1-4 wheezy 7.7.1-4 sid 7.10-4
 libglu1-mesa-dev => etch 6.5.1-0.6 lenny 7.0.3-7 squeeze 7.7.1-4 wheezy 7.7.1-4 sid 7.10-4
+libgmime-2.6-dev => squeeze-backports 2.6.7-1~bpo60+1 wheezy 2.6.10-1 jessie 2.6.20-1+b1 sid 2.6.20-1+b1
+libgnome-keyring-dev => squeeze 2.30.1-1 wheezy 3.4.1-1 sid 3.12.0-1 jessie 3.12.0-1+b1 sid 3.12.0-1+b1
 libgtk2.0-dev => lenny 2.12.12-1~lenny2 backports/lenny 2.18.6-1~bpo50+1 backports/lenny 2.20.1-2~bpo50+1 squeeze 2.20.1-2 wheezy 2.24.10-1 sid 2.24.10-1
+libgtkspell-dev => squeeze 2.0.16-1 wheezy 2.0.16-1 jessie 2.0.16-1.1 sid 2.0.16-1.1
 libice-dev => etch 1:1.0.1-2 lenny 2:1.0.4-1 squeeze 2:1.0.6-2 wheezy 2:1.0.7-1 sid 2:1.0.7-1
 libjpeg62-dev => etch 6b-13 lenny 6b-14 squeeze 6b1-1 wheezy 6b1-1 sid 6b1-1
 liblog-log4perl-perl => etch 1.07-1 lenny 1.16-1 squeeze 1.29-1 wheezy 1.29-1 sid 1.29-1
@@ -47,6 +54,7 @@ libmodule-build-perl => etch 0.26-1 backports/etch 0.2808.01-2~bpo40+1 lenny 0.2
 libmoose-autobox-perl => squeeze 0.11-1 sid 0.11-1
 libmoose-perl => lenny 0.54-1 backports/lenny 1.05-1~bpo50+1 squeeze 1.09-2 sid 1.21-1
 libnamespace-autoclean-perl => squeeze 0.09-1 wheezy 0.12-2 sid 0.12-2
+libnotify-dev => squeeze 0.5.0-2 wheezy 0.7.5-1 jessie 0.7.6-2 sid 0.7.6-2
 libpango1.0-dev => lenny-security 1.20.5-3+lenny1 lenny-security 1.20.5-5+lenny1 lenny 1.20.5-6 squeeze-security 1.28.3-1+squeeze2 squeeze 1.28.3-1+squeeze2 wheezy 1.29.4-2 sid 1.29.4-2 wheezy 1.29.4-2+b1 sid 1.29.4-2+b1
 libpath-class-perl => etch 0.15-1 lenny 0.16-0.1 squeeze 0.19-1 wheezy 0.23-1 sid 0.23-1
 libpng-dev => experimental 1.5.7-2 experimental 1.5.9-1
diff --git a/t/model_tests.d/dpkg-examples/pan-copyright-from-scratch/debian/compat b/t/model_tests.d/dpkg-examples/pan-copyright-from-scratch/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/t/model_tests.d/dpkg-examples/pan-copyright-from-scratch/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/t/model_tests.d/dpkg-examples/pan-copyright-from-scratch/debian/control b/t/model_tests.d/dpkg-examples/pan-copyright-from-scratch/debian/control
new file mode 100644
index 0000000..aa735d3
--- /dev/null
+++ b/t/model_tests.d/dpkg-examples/pan-copyright-from-scratch/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-from-scratch/debian/copyright b/t/model_tests.d/dpkg-examples/pan-copyright-from-scratch/debian/copyright
new file mode 100644
index 0000000..e69de29
diff --git a/t/model_tests.d/dpkg-examples/pan-copyright-from-scratch/debian/fix.scanned.copyright b/t/model_tests.d/dpkg-examples/pan-copyright-from-scratch/debian/fix.scanned.copyright
new file mode 100644
index 0000000..f3c5ee4
--- /dev/null
+++ b/t/model_tests.d/dpkg-examples/pan-copyright-from-scratch/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="2001,Andrei Alexandrescu"
+  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-from-scratch/debian/rules b/t/model_tests.d/dpkg-examples/pan-copyright-from-scratch/debian/rules
new file mode 100755
index 0000000..c949e44
--- /dev/null
+++ b/t/model_tests.d/dpkg-examples/pan-copyright-from-scratch/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-from-scratch/debian/source/format b/t/model_tests.d/dpkg-examples/pan-copyright-from-scratch/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/t/model_tests.d/dpkg-examples/pan-copyright-from-scratch/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/t/model_tests.d/dpkg-examples/pan-copyright-from-scratch/debian/watch b/t/model_tests.d/dpkg-examples/pan-copyright-from-scratch/debian/watch
new file mode 100644
index 0000000..7f34860
--- /dev/null
+++ b/t/model_tests.d/dpkg-examples/pan-copyright-from-scratch/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://pan.rebelbase.com/download/releases/(\d\.\d+)/source/pan-(.*)\.tar\.bz2
\ No newline at end of file
diff --git a/t/model_tests.d/dpkg-test-conf.pl b/t/model_tests.d/dpkg-test-conf.pl
index cff9281..ddf5f82 100644
--- a/t/model_tests.d/dpkg-test-conf.pl
+++ b/t/model_tests.d/dpkg-test-conf.pl
@@ -50,6 +50,24 @@ my $del_home = sub {
             'control source Build-Depends-Indep:1', => 'libdist-zilla-perl',
         },
         file_check_sub => $del_home,
+    },
+    {
+        name => 'pan-copyright-from-scratch',
+        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' => 'MIT',
+            'copyright Files:pan/general/map-vector.h License full_license' => undef,
+            'copyright Files:pan/general/sorted-vector.h Copyright' =>
+            '2002, Martin Holzherr (holzherr at infobrain.com).'
+        },
+        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