diff -Nru 2vcard-0.6/debian/changelog 2vcard-0.6/debian/changelog --- 2vcard-0.6/debian/changelog 2015-12-13 11:09:38.000000000 +0000 +++ 2vcard-0.6/debian/changelog 2019-07-15 01:26:08.000000000 +0000 @@ -1,3 +1,35 @@ +2vcard (0.6-2) unstable; urgency=medium + + * QA upload. + * Set Debian QA Group as maintainer. (see #855563) + * Using new DH level format. Consequently: + - debian/compat: removed. + - debian/control: changed from 'debhelper' to 'debhelper-compat' in + Build-Depends field and bumped level to 12. + * debian/control: + - Bumped Standards-Version to 4.4.0. + - Dropped ${shlibs:Depends} variable, not needed for Perl. + - Little adjustments in description. + - Updated the Homepage field to use https. + - Updated VCS fields to point to Salsa. + * debian/copyright: + - Added new rights in debian/* section. + - Updated packaging copyright years. + - Updated the URI in Source field. + - Updated upstream copyright years. + - Using https in Format field. + * debian/docs: + - Removed CHANGES, not needed inside this file. + - Sorted the content. + * debian/patches/: added a serial number to all patch names. + * debian/rules: added an override to avoid a FTBFS. + * debian/tests/control: added to provide a basic test. + * debian/watch: + - Bumped to version 4. + - Improved thr rule and using https. + + -- Joao Eriberto Mota Filho Sun, 14 Jul 2019 22:26:08 -0300 + 2vcard (0.6-1) unstable; urgency=medium * New upstream version @@ -47,10 +79,10 @@ * New co-maintainer: me!! -- Marcela Tiznado Thu, 31 Jan 2008 21:23:27 -0200 - + 2vcard (0.5-1) unstable; urgency=low * Initial Release. (Closes: #428286) Taken from Ubuntu package 2vcard (0.5-1ubuntu1) - + -- Martin Albisetti Sun, 10 Jun 2007 13:16:59 +0100 diff -Nru 2vcard-0.6/debian/compat 2vcard-0.6/debian/compat --- 2vcard-0.6/debian/compat 2015-12-13 11:09:38.000000000 +0000 +++ 2vcard-0.6/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru 2vcard-0.6/debian/control 2vcard-0.6/debian/control --- 2vcard-0.6/debian/control 2015-12-13 11:09:38.000000000 +0000 +++ 2vcard-0.6/debian/control 2019-07-15 01:26:08.000000000 +0000 @@ -1,17 +1,19 @@ Source: 2vcard Section: utils Priority: optional -Maintainer: Riley Baird -Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.6 -Homepage: http://www.netmeister.org/apps/2vcard/ -Vcs-Git: git://anonscm.debian.org/collab-maint/2vcard.git -Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/2vcard.git +Maintainer: Debian QA Group +Build-Depends: debhelper-compat (= 12) +Standards-Version: 4.4.0 +Homepage: https://www.netmeister.org/apps/2vcard/ +Vcs-Browser: https://salsa.debian.org/debian/2vcard +Vcs-Git: https://salsa.debian.org/debian/2vcard.git Package: 2vcard Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends} -Description: perl script to convert an addressbook to VCARD file format - 2vcard converts address books and alias files into the widely-used vCard - format. Currently it can convert from abook, Eudora, Juno, LDIF, mutt, - mh and pine. +Depends: ${misc:Depends}, ${perl:Depends} +Description: convert an addressbook to VCARD file format + 2vcard converts address books and alias files into the widely-used + vCard format. Currently it can convert from abook, Eudora, Juno, + LDIF, mutt, mh and pine. + . + 2vcard was developed using Perl. diff -Nru 2vcard-0.6/debian/copyright 2vcard-0.6/debian/copyright --- 2vcard-0.6/debian/copyright 2015-12-13 11:09:38.000000000 +0000 +++ 2vcard-0.6/debian/copyright 2019-07-15 01:26:08.000000000 +0000 @@ -1,21 +1,22 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: 2vcard -Source: http://www.netmeister.org/apps/2vcard/ - +Source: https://www.netmeister.org/apps/ + Files: * -Copyright: 2001, 2002, 2003 Jan Schaumann -License: BSD-3-clause +Copyright: 2001-2015 Jan Schaumann +License: BSD-3-Clause Files: debian/* Copyright: 2007 Martin Albisetti 2008 Marcela Tiznado ? Arvin Autar 2015 Riley Baird -License: BSD-3-clause + 2019 Joao Eriberto Mota Filho +License: BSD-3-Clause Comment: Arvin Autar made the Ubuntu package from which the Debian package was originally based. -License: BSD-3-clause +License: BSD-3-Clause All rights reserved. . Redistribution and use in source and binary forms, with or without @@ -39,4 +40,4 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file + POSSIBILITY OF SUCH DAMAGE. diff -Nru 2vcard-0.6/debian/doc-base 2vcard-0.6/debian/doc-base --- 2vcard-0.6/debian/doc-base 2015-12-13 11:09:38.000000000 +0000 +++ 2vcard-0.6/debian/doc-base 2019-07-15 01:26:08.000000000 +0000 @@ -1,9 +1,9 @@ Document: 2vcard-handbook Title: The 2vcard Handbook Author: Jan Schaumann -Abstract: This handbook is a quick guide to the 2vcard software. +Abstract: This handbook is a quick guide to the 2vcard software. Section: Data Management Format: HTML Index: /usr/share/doc/2vcard/html/index.html -Files: /usr/share/doc/2vcard/html/*.html \ No newline at end of file +Files: /usr/share/doc/2vcard/html/*.html diff -Nru 2vcard-0.6/debian/docs 2vcard-0.6/debian/docs --- 2vcard-0.6/debian/docs 2015-12-13 11:09:38.000000000 +0000 +++ 2vcard-0.6/debian/docs 2019-07-15 01:26:08.000000000 +0000 @@ -1,4 +1,3 @@ -README AUTHORS -CHANGES +README doc/html diff -Nru 2vcard-0.6/debian/patches/01_change-perl-path.patch 2vcard-0.6/debian/patches/01_change-perl-path.patch --- 2vcard-0.6/debian/patches/01_change-perl-path.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2vcard-0.6/debian/patches/01_change-perl-path.patch 2019-07-15 01:26:08.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Change the perl path to the one used by Debian + As of version 0.6, the default perl path is /usr/pkg/bin/perl. While + this is used by NetBSD's pkgsrc, on Debian the perl path must be + /usr/bin/perl. +Author: Riley Baird +Last-Update: 2015-12-13 +Index: 2vcard/src/2vcard +=================================================================== +--- 2vcard.orig/src/2vcard ++++ 2vcard/src/2vcard +@@ -1,4 +1,4 @@ +-#!/usr/pkg/bin/perl -w ++#!/usr/bin/perl -w + use strict; + # Hint from http://www.seligma.com/download/palm-ldif2csv + use MIME::Base64; diff -Nru 2vcard-0.6/debian/patches/02_fix-w3c-error.patch 2vcard-0.6/debian/patches/02_fix-w3c-error.patch --- 2vcard-0.6/debian/patches/02_fix-w3c-error.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2vcard-0.6/debian/patches/02_fix-w3c-error.patch 2019-07-15 01:26:08.000000000 +0000 @@ -0,0 +1,100 @@ +Description: Remove the w3c validation notices from the documentation + This is necessary to fix the lintian error privacy-breach-w3c-valid-html +Author: Riley Baird +Last-Update: 2015-06-04 +Index: 2vcard-0.5/doc/html/index-1.html +=================================================================== +--- 2vcard-0.5.orig/doc/html/index-1.html 2003-06-22 08:33:02.000000000 +1000 ++++ 2vcard-0.5/doc/html/index-1.html 2015-06-04 16:46:42.775501897 +1000 +@@ -42,11 +42,6 @@ + +

Next Previous Table of Contents

+-
+- +-

+-

+ + + +Index: 2vcard-0.5/doc/html/index-2.html +=================================================================== +--- 2vcard-0.5.orig/doc/html/index-2.html 2003-03-09 09:17:07.000000000 +1100 ++++ 2vcard-0.5/doc/html/index-2.html 2015-06-04 16:46:50.795620845 +1000 +@@ -93,11 +93,6 @@ +

Next Previous Table of + Contents

+-
+- +-

+-

+ + + +Index: 2vcard-0.5/doc/html/index-3.html +=================================================================== +--- 2vcard-0.5.orig/doc/html/index-3.html 2003-06-22 08:33:57.000000000 +1000 ++++ 2vcard-0.5/doc/html/index-3.html 2015-06-04 16:47:01.115774083 +1000 +@@ -48,11 +48,6 @@ +

Next Previous Table of + Contents

+-
+- +-

+-

+ + + +Index: 2vcard-0.5/doc/html/index-4.html +=================================================================== +--- 2vcard-0.5.orig/doc/html/index-4.html 2003-03-09 09:17:20.000000000 +1100 ++++ 2vcard-0.5/doc/html/index-4.html 2015-06-04 16:47:10.171908708 +1000 +@@ -61,11 +61,6 @@ +

Next Previous Table of + Contents

+-
+- +-

+-

+ + + +Index: 2vcard-0.5/doc/html/index-5.html +=================================================================== +--- 2vcard-0.5.orig/doc/html/index-5.html 2001-10-11 12:05:26.000000000 +1000 ++++ 2vcard-0.5/doc/html/index-5.html 2015-06-04 16:47:27.548167406 +1000 +@@ -51,11 +51,6 @@ + +

Next Previous Table of Contents

+-
+- +-

+-

+ + + +Index: 2vcard-0.5/doc/html/index.html +=================================================================== +--- 2vcard-0.5.orig/doc/html/index.html 2003-06-22 08:34:26.000000000 +1000 ++++ 2vcard-0.5/doc/html/index.html 2015-06-04 16:46:33.407363110 +1000 +@@ -64,11 +64,6 @@ + +

Next Previous Table + of Contents

+-
+- +-

+-

+ + + diff -Nru 2vcard-0.6/debian/patches/03_fhs-compliance.patch 2vcard-0.6/debian/patches/03_fhs-compliance.patch --- 2vcard-0.6/debian/patches/03_fhs-compliance.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2vcard-0.6/debian/patches/03_fhs-compliance.patch 2019-07-15 01:26:08.000000000 +0000 @@ -0,0 +1,31 @@ +Description: Make the installation paths match the FHS + This patch changes the default installation locations so that they match + Debian's Filesystem Hierarchy Standard. + . + Similar changes were already made in previous versions of 2vcard; I just + transformed them into a patch. +Author: Riley Baird +Last-Update: 2015-06-04 +Index: 2vcard-0.5/Makefile +=================================================================== +--- 2vcard-0.5.orig/Makefile 2002-11-29 04:11:59.000000000 +1100 ++++ 2vcard-0.5/Makefile 2015-06-04 16:53:20.341490926 +1000 +@@ -1,8 +1,7 @@ +-DOC = doc/html/index.html doc/html/index-1.html doc/html/index-2.html \ +- doc/html/index-3.html doc/html/index-4.html doc/html/index-5.html ++DOC = doc/html + +-INSTALL = install -c -m 644 +-PREFIX= /usr/local ++INSTALL = install -d -m 644 ++PREFIX= $(DESTDIR)/usr + + all: + +@@ -11,5 +10,5 @@ + install -d $(PREFIX)/share/man/man1 + install -d $(PREFIX)/share/doc/2vcard + install -c -m 755 src/2vcard $(PREFIX)/bin +- $(INSTALL) doc/2vcard.1 $(PREFIX)/share/man/man1 ++ install -c -m 644 doc/2vcard.1 $(PREFIX)/share/man/man1 + $(INSTALL) $(DOC) $(PREFIX)/share/doc/2vcard diff -Nru 2vcard-0.6/debian/patches/change-perl-path.patch 2vcard-0.6/debian/patches/change-perl-path.patch --- 2vcard-0.6/debian/patches/change-perl-path.patch 2015-12-13 11:09:38.000000000 +0000 +++ 2vcard-0.6/debian/patches/change-perl-path.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Description: Change the perl path to the one used by Debian - As of version 0.6, the default perl path is /usr/pkg/bin/perl. While - this is used by NetBSD's pkgsrc, on Debian the perl path must be - /usr/bin/perl. -Author: Riley Baird -Last-Update: 2015-12-13 -Index: 2vcard/src/2vcard -=================================================================== ---- 2vcard.orig/src/2vcard -+++ 2vcard/src/2vcard -@@ -1,4 +1,4 @@ --#!/usr/pkg/bin/perl -w -+#!/usr/bin/perl -w - use strict; - # Hint from http://www.seligma.com/download/palm-ldif2csv - use MIME::Base64; diff -Nru 2vcard-0.6/debian/patches/fhs-compliance.patch 2vcard-0.6/debian/patches/fhs-compliance.patch --- 2vcard-0.6/debian/patches/fhs-compliance.patch 2015-12-13 11:09:38.000000000 +0000 +++ 2vcard-0.6/debian/patches/fhs-compliance.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -Description: Make the installation paths match the FHS - This patch changes the default installation locations so that they match - Debian's Filesystem Hierarchy Standard. - . - Similar changes were already made in previous versions of 2vcard; I just - transformed them into a patch. -Author: Riley Baird -Last-Update: 2015-06-04 -Index: 2vcard-0.5/Makefile -=================================================================== ---- 2vcard-0.5.orig/Makefile 2002-11-29 04:11:59.000000000 +1100 -+++ 2vcard-0.5/Makefile 2015-06-04 16:53:20.341490926 +1000 -@@ -1,8 +1,7 @@ --DOC = doc/html/index.html doc/html/index-1.html doc/html/index-2.html \ -- doc/html/index-3.html doc/html/index-4.html doc/html/index-5.html -+DOC = doc/html - --INSTALL = install -c -m 644 --PREFIX= /usr/local -+INSTALL = install -d -m 644 -+PREFIX= $(DESTDIR)/usr - - all: - -@@ -11,5 +10,5 @@ - install -d $(PREFIX)/share/man/man1 - install -d $(PREFIX)/share/doc/2vcard - install -c -m 755 src/2vcard $(PREFIX)/bin -- $(INSTALL) doc/2vcard.1 $(PREFIX)/share/man/man1 -+ install -c -m 644 doc/2vcard.1 $(PREFIX)/share/man/man1 - $(INSTALL) $(DOC) $(PREFIX)/share/doc/2vcard diff -Nru 2vcard-0.6/debian/patches/fix-w3c-error.patch 2vcard-0.6/debian/patches/fix-w3c-error.patch --- 2vcard-0.6/debian/patches/fix-w3c-error.patch 2015-12-13 11:09:38.000000000 +0000 +++ 2vcard-0.6/debian/patches/fix-w3c-error.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,100 +0,0 @@ -Description: Remove the w3c validation notices from the documentation - This is necessary to fix the lintian error privacy-breach-w3c-valid-html -Author: Riley Baird -Last-Update: 2015-06-04 -Index: 2vcard-0.5/doc/html/index-1.html -=================================================================== ---- 2vcard-0.5.orig/doc/html/index-1.html 2003-06-22 08:33:02.000000000 +1000 -+++ 2vcard-0.5/doc/html/index-1.html 2015-06-04 16:46:42.775501897 +1000 -@@ -42,11 +42,6 @@ - -

Next Previous Table of Contents

--
-- --

--

- - - -Index: 2vcard-0.5/doc/html/index-2.html -=================================================================== ---- 2vcard-0.5.orig/doc/html/index-2.html 2003-03-09 09:17:07.000000000 +1100 -+++ 2vcard-0.5/doc/html/index-2.html 2015-06-04 16:46:50.795620845 +1000 -@@ -93,11 +93,6 @@ -

Next Previous Table of - Contents

--
-- --

--

- - - -Index: 2vcard-0.5/doc/html/index-3.html -=================================================================== ---- 2vcard-0.5.orig/doc/html/index-3.html 2003-06-22 08:33:57.000000000 +1000 -+++ 2vcard-0.5/doc/html/index-3.html 2015-06-04 16:47:01.115774083 +1000 -@@ -48,11 +48,6 @@ -

Next Previous Table of - Contents

--
-- --

--

- - - -Index: 2vcard-0.5/doc/html/index-4.html -=================================================================== ---- 2vcard-0.5.orig/doc/html/index-4.html 2003-03-09 09:17:20.000000000 +1100 -+++ 2vcard-0.5/doc/html/index-4.html 2015-06-04 16:47:10.171908708 +1000 -@@ -61,11 +61,6 @@ -

Next Previous Table of - Contents

--
-- --

--

- - - -Index: 2vcard-0.5/doc/html/index-5.html -=================================================================== ---- 2vcard-0.5.orig/doc/html/index-5.html 2001-10-11 12:05:26.000000000 +1000 -+++ 2vcard-0.5/doc/html/index-5.html 2015-06-04 16:47:27.548167406 +1000 -@@ -51,11 +51,6 @@ - -

Next Previous Table of Contents

--
-- --

--

- - - -Index: 2vcard-0.5/doc/html/index.html -=================================================================== ---- 2vcard-0.5.orig/doc/html/index.html 2003-06-22 08:34:26.000000000 +1000 -+++ 2vcard-0.5/doc/html/index.html 2015-06-04 16:46:33.407363110 +1000 -@@ -64,11 +64,6 @@ - -

Next Previous Table - of Contents

--
-- --

--

- - - diff -Nru 2vcard-0.6/debian/patches/series 2vcard-0.6/debian/patches/series --- 2vcard-0.6/debian/patches/series 2015-12-13 11:09:38.000000000 +0000 +++ 2vcard-0.6/debian/patches/series 2019-07-15 01:26:08.000000000 +0000 @@ -1,3 +1,3 @@ -change-perl-path.patch -fix-w3c-error.patch -fhs-compliance.patch +01_change-perl-path.patch +02_fix-w3c-error.patch +03_fhs-compliance.patch diff -Nru 2vcard-0.6/debian/rules 2vcard-0.6/debian/rules --- 2vcard-0.6/debian/rules 2015-12-13 11:09:38.000000000 +0000 +++ 2vcard-0.6/debian/rules 2019-07-15 01:26:08.000000000 +0000 @@ -1,4 +1,10 @@ #!/usr/bin/make -f %: - dh $@ \ No newline at end of file + dh $@ + +override_dh_auto_install: + # Override to avoid: + # install: WARNING: ignoring --strip-program option as -s option was not specified + # install: omitting directory 'doc/html' + $(MAKE) install DESTDIR=$(CURDIR)/debian/2vcard diff -Nru 2vcard-0.6/debian/source/format 2vcard-0.6/debian/source/format --- 2vcard-0.6/debian/source/format 2015-12-13 11:09:38.000000000 +0000 +++ 2vcard-0.6/debian/source/format 2019-07-15 01:26:08.000000000 +0000 @@ -1 +1 @@ -3.0 (quilt) \ No newline at end of file +3.0 (quilt) diff -Nru 2vcard-0.6/debian/tests/control 2vcard-0.6/debian/tests/control --- 2vcard-0.6/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ 2vcard-0.6/debian/tests/control 2019-07-15 01:26:08.000000000 +0000 @@ -0,0 +1 @@ +Test-Command: 2vcard -v diff -Nru 2vcard-0.6/debian/watch 2vcard-0.6/debian/watch --- 2vcard-0.6/debian/watch 2015-12-13 11:09:38.000000000 +0000 +++ 2vcard-0.6/debian/watch 2019-07-15 01:26:08.000000000 +0000 @@ -1,2 +1,2 @@ -version=3 -http://www.netmeister.org/apps/2vcard-(.*)\.tar\.gz +version=4 +https://www.netmeister.org/apps/2vcard-(\d\S+)\.tar\.(?:bz2|gz|xz)