cme Package - php-net-sieve

Ready changes

Merge these changes:

Diff

diff --git a/debian/control b/debian/control
index a45f507..3331770 100644
--- a/debian/control
+++ b/debian/control
@@ -1,22 +1,24 @@
 Source: php-net-sieve
-Section: php
-Priority: optional
 Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org>
 Uploaders: Prach Pongpanich <prach@debian.org>,
            Guilhem Moulin <guilhem@debian.org>
+Section: php
+Priority: optional
 Build-Depends: debhelper-compat (= 13),
                php-net-socket <!nocheck>,
                phpunit <!nocheck>,
                pkg-php-tools
 Standards-Version: 4.5.1
-Vcs-Git: https://salsa.debian.org/php-team/pear/php-net-sieve.git -b debian/latest
 Vcs-Browser: https://salsa.debian.org/php-team/pear/php-net-sieve
+Vcs-Git: https://salsa.debian.org/php-team/pear/php-net-sieve.git -b debian/latest
 Homepage: https://pear.php.net/package/Net_Sieve
 Rules-Requires-Root: no
 
 Package: php-net-sieve
 Architecture: all
-Depends: php-pear, ${misc:Depends}, ${phppear:Debian-Depends}
+Depends: php-pear,
+         ${misc:Depends},
+         ${phppear:Debian-Depends}
 Recommends: ${phppear:Debian-Recommends}
 Suggests: ${phppear:Debian-Suggests}
 Breaks: ${phppear:Debian-Breaks}
diff --git a/debian/copyright b/debian/copyright
index 600842c..6106d37 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Net_Sieve
 Upstream-Contact: Jan Schneider <jan@horde.org>
 Source: https://github.com/pear/Net_Sieve
-Upstream-Name: Net_Sieve
 
 Files: *
 Copyright: 2002-2003, Richard Heyes <richard@phpguru.org>
@@ -18,7 +18,7 @@ Files: Net_Sieve-*/tests/SieveTest.php
 Copyright: 2006, Anish Mistry <amistry@am-productions.biz>
 License: BSD-2-clause
 
-License: BSD-3-clause
+License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -27,8 +27,6 @@ License: BSD-3-clause
  2. Redistributions in binary form must reproduce the above copyright
  notice, this list of conditions and the following disclaimer in the
  documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
  .
  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -41,7 +39,7 @@ License: BSD-3-clause
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: BSD-2-clause
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -50,6 +48,8 @@ License: BSD-2-clause
  2. Redistributions in binary form must reproduce the above copyright
  notice, this list of conditions and the following disclaimer in the
  documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
  .
  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff --git a/debian/patches/Fix-FTBFS-with-phpunit-8.5.13-1.patch b/debian/patches/Fix-FTBFS-with-phpunit-8.5.13-1.patch
index ad243d2..35c7bab 100644
--- a/debian/patches/Fix-FTBFS-with-phpunit-8.5.13-1.patch
+++ b/debian/patches/Fix-FTBFS-with-phpunit-8.5.13-1.patch
@@ -1,6 +1,8 @@
+Subject: Fix FTBFS with phpunit 8.5.13-1
 From: Guilhem Moulin <guilhem@debian.org>
+
 Date: Sun, 20 Dec 2020 00:18:37 +0100
-Subject: Fix FTBFS with phpunit 8.5.13-1
+
 
 ---
  Net_Sieve-1.4.4/tests/SieveTest.php | 6 +++---

Run locally

Try this locally (using silver-platter):

debian-svp cme-fix php-net-sieve 

More details

Full run details