diff -Nru recoverdm-0.20/debian/changelog recoverdm-0.20/debian/changelog --- recoverdm-0.20/debian/changelog 2020-02-29 19:24:03.000000000 +0000 +++ recoverdm-0.20/debian/changelog 2021-09-20 23:47:44.000000000 +0000 @@ -1,3 +1,30 @@ +recoverdm (0.20-8) unstable; urgency=medium + + * Team upload. + + [ Joao Eriberto Mota Filho ] + * debian/control: + - Bumped Standards-Version to 4.6.0.1. + - Migrated DH level to 13. + * debian/copyright: + - Added licensing for debian/manpage/create-man.sh. + - Updated packaging copyright years. + * debian/manpage/: + - Switched genallman.sh to create-man.sh (from txt2man). + - Removed files *.header, no longer needed. + - Regenerated the manpages. + * debian/upstream/metadata: removed fields about sites no longer available. + * debian/watch: added a fake site to explain about the current status of the + original upstream homepage. The original site no longer exists. + + [ Debian Janitor ] + * Remove obsolete fields Contact, Name from debian/upstream/metadata (already + present in machine-readable debian/copyright). + * Set field Upstream-Contact in debian/copyright. + * Use secure URI in Homepage field. + + -- Joao Eriberto Mota Filho Mon, 20 Sep 2021 20:47:44 -0300 + recoverdm (0.20-7) unstable; urgency=medium [ Thiago Andrade Marques ] diff -Nru recoverdm-0.20/debian/control recoverdm-0.20/debian/control --- recoverdm-0.20/debian/control 2020-02-29 19:24:03.000000000 +0000 +++ recoverdm-0.20/debian/control 2021-09-20 23:47:44.000000000 +0000 @@ -2,10 +2,10 @@ Section: utils Priority: optional Maintainer: Debian Security Tools -Build-Depends: debhelper-compat (= 12) -Standards-Version: 4.5.0 +Build-Depends: debhelper-compat (= 13) +Standards-Version: 4.6.0.1 Rules-Requires-Root: no -Homepage: http://www.vanheusden.com/recoverdm +Homepage: https://www.vanheusden.com/recoverdm Vcs-Browser: https://salsa.debian.org/pkg-security-team/recoverdm Vcs-Git: https://salsa.debian.org/pkg-security-team/recoverdm.git diff -Nru recoverdm-0.20/debian/copyright recoverdm-0.20/debian/copyright --- recoverdm-0.20/debian/copyright 2020-02-29 19:24:03.000000000 +0000 +++ recoverdm-0.20/debian/copyright 2021-09-20 23:47:44.000000000 +0000 @@ -1,6 +1,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: recoverdm Source: http://www.vanheusden.com/recoverdm +Upstream-Contact: https://www.vanheusden.com/feedbackform.php?subject=recoverdm Files: * Copyright: 2003-2004 Folkert van Heusden @@ -9,11 +10,15 @@ Files: debian/* Copyright: 2008 Christophe Monniez 2008-2009 Daniel Baumann - 2015-2017 Joao Eriberto Mota Filho + 2015-2021 Joao Eriberto Mota Filho 2019-2020 Samuel Henrique 2020 Thiago Andrade Marques License: GPL-2+ +Files: debian/manpage/create-man.sh +Copyright: 2015-2020 Joao Eriberto Mota Filho +License: BSD-3-Clause + License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,3 +35,28 @@ . On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +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: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 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. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE HOLDERS OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS 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. diff -Nru recoverdm-0.20/debian/manpage/create-man.sh recoverdm-0.20/debian/manpage/create-man.sh --- recoverdm-0.20/debian/manpage/create-man.sh 1970-01-01 00:00:00.000000000 +0000 +++ recoverdm-0.20/debian/manpage/create-man.sh 2021-09-20 23:47:44.000000000 +0000 @@ -0,0 +1,29 @@ +#!/bin/bash + +# Copyright 2015-2020 Joao Eriberto Mota Filho +# Create a manpage using txt2man command. Version 2.0, 2020-06-19. +# This file is part of txt2man package for Debian. +# This script can be used under BSD-3-Clause license. + +#-------------------------------------------------------- +# Don't change the following lines +TEST=$(txt2man -h 2> /dev/null) +[ "$TEST" ] || { echo -e "\nYou need to install txt2man, from https://github.com/mvertes/txt2man.\n"; exit 1; } + +function create-man { +txt2man -d "$T2M_DATE" -t $T2M_NAME -r $T2M_NAME-$T2M_VERSION -s $T2M_LEVEL -v "$T2M_DESC" $T2M_NAME.txt > $T2M_NAME.$T2M_LEVEL +} +#-------------------------------------------------------- + +# Put here all data for your first manpage (in T2M lines) +T2M_DATE="Jul 2015" +T2M_NAME=recoverdm +T2M_VERSION=0.20 +T2M_LEVEL=1 +T2M_DESC="recover files on disks with damaged sectors" +create-man + +# Put here all data for your second manpage +T2M_NAME=mergebad +T2M_DESC="merge multiple images into one" +create-man diff -Nru recoverdm-0.20/debian/manpage/genallman.sh recoverdm-0.20/debian/manpage/genallman.sh --- recoverdm-0.20/debian/manpage/genallman.sh 2020-02-29 19:24:03.000000000 +0000 +++ recoverdm-0.20/debian/manpage/genallman.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -#!/bin/bash - -# Generate several manpages at the same time. -# Copyright (C) 2014-2015 Joao Eriberto Mota Filho -# v0.2, available at https://github.com/eribertomota/genallman -# -# You can use this code in the same terms of the BSD-3-clause license or, -# optionally, in the same terms of the license used in debian/ directory -# in this Debian package. Please, to the last option, refer the package -# name when using. -# -# This script uses txt2man. You need 2 files: program_name.txt and -# program_name.header. -# -# The program_name.header must be use this structure: -# -# .TH "" "" " " "" -# -# Example: -# -# .TH mac-robber "1" "May 2013" "MAC-ROBBER 1.02" "collects data about allocated files in mounted filesystems" - -[ -f /usr/bin/txt2man ] || { echo "ERROR: txt2man not found."; exit; } - -for NAME in $(ls | grep header | cut -d'.' -f1) -do - LEVEL=$(cat $NAME.header | cut -d" " -f3 | tr -d '"') - cat $NAME.header > $NAME.$LEVEL - txt2man $NAME.txt | grep -v '^.TH ' >> $NAME.$LEVEL - echo "Generated $NAME.$LEVEL." -done diff -Nru recoverdm-0.20/debian/manpage/mergebad.1 recoverdm-0.20/debian/manpage/mergebad.1 --- recoverdm-0.20/debian/manpage/mergebad.1 2020-02-29 19:24:03.000000000 +0000 +++ recoverdm-0.20/debian/manpage/mergebad.1 2021-09-20 23:47:44.000000000 +0000 @@ -1,5 +1,5 @@ -.TH mergebad "1" "Jul 2015" "MERGEBAD 0.20" "merge multiple images into one" .\" Text automatically generated by txt2man +.TH mergebad 1 "Jul 2015" "mergebad-0.20" "merge multiple images into one" .SH NAME \fBmergebad \fP- merge multiple images into one .SH SYNOPSIS diff -Nru recoverdm-0.20/debian/manpage/mergebad.header recoverdm-0.20/debian/manpage/mergebad.header --- recoverdm-0.20/debian/manpage/mergebad.header 2020-02-29 19:24:03.000000000 +0000 +++ recoverdm-0.20/debian/manpage/mergebad.header 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -.TH mergebad "1" "Jul 2015" "MERGEBAD 0.20" "merge multiple images into one" diff -Nru recoverdm-0.20/debian/manpage/recoverdm.1 recoverdm-0.20/debian/manpage/recoverdm.1 --- recoverdm-0.20/debian/manpage/recoverdm.1 2020-02-29 19:24:03.000000000 +0000 +++ recoverdm-0.20/debian/manpage/recoverdm.1 2021-09-20 23:47:44.000000000 +0000 @@ -1,5 +1,5 @@ -.TH recoverdm "1" "Jul 2015" "RECOVERDM 0.20" "recover files on disks with damaged sectors" .\" Text automatically generated by txt2man +.TH recoverdm 1 "Jul 2015" "recoverdm-0.20" "recover files on disks with damaged sectors" .SH NAME \fBrecoverdm \fP- recover files on disks with damaged sectors .SH SYNOPSIS diff -Nru recoverdm-0.20/debian/manpage/recoverdm.header recoverdm-0.20/debian/manpage/recoverdm.header --- recoverdm-0.20/debian/manpage/recoverdm.header 2020-02-29 19:24:03.000000000 +0000 +++ recoverdm-0.20/debian/manpage/recoverdm.header 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -.TH recoverdm "1" "Jul 2015" "RECOVERDM 0.20" "recover files on disks with damaged sectors" diff -Nru recoverdm-0.20/debian/upstream/metadata recoverdm-0.20/debian/upstream/metadata --- recoverdm-0.20/debian/upstream/metadata 2020-02-29 19:24:03.000000000 +0000 +++ recoverdm-0.20/debian/upstream/metadata 2021-09-20 23:47:44.000000000 +0000 @@ -1,10 +1,5 @@ -Name: recoverdm Cite-As: recoverdm -Documentation: http://www.vanheusden.com/recoverdm -Changelog: http://www.vanheusden.com/recoverdm -Contact: https://www.vanheusden.com/feedbackform.php?subject=recoverdm Reference: Author: Folkert van Heusden Name: recover files on disks with damaged sectors Year: 2003 - URL: http://www.vanheusden.com/recoverdm diff -Nru recoverdm-0.20/debian/watch recoverdm-0.20/debian/watch --- recoverdm-0.20/debian/watch 2020-02-29 19:24:03.000000000 +0000 +++ recoverdm-0.20/debian/watch 2021-09-20 23:47:44.000000000 +0000 @@ -1,4 +1,3 @@ version=4 -https://www.vanheusden.com/recoverdm recoverdm-(\d\S+)\.(?:tgz|tar\.(?:bz2|gz|xz)) - -https://github.com/flok99/recoverdm/releases .*/archive/v?@ANY_VERSION@@ARCHIVE_EXT@ +opts=dversionmangle=s/.*/0.No-Site/ \ +https://people.debian.org/~eriberto/ FakeWatchNoUpstreamSiteForThisPackage-(\d\S+)\.gz