[Forensics-changes] [recoverdm] 01/01: Imported Debian patch 0.20-3

Joao Eriberto Mota Filho eriberto at moszumanska.debian.org
Mon Jul 27 01:29:44 UTC 2015


This is an automated email from the git hooks/post-receive script.

eriberto pushed a commit to branch debian
in repository recoverdm.

commit 9eb9bc3ada65fecf090f7c4611535e9ec13e7adc
Merge: adb3a46 17d753f
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Sun Jul 26 20:09:06 2015 -0300

    Imported Debian patch 0.20-3

 debian/README.source                    |  7 ---
 debian/changelog                        | 37 ++++++++++++++-
 debian/compat                           |  2 +-
 debian/control                          | 22 +++++----
 debian/copyright                        | 39 ++++++---------
 debian/dirs                             |  1 +
 debian/manpage/genallman.sh             | 31 ++++++++++++
 debian/manpage/mergebad.1               | 49 +++++++++++++++++++
 debian/manpage/mergebad.header          |  1 +
 debian/manpage/mergebad.txt             | 23 +++++++++
 debian/manpage/recoverdm.1              | 84 +++++++++++++++++++++++++++++++++
 debian/manpage/recoverdm.header         |  1 +
 debian/manpage/recoverdm.txt            | 44 +++++++++++++++++
 debian/manpages                         |  2 +
 debian/patches/01-manpage-removal.patch | 61 ------------------------
 debian/patches/02-manpage-typo.patch    | 29 ------------
 debian/patches/fix-makefile             | 26 ++++++++++
 debian/patches/series                   |  3 +-
 debian/recoverdm.install                |  2 -
 debian/recoverdm.manpages               |  1 -
 debian/rules                            | 10 ++--
 debian/source.lintian-overrides         |  3 --
 debian/source/format                    |  1 +
 debian/watch                            |  2 +-
 recoverdm.1                             | 52 --------------------
 25 files changed, 330 insertions(+), 203 deletions(-)

diff --cc debian/changelog
index fd292f3,0000000..75d7b83
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,60 -1,0 +1,93 @@@
++recoverdm (0.20-3) unstable; urgency=medium
++
++  * Team upload.
++  * Migrations:
++      - debian/copyright to 1.0 format.
++      - debian/rules to new (reduced) format.
++      - DebSrc to 3.0.
++      - DH level to 9.
++  * debian/control:
++      - Bumped Standards-Version to 3.9.6.
++      - Fixed a typo in long description. Thanks to
++        Davide Prina <davide.prina at gmail.com>. (Closes: #589398)
++      - Improved the short and long descriptions.
++      - Removed quilt from Build-Depends field. DH 9 no longer needs this.
++      - Updated the Vcs-* fields.
++  * debian/dirs: added to create a needed directory.
++  * debian/manpage/:
++      - Created to gather the new manpages.
++      - Written new manpages.
++  * debian/manpages: updated to install the new manpages.
++  * debian/patches/:
++      - Removed 01-manpage-removal.patch and 02-manpage-typo.patch. The
++        manpages where re-written.
++      - fix-makefile: added to provide GCC hardening and to fix the path to
++        install.
++  * debian/recoverdm.install: removed. The upstream makefile will install the
++      files.
++  * debian/recoverdm.manpages: renamed to manpages.
++  * debian/source.lintian-override: removed. Using 'Team upload' now.
++  * debian/watch: created.
++
++ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Sun, 26 Jul 2015 20:09:06 -0300
++
 +recoverdm (0.20-2) unstable; urgency=low
 +
 +  * Updating package to standards version 3.8.2.
 +  * Adding lintian overrides.
 +  * Using correct rfc-2822 date formats in changelog.
 +
 + -- Daniel Baumann <daniel at debian.org>  Thu, 09 Jul 2009 12:21:32 +0200
 +
 +recoverdm (0.20-1) unstable; urgency=low
 +
 +  * Prefixing debhelper files with package name.
 +  * Merging upstream version 0.20.
 +  * Using quilt rather than dpatch.
 +  * Updating to standards 3.8.1.
 +  * Updating year in copyright file.
 +  * Re-adding manpage from recoverdm 0.19 which was removed by upstream in
 +    version 0.20 (for unknown reason; probably mistake).
 +
 + -- Daniel Baumann <daniel at debian.org>  Thu, 28 May 2009 21:56:15 +0200
 +
 +recoverdm (0.19-2) unstable; urgency=low
 +
 +  * Adding patch from A. Costa <agcosta at gis.net> to fix spelling errors in
 +    manpage (Closes: #504541).
 +
 + -- Daniel Baumann <daniel at debian.org>  Thu, 06 Nov 2008 16:16:00 +0100
 +
 +recoverdm (0.19-1) unstable; urgency=low
 +
 +  [ Christophe Monniez ]
 +  * Initial release (Closes: #469062).
 +  * Bumping package to debhelper 6
 +  * Moved from admin section to utils
 +  * Changed architecture from i386 to any
 +  * Changed copyright to machine readable format
 +  * Changed package priority from extra to optional
 +  * Added a homepage field in the control file
 +  * Added maintainer and uploader field in control
 +  * Bumped standards-version in control to 3.7.3
 +  * Added an install rule in the original Makefile
 +  * Added a man page for recoverdm
 +  * Various debian/rules cleanup and reordering
 +  * Added a man page for mergebad
 +
 +  [ Daniel Baumann ]
 +  * Removing useless whitespaces.
 +  * Some minor cleanups.
 +  * Rewrapping long description in control.
-   * Removing useless docs, don't add worthwile new information.
++  * Removing useless docs, don't add worthwhile new information.
 +  * Reverting unneeded upstream modification, using install target of rules.
 +  * Cleaning up target depends in rules.
 +  * Correcting copyright file.
 +  * Correcting typo in copyright.
 +  * Replacing install target in rules with debhelper install file.
 +  * Updating to standards 3.8.0.
 +  * Upgrading package to debhelper 7.
 +  * Updating vcs fields.
-   * Simplyfing manpages debhelper file.
++  * Simplifying manpages debhelper file.
 +
 + -- Daniel Baumann <daniel at debian.org>  Fri, 19 Sep 2008 08:04:00 +0200
diff --cc debian/compat
index 7f8f011,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 7
++9
diff --cc debian/control
index 58a6b45,0000000..740ee45
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,23 -1,0 +1,25 @@@
 +Source: recoverdm
 +Section: utils
 +Priority: optional
 +Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 +Uploaders: Christophe Monniez <christophe.monniez at fccu.be>
- Build-Depends: debhelper (>= 7), quilt
- Standards-Version: 3.9.1
- Homepage: http://www.vanheusden.com/recoverdm/
- Vcs-Browser: http://git.debian.net/?p=debian-forensics/recoverdm.git
- Vcs-Git: git://git.debian.net/git/debian-forensics/recoverdm.git
++Build-Depends: debhelper (>= 9)
++Standards-Version: 3.9.6
++Homepage: http://www.vanheusden.com/recoverdm
++Vcs-Browser: https://anonscm.debian.org/cgit/forensics/recoverdm.git
++Vcs-Git: git://anonscm.debian.org/forensics/recoverdm.git
 +
 +Package: recoverdm
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}
- Description: recover files/disks with damaged sectors
-  This program will help you recover disks with bad sectors. You can recover
-  files as well complete devices. In case it finds sectors which simply cannot be
-  recoverd, it writes an empty sector to the outputfile and continues.
++Description: recover files on disks with damaged sectors
++ recoverdm recover disks with bad sectors. You can recover files as well
++ complete devices. In case it finds sectors which simply cannot be recovered,
++ it writes an empty sector to the output file and continues.
 + .
-  If you're recovering a CD or a DVD and the program cannot read the sector in
++ When recovering a CD or a DVD and the program cannot read the sector in
 + "normal mode", then the program will try to read the sector in "RAW mode"
 + (without error-checking etc.). This toolkit also has a utility called
 + 'mergebad' which merges multiple images into one.
++ .
++ This package is useful in forensics investigations.
diff --cc debian/copyright
index cce6711,0000000..cbb6c05
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,41 -1,0 +1,30 @@@
- Author: Folkert van Heusden <folkert at vanheusden.com>
- Download: http://www.vanheusden.com/recoverdm/
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: recoverdm
++Source: http://www.vanheusden.com/recoverdm
 +
 +Files: *
- Copyright: (C) 2003-2004 Folkert van Heusden <folkert at vanheusden.com>
++Copyright: 2003-2004 Folkert van Heusden <folkert at vanheusden.com>
 +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
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-  .
-  This package is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-  .
-  You should have received a copy of the GNU General Public License
-  along with this package; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 +
 +Files: debian/*
- Copyright:
-  (C) 2008 Christophe Monniez <christophe.monniez at fccu.be>
-  (C) 2008-2009 Daniel Baumann <daniel at debian.org>
++Copyright: 2008      Christophe Monniez <christophe.monniez at fccu.be>
++           2008-2009 Daniel Baumann <daniel at debian.org>
++           2015      Joao Eriberto Mota Filho <eriberto at debian.org>
++License: GPL-2+
++
 +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
 + the Free Software Foundation; either version 2 of the License, or
 + (at your option) any later version.
 + .
 + This package is distributed in the hope that it will be useful,
 + but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + GNU General Public License for more details.
 + .
 + You should have received a copy of the GNU General Public License
-  along with this package; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- 
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2.
++ along with this program. If not, see <https://www.gnu.org/licenses/>
++ .
++ On Debian systems, the complete text of the GNU General
++ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --cc debian/dirs
index 0000000,0000000..e772481
new file mode 100644
--- /dev/null
+++ b/debian/dirs
@@@ -1,0 -1,0 +1,1 @@@
++usr/bin
diff --cc debian/manpage/genallman.sh
index 0000000,0000000..ccf64b4
new file mode 100755
--- /dev/null
+++ b/debian/manpage/genallman.sh
@@@ -1,0 -1,0 +1,31 @@@
++#!/bin/bash
++
++# Generate several manpages at the same time.
++# Copyright (C) 2014-2015 Joao Eriberto Mota Filho <eriberto at debian.org>
++# 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 <program_name> "<manpage_level>" "<date>" "<program_name_upper_case> <program_version>" "<program_description>"
++#
++# 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 --cc debian/manpage/mergebad.1
index 0000000,0000000..dcb36d0
new file mode 100644
--- /dev/null
+++ b/debian/manpage/mergebad.1
@@@ -1,0 -1,0 +1,49 @@@
++.TH mergebad "1" "Jul 2015" "MERGEBAD 0.20" "merge multiple images into one"
++.\" Text automatically generated by txt2man
++.SH NAME
++\fBmergebad \fP- merge multiple images into one
++.SH SYNOPSIS
++.nf
++.fam C
++\fBmergebad\fP \fB-i\fP <mapfile><imagefile> \fB-o\fP <output_file> \fB-l\fP <mapfile> \fB-s\fP <size> \fB-v\fP \fB-h\fP
++.fam T
++.fi
++.fam T
++.fi
++.SH DESCRIPTION
++\fBmergebad\fP merges multiple images into one. This can be useful when you have, for example,
++multiple CDs with the same data which are all damaged. In such case, you can then first
++use recoverdm to retrieve the data from the damaged CDs into image files and then combine
++them into one image with \fBmergebad\fP.
++.SH OPTIONS
++.TP
++.B
++\fB-i\fP <mapfile> <imagefile>
++With \fB-i\fP one selects a mapfile+imagefile to read.
++.TP
++.B
++\fB-o\fP <output_file>
++File to write output to.
++.TP
++.B
++\fB-l\fP <mapfile>
++In case all input images had a bad block on the same place, this file will list those blocks.
++.TP
++.B
++\fB-s\fP <size>
++Limit or extend the size of the output image.
++.TP
++.B
++\fB-v\fP
++Be verbose.
++.TP
++.B
++\fB-h\fP
++This help.
++.SH SEE ALSO
++\fBrecoverdm\fP(1)
++.SH AUTHOR
++The \fBmergebad\fP is part of recoverdm and was written by Folkert van Heusden <folkert at vanheusden.com>.
++.PP
++This manual page was written by Joao Eriberto Mota Filho <eriberto at debian.org>
++for the Debian project (but may be used by others).
diff --cc debian/manpage/mergebad.header
index 0000000,0000000..11506f0
new file mode 100644
--- /dev/null
+++ b/debian/manpage/mergebad.header
@@@ -1,0 -1,0 +1,1 @@@
++.TH mergebad "1" "Jul 2015" "MERGEBAD 0.20" "merge multiple images into one"
diff --cc debian/manpage/mergebad.txt
index 0000000,0000000..9f4d2d1
new file mode 100644
--- /dev/null
+++ b/debian/manpage/mergebad.txt
@@@ -1,0 -1,0 +1,23 @@@
++NAME
++  mergebad - merge multiple images into one
++SYNOPSIS
++  mergebad -i <mapfile><imagefile> -o <output_file> -l <mapfile> -s <size> -v -h
++DESCRIPTION
++  mergebad merges multiple images into one. This can be useful when you have, for example,
++  multiple CDs with the same data which are all damaged. In such case, you can then first
++  use recoverdm to retrieve the data from the damaged CDs into image files and then combine
++  them into one image with mergebad.
++OPTIONS
++  -i <mapfile> <imagefile>  With -i one selects a mapfile+imagefile to read.
++  -o <output_file>          File to write output to.
++  -l <mapfile>              In case all input images had a bad block on the same place, this file will list those blocks.
++  -s <size>                 Limit or extend the size of the output image.
++  -v                        Be verbose.
++  -h                        This help.
++SEE ALSO
++  recoverdm(1)
++AUTHOR
++  The mergebad is part of recoverdm and was written by Folkert van Heusden <folkert at vanheusden.com>.
++
++  This manual page was written by Joao Eriberto Mota Filho <eriberto at debian.org>
++  for the Debian project (but may be used by others).
diff --cc debian/manpage/recoverdm.1
index 0000000,0000000..55d05fa
new file mode 100644
--- /dev/null
+++ b/debian/manpage/recoverdm.1
@@@ -1,0 -1,0 +1,84 @@@
++.TH recoverdm "1" "Jul 2015" "RECOVERDM 0.20" "recover files on disks with damaged sectors"
++.\" Text automatically generated by txt2man
++.SH NAME
++\fBrecoverdm \fP- recover files on disks with damaged sectors
++.SH SYNOPSIS
++.nf
++.fam C
++\fBrecoverdm\fP \fB-t\fP <type> \fB-i\fP <file/device-in> \fB-o\fP <output_file> [\fB-l\fP <sectors_file>] [\fB-n\fP \fIretries\fP]
++          [\fB-s\fP \fIrotation_speed\fP] [\fB-r\fP \fIretries\fP] [\fB-b\fP \fIstart_offset\fP] [\fB-p\fP \fIskip_blocks_count\fP]
++.fam T
++.fi
++.fam T
++.fi
++.SH DESCRIPTION
++\fBrecoverdm\fP recover disks with bad sectors. You can recover files as well
++complete devices. In case it finds sectors which simply cannot be recovered,
++it writes an empty sector to the output file and continues.
++.RE
++.PP
++When recovering a CD or a DVD and the program cannot read the sector in
++"normal mode", then the program will try to read the sector in "RAW mode"
++(without error checking etc.). This toolkit also has a utility called
++mergebad which merges multiple images into one.
++.SH OPTIONS
++.TP
++.B
++\fB-t\fP <type>
++See the above table to choose a value for <type>.
++.TP
++.B
++\fB-i\fP <file/device-in>
++Device or file to recover.
++.TP
++.B
++\fB-o\fP <output_file>
++File where to write to. This file should not already exist.
++.TP
++.B
++\fB-l\fP <sectors_file>
++Generates a mapfile containing checksums and a list of bad sectors. This mapfile can then be used with mergebad to create one correct image from several damaged images.
++.TP
++.B
++\fB-n\fP \fIretries\fP
++Number of \fIretries\fP before going on with next sector. Default is 6. For CDROMs it is advised to use 1.
++.TP
++.B
++\fB-s\fP \fIrotation_speed\fP
++Rotation speed of CDROM/DVD. Default is 1.
++.TP
++.B
++\fB-r\fP \fIretries\fP
++Number of \fIretries\fP while reading in RAW mode before going on with next sector. Default is 6. It is advised to use at least 3.
++.TP
++.B
++\fB-b\fP \fIstart_offset\fP
++Point to start.
++.TP
++.B
++\fB-p\fP \fIskip_blocks_count\fP
++How many sectors are skipped after non-read one. Use more to speed-up the recover process. Default is 1.
++.SH TYPE OF DEVICES
++These are the values can be used with \fB-t\fP option:
++.PP
++.nf
++.fam C
++    FILE            1
++    FLOPPY          10
++    FLOPPY_IDE      11
++    FLOPPY_SCSI     12
++    CDROM_IDE       20
++    CDROM_SCSI      21
++    DVD_IDE         30
++    DVD_SCSI        31
++    DISK_IDE        40
++    DISK_SCSI       41
++.fam T
++.fi
++.SH SEE ALSO
++\fBmergebad\fP(1)
++.SH AUTHOR
++The \fBrecoverdm\fP was written by Folkert van Heusden <folkert at vanheusden.com>.
++.PP
++This manual page was written by Joao Eriberto Mota Filho <eriberto at debian.org>
++for the Debian project (but may be used by others).
diff --cc debian/manpage/recoverdm.header
index 0000000,0000000..1cb077d
new file mode 100644
--- /dev/null
+++ b/debian/manpage/recoverdm.header
@@@ -1,0 -1,0 +1,1 @@@
++.TH recoverdm "1" "Jul 2015" "RECOVERDM 0.20" "recover files on disks with damaged sectors"
diff --cc debian/manpage/recoverdm.txt
index 0000000,0000000..a675fd5
new file mode 100644
--- /dev/null
+++ b/debian/manpage/recoverdm.txt
@@@ -1,0 -1,0 +1,44 @@@
++NAME
++  recoverdm - recover files on disks with damaged sectors
++SYNOPSIS
++  recoverdm -t <type> -i <file/device-in> -o <output_file> [-l <sectors_file>] [-n retries]
++            [-s rotation_speed] [-r retries] [-b start_offset] [-p skip_blocks_count]
++DESCRIPTION
++   recoverdm recover disks with bad sectors. You can recover files as well
++   complete devices. In case it finds sectors which simply cannot be recovered,
++   it writes an empty sector to the output file and continues.
++
++  When recovering a CD or a DVD and the program cannot read the sector in
++  "normal mode", then the program will try to read the sector in "RAW mode"
++  (without error checking etc.). This toolkit also has a utility called
++  mergebad which merges multiple images into one.
++OPTIONS
++  -t <type>             See the above table to choose a value for <type>.
++  -i <file/device-in>   Device or file to recover.
++  -o <output_file>      File where to write to. This file should not already exist.
++  -l <sectors_file>     Generates a mapfile containing checksums and a list of bad sectors. This mapfile can then be used with mergebad to create one correct image from several damaged images.
++  -n retries            Number of retries before going on with next sector. Default is 6. For CDROMs it is advised to use 1.
++  -s rotation_speed     Rotation speed of CDROM/DVD. Default is 1.
++  -r retries            Number of retries while reading in RAW mode before going on with next sector. Default is 6. It is advised to use at least 3.
++  -b start_offset       Point to start.
++  -p skip_blocks_count  How many sectors are skipped after non-read one. Use more to speed-up the recover process. Default is 1.
++TYPE OF DEVICES
++  These are the values can be used with -t option:
++
++    FILE            1
++    FLOPPY          10
++    FLOPPY_IDE      11
++    FLOPPY_SCSI     12
++    CDROM_IDE       20
++    CDROM_SCSI      21
++    DVD_IDE         30
++    DVD_SCSI        31
++    DISK_IDE        40
++    DISK_SCSI       41
++SEE ALSO
++  mergebad(1)
++AUTHOR
++  The recoverdm was written by Folkert van Heusden <folkert at vanheusden.com>.
++
++  This manual page was written by Joao Eriberto Mota Filho <eriberto at debian.org>
++  for the Debian project (but may be used by others).
diff --cc debian/manpages
index 0000000,0000000..9db2d57
new file mode 100644
--- /dev/null
+++ b/debian/manpages
@@@ -1,0 -1,0 +1,2 @@@
++debian/manpage/recoverdm.1
++debian/manpage/mergebad.1
diff --cc debian/patches/fix-makefile
index 0000000,0000000..5d0e442
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix-makefile
@@@ -1,0 -1,0 +1,26 @@@
++Description: add GCC hardening and fix the path to install.
++Author: Joao Eriberto Mota Filho <eriberto at debian.org>
++Last-Update: 2015-07-26
++Index: recoverdm-0.20/Makefile
++===================================================================
++--- recoverdm-0.20.orig/Makefile
+++++ recoverdm-0.20/Makefile
++@@ -1,7 +1,7 @@
++ VERSION=0.20
++ 
++-CFLAGS=-Wall -Wshadow -Wconversion -Wwrite-strings -Winline -O2 -DVERSION=\"$(VERSION)\"
++-LDFLAGS=
+++CFLAGS+=-Wall -Wshadow -Wconversion -Wwrite-strings -Winline -O2 -DVERSION=\"$(VERSION)\"
+++LDFLAGS+=
++ 
++ OBJSr=recoverdm.o dev.o io.o utils.o error.o
++ OBJSm=mergebad.o io.o utils.o error.o
++@@ -15,7 +15,7 @@ mergebad: $(OBJSm)
++ 	$(CC) -Wall -W $(OBJSm) $(LDFLAGS) -o mergebad
++ 
++ install:
++-	cp recoverdm mergebad /usr/local/bin
+++	cp recoverdm mergebad $(DESTDIR)/usr/bin
++ 	echo
++ 	echo Oh, blatant plug: http://keetweej.vanheusden.com/wishlist.html
++ 
diff --cc debian/patches/series
index 160381f,0000000..4f20ff2
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
- 01-manpage-removal.patch
- 02-manpage-typo.patch
++fix-makefile
diff --cc debian/rules
index 8f54c77,0000000..d8309f6
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,10 -1,0 +1,6 @@@
 +#!/usr/bin/make -f
 +
- %:
- 	dh ${@} --with quilt
- 
- override_dh_auto_install:
- 	# nothing to be done
++export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 +
- override_dh_installdocs:
- 	dh_installdocs -A debian/README.source
++%:
++	dh $@
diff --cc debian/source/format
index 0000000,0000000..163aaf8
new file mode 100644
--- /dev/null
+++ b/debian/source/format
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)
diff --cc debian/watch
index 90c738d,0000000..b0d650c
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,2 -1,0 +1,2 @@@
 +version=3
- http://www.vanheusden.com/recoverdm/ recoverdm-(.*)\.tgz
++http://www.vanheusden.com/recoverdm recoverdm-(\d\S+)\.(?:tgz|tar\.(?:bz2|gz|xz))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/recoverdm.git



More information about the forensics-changes mailing list