diff -Nru nss-passwords-0.2/CHANGES.md nss-passwords-0.3/CHANGES.md --- nss-passwords-0.2/CHANGES.md 2014-09-06 11:14:42.000000000 +0000 +++ nss-passwords-0.3/CHANGES.md 2019-07-25 08:34:20.000000000 +0000 @@ -1,3 +1,8 @@ +0.3 (2019-07-25) +================ + + * Fix compilation with OCaml 4.02.2 + 0.2 (2014-09-06) ================ diff -Nru nss-passwords-0.2/debian/changelog nss-passwords-0.3/debian/changelog --- nss-passwords-0.2/debian/changelog 2018-05-03 15:20:23.000000000 +0000 +++ nss-passwords-0.3/debian/changelog 2019-07-25 09:17:03.000000000 +0000 @@ -1,14 +1,12 @@ -nss-passwords (0.2-2build2) cosmic; urgency=medium +nss-passwords (0.3-1) unstable; urgency=medium - * No-change rebuild for ncurses soname changes. + * New upstream release + * Update Vcs-* + * Bump Standards-Version to 4.4.0 + * Bump debhelper compat level to 12 + * Switch debian/copyright to format 1.0 - -- Matthias Klose Thu, 03 May 2018 15:20:23 +0000 - -nss-passwords (0.2-2build1) zesty; urgency=medium - - * No-change rebuild against libnspr4 - - -- Andy Whitcroft Fri, 24 Feb 2017 11:13:32 +0000 + -- Stéphane Glondu Thu, 25 Jul 2019 11:17:03 +0200 nss-passwords (0.2-2) unstable; urgency=medium diff -Nru nss-passwords-0.2/debian/compat nss-passwords-0.3/debian/compat --- nss-passwords-0.2/debian/compat 2016-01-05 21:53:31.000000000 +0000 +++ nss-passwords-0.3/debian/compat 2019-07-25 09:17:03.000000000 +0000 @@ -1 +1 @@ -8 +12 diff -Nru nss-passwords-0.2/debian/control nss-passwords-0.3/debian/control --- nss-passwords-0.2/debian/control 2016-01-05 21:53:31.000000000 +0000 +++ nss-passwords-0.3/debian/control 2019-07-25 09:17:03.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Debian OCaml Maintainers Uploaders: Stéphane Glondu Build-Depends: - debhelper (>= 8), + debhelper (>= 12), dh-ocaml (>= 0.9.6~), ocaml-findlib, pkg-config, @@ -14,10 +14,10 @@ libnspr4-dev, libnss3-dev, ocaml-nox (>= 3.11.1-3~) -Standards-Version: 3.9.2 +Standards-Version: 4.4.0 Homepage: https://github.com/glondu/nss-passwords -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/nss-passwords.git -Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/nss-passwords.git +Vcs-Git: https://salsa.debian.org/ocaml-team/nss-passwords.git +Vcs-Browser: https://salsa.debian.org/ocaml-team/nss-passwords Package: nss-passwords Architecture: any diff -Nru nss-passwords-0.2/debian/copyright nss-passwords-0.3/debian/copyright --- nss-passwords-0.2/debian/copyright 2016-01-05 21:53:31.000000000 +0000 +++ nss-passwords-0.3/debian/copyright 2019-07-25 09:17:03.000000000 +0000 @@ -1,28 +1,13 @@ -Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202 -Source: https://github.com/glondu/nss-passwords +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ + +Files: * +Copyright: © 2010-2019 Stéphane Glondu +License: MPL-1.1 or GPL-2 or LGPL-2.1 + +Files: nss_stubs.c +Copyright: © 1994-2000 Netscape Communications Corporation + © 2010 Stéphane Glondu License: MPL-1.1 or GPL-2 or LGPL-2.1 - This software is subject to the Mozilla Public License Version 1.1 - (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.mozilla.org/MPL/ - . - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and - limitations under the License. - . - Alternatively, the contents of this file may be used under the terms - of either the GNU General Public License Version 2 or later (the - "GPL"), or the GNU Lesser General Public License Version 2.1 or later - (the "LGPL"), in which case the provisions of the GPL or the LGPL are - applicable instead of those above. If you wish to allow use of your - version of this file only under the terms of either the GPL or the - LGPL, and not to allow others to use your version of this file under - the terms of the MPL, indicate your decision by deleting the - provisions above and replace them with the notice and other - provisions required by the GPL or the LGPL. If you do not delete the - provisions above, a recipient may use your version of this file under - the terms of any one of the MPL, the GPL or the LGPL. License: MPL-1.1 The complete text of the Mozilla Public License can be @@ -35,12 +20,3 @@ License: LGPL-2.1 The full text of the GNU Lesser General Public License Version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1' - -Files: * -Copyright: © 2010-2011 Stéphane Glondu -License: MPL-1.1 or GPL-2 or LGPL-2.1 - -Files: nss_stubs.c -Copyright: © 1994-2000 Netscape Communications Corporation - © 2010 Stéphane Glondu -License: MPL-1.1 or GPL-2 or LGPL-2.1 diff -Nru nss-passwords-0.2/debian/patches/0001-Fix-compilation-with-OCaml-4.02.2.patch nss-passwords-0.3/debian/patches/0001-Fix-compilation-with-OCaml-4.02.2.patch --- nss-passwords-0.2/debian/patches/0001-Fix-compilation-with-OCaml-4.02.2.patch 2016-01-05 21:53:31.000000000 +0000 +++ nss-passwords-0.3/debian/patches/0001-Fix-compilation-with-OCaml-4.02.2.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -From: Stephane Glondu -Date: Fri, 26 Jun 2015 15:43:56 +0200 -Subject: Fix compilation with OCaml 4.02.2 - -Define NO_NSPR_10_SUPPORT so that int64 and uint64 (declared by OCaml) -are not declared by NSPR. ---- - nss_stubs.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/nss_stubs.c b/nss_stubs.c -index 4cffa71..7494939 100644 ---- a/nss_stubs.c -+++ b/nss_stubs.c -@@ -36,6 +36,8 @@ - * - * ***** END LICENSE BLOCK ***** */ - -+#define NO_NSPR_10_SUPPORT -+ - #include - #include - #include --- diff -Nru nss-passwords-0.2/debian/patches/series nss-passwords-0.3/debian/patches/series --- nss-passwords-0.2/debian/patches/series 2016-01-05 21:53:31.000000000 +0000 +++ nss-passwords-0.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -0001-Fix-compilation-with-OCaml-4.02.2.patch diff -Nru nss-passwords-0.2/debian/rules nss-passwords-0.3/debian/rules --- nss-passwords-0.2/debian/rules 2016-01-05 21:53:31.000000000 +0000 +++ nss-passwords-0.3/debian/rules 2019-07-25 09:17:03.000000000 +0000 @@ -2,4 +2,4 @@ # -*- makefile -*- %: - dh $@ --with ocaml + dh $@ --with ocaml --no-parallel diff -Nru nss-passwords-0.2/nss_stubs.c nss-passwords-0.3/nss_stubs.c --- nss-passwords-0.2/nss_stubs.c 2014-09-06 11:14:42.000000000 +0000 +++ nss-passwords-0.3/nss_stubs.c 2019-07-25 08:34:20.000000000 +0000 @@ -36,6 +36,8 @@ * * ***** END LICENSE BLOCK ***** */ +#define NO_NSPR_10_SUPPORT + #include #include #include