[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.9.1_rc1+git20110514.347379b+dfsg-1-24-g7b84fd0

[Julien Valroff]

The following commit has been merged in the master branch:
commit 7b84fd0b834300f937a8796e20486bf81a39db38
Author: Julien Valroff <julien at kirya.net>
Date:   Sun Jul 3 07:23:05 2011 +0200

    Improve/fix copyright information

diff --git a/debian/control b/debian/control
index 6dc683c..98979a5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: mail
 Priority: optional
 Maintainer: Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>
 Uploaders: Julien Valroff <julien at debian.org>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 8.0.0),
                dh-autoreconf,
                libtool,
                automake,
diff --git a/debian/copyright b/debian/copyright
index e18bebb..bde0ab1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,9 +13,9 @@ License: GPL-2
 
 Files: src/util.c
 Copyright: 1983, 1993, The Regents of the University of California
-License: GPL-2 and BSD
-Comment: inet_ntoa_r() is under BSD license, the rest of the code is under
- GP-2 license
+License: GPL-2 and BSD-4-clause
+Comment: inet_ntoa_r() is under BSD-4-clause license, the rest of the
+ code is under GPL-2 license
 
 Files: contrib/dspam_maintenance/*
 Copyright: 2007-2010, Stevan Bajic <stevan at bajic.ch>
@@ -49,7 +49,7 @@ License: MPL
  License.
  .
  The complete text of the Mozilla Public License 1.1 can be found in the
- file `/usr/share/doc/dspam/MPL-1.1.gs'.
+ file `/usr/share/doc/dspam/MPL-1.1.gz'.
 
 Files: debian/*
 Copyright: 2005-2010, Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>
@@ -59,7 +59,7 @@ Files: debian/manpages/dspamc.1
 Copyright: 2004, Network Dweebs Corporation
 License: GPL-2
 
-License: BSD
+License: BSD-4-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:

-- 
Debian packages for the DSPAM anti-spam filter