[Forensics-changes] [magicrescue] 05/19: * New upstream release * Bump debhelper compat to 6 * Switch to quilt for patches * Add patches/hyphens.diff to fix hyphens used as minus sign in upstream manpages
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Mon Nov 3 19:06:20 UTC 2014
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository magicrescue.
commit a3f1bfe8121b05b3ef9b653b087872edf3e48e4c
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Mon Nov 3 16:50:49 2014 -0200
* New upstream release
* Bump debhelper compat to 6
* Switch to quilt for patches
* Add patches/hyphens.diff to fix hyphens used as minus sign in upstream
manpages
-- Varun Hiremath <varun at debian.org> Sun, 20 Jan 2008 16:34:30 +0530
---
debian/changelog | 11 +++-
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/hyphens.diff | 138 ++++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 2 +
debian/rules | 5 +-
6 files changed, 157 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index afa169c..4405771 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+magicrescue (1.1.5-1) unstable; urgency=low
+
+ * New upstream release
+ * Bump debhelper compat to 6
+ * Switch to quilt for patches
+ * Add patches/hyphens.diff to fix hyphens used as minus sign in upstream
+ manpages
+
+ -- Varun Hiremath <varun at debian.org> Sun, 20 Jan 2008 16:34:30 +0530
+
magicrescue (1.1.4-4) unstable; urgency=low
* Add . to $(PATH) in debian/rules as a workaround for /bin/sh linked to
@@ -31,4 +41,3 @@ magicrescue (1.1.4-1) unstable; urgency=low
* add myself to Uploaders in debian/control
-- Torsten Werner <twerner at debian.org> Fri, 1 Sep 2006 00:06:25 +0530
-
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..1e8b314 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+6
diff --git a/debian/control b/debian/control
index f2c8294..b6a1fe8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
Source: magicrescue
Section: utils
Priority: optional
-Maintainer: Varun Hiremath <varunhiremath at gmail.com>
+Maintainer: Varun Hiremath <varun at debian.org>
Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, libgdbm-dev
+Build-Depends: debhelper (>= 6), cdbs, libgdbm-dev, quilt
Standards-Version: 3.7.3
Homepage: http://jbj.rapanden.dk/magicrescue/
Vcs-Svn: https://bollin.googlecode.com/svn/magicrescue/trunk/
diff --git a/debian/patches/hyphens.diff b/debian/patches/hyphens.diff
new file mode 100644
index 0000000..e0f91a4
--- /dev/null
+++ b/debian/patches/hyphens.diff
@@ -0,0 +1,138 @@
+Index: magicrescue-1.1.5/doc/dupemap.1
+===================================================================
+--- magicrescue-1.1.5.orig/doc/dupemap.1 2008-01-17 18:33:49.000000000 +0530
++++ magicrescue-1.1.5/doc/dupemap.1 2008-01-20 16:45:24.000000000 +0530
+@@ -225,8 +225,8 @@
+ \&\fI/tmp/recovered\-files\fR that already exist in \fI$HOME\fR, do this:
+ .PP
+ .Vb 2
+-\& $ dupemap -d homedir.map scan $HOME
+-\& $ dupemap -d homedir.map delete,report /tmp/recovered-files
++\& $ dupemap \-d homedir.map scan $HOME
++\& $ dupemap \-d homedir.map delete,report /tmp/recovered-files
+ .Ve
+ .Sh "Usage with magicrescue"
+ .IX Subsection "Usage with magicrescue"
+@@ -247,7 +247,7 @@
+ directories we will use.
+ .PP
+ .Vb 2
+-\& $ mount -o ro /dev/hda1 /mnt/windows
++\& $ mount \-o ro /dev/hda1 /mnt/windows
+ \& $ mkdir healthy_docs rescued_docs
+ .Ve
+ .PP
+@@ -260,25 +260,25 @@
+ extension.
+ .PP
+ .Vb 4
+-\& $ find /mnt/windows -type f \e
+-\& |magicrescue -I- -r msoffice -d healthy_docs
+-\& $ dupemap -d healthy_docs.map scan healthy_docs
+-\& $ rm -rf healthy_docs
++\& $ find /mnt/windows \-type f \e
++\& |magicrescue \-I- \-r msoffice \-d healthy_docs
++\& $ dupemap \-d healthy_docs.map scan healthy_docs
++\& $ rm \-rf healthy_docs
+ .Ve
+ .PP
+ Now rescue all \f(CW\*(C`msoffice\*(C'\fR documents from the block device and get rid of
+ everything that's not a *.doc.
+ .PP
+ .Vb 2
+-\& $ magicrescue -Mo -r msoffice -d rescued_docs /dev/hda1 \e
+-\& |grep -v '\e.doc$'|xargs rm -f
++\& $ magicrescue \-Mo \-r msoffice \-d rescued_docs /dev/hda1 \e
++\& |grep \-v '\e.doc$'|xargs rm \-f
+ .Ve
+ .PP
+ Remove all the rescued documents that also appear on the file system, and
+ remove duplicates.
+ .PP
+ .Vb 2
+-\& $ dupemap -d healthy_docs.map delete,report rescued_docs
++\& $ dupemap \-d healthy_docs.map delete,report rescued_docs
+ \& $ dupemap delete,report rescued_docs
+ .Ve
+ .PP
+@@ -299,8 +299,8 @@
+ .Vb 6
+ \& $ cp diskimage diskimage.bak
+ \& $ dd if=/dev/zero bs=1M count=2048 >> diskimage
+-\& $ reiserfsck --rebuild-tree diskimage
+-\& $ mount -o loop diskimage /mnt
++\& $ reiserfsck \-\-rebuild-tree diskimage
++\& $ mount \-o loop diskimage /mnt
+ \& $ ls /mnt/lost+found
+ \& (tons of files)
+ .Ve
+@@ -311,14 +311,14 @@
+ of the directory we have unpacked the backup in.
+ .PP
+ .Vb 1
+-\& $ dupemap -d backup.map scan ~/backup
++\& $ dupemap \-d backup.map scan ~/backup
+ .Ve
+ .PP
+ Next, we eliminate all the files from the rescued image that are also present
+ in the backup.
+ .PP
+ .Vb 1
+-\& $ dupemap -d backup.map delete,report /mnt
++\& $ dupemap \-d backup.map delete,report /mnt
+ .Ve
+ .PP
+ We also want to remove duplicates from \fIlost+found\fR, and we want to get rid of
+@@ -326,8 +326,8 @@
+ .PP
+ .Vb 3
+ \& $ dupemap delete,report /mnt/lost+found
+-\& $ ls /mnt|grep -v lost+found|xargs dupemap -d mnt.map scan
+-\& $ dupemap -d mnt.map delete,report /mnt/lost+found
++\& $ ls /mnt|grep \-v lost+found|xargs dupemap \-d mnt.map scan
++\& $ dupemap \-d mnt.map delete,report /mnt/lost+found
+ .Ve
+ .PP
+ This should leave only the files in \fI/mnt\fR that have changed since the last
+@@ -342,7 +342,7 @@
+ First, you map the whole file system.
+ .PP
+ .Vb 1
+-\& $ dupemap -d old.map scan /
++\& $ dupemap \-d old.map scan /
+ .Ve
+ .PP
+ Then you come back a few days/weeks later and run \fBdupemap report\fR. This will
+@@ -351,8 +351,8 @@
+ preparing a new map easily. Both lists need to be sorted to be compared.
+ .PP
+ .Vb 2
+-\& $ dupemap -d old.map report /|sort > unchanged_files
+-\& $ dupemap -d current.map scan /|sort > current_files
++\& $ dupemap \-d old.map report /|sort > unchanged_files
++\& $ dupemap \-d current.map scan /|sort > current_files
+ .Ve
+ .PP
+ All that's left to do is comparing these files and preparing for next week.
+Index: magicrescue-1.1.5/doc/magicrescue.1
+===================================================================
+--- magicrescue-1.1.5.orig/doc/magicrescue.1 2008-01-17 18:33:49.000000000 +0530
++++ magicrescue-1.1.5/doc/magicrescue.1 2008-01-20 16:43:30.000000000 +0530
+@@ -250,7 +250,7 @@
+ hours. In Linux, use hdparm to set these options:
+ .PP
+ .Vb 1
+-\& $ hdparm -d 1 -c 1 -u 1 /dev/hdb
++\& $ hdparm \-d 1 \-c 1 \-u 1 /dev/hdb
+ .Ve
+ .PP
+ Choose your output directory, somewhere with lots of disk space.
+@@ -269,7 +269,7 @@
+ Then invoke \fBmagicrescue\fR
+ .PP
+ .Vb 1
+-\& $ magicrescue -r jpeg-jfif -r jpeg-exif -d ~/output /dev/hdb1
++\& $ magicrescue \-r jpeg-jfif \-r jpeg-exif \-d ~/output /dev/hdb1
+ .Ve
+ .PP
+ It will scan through your entire hard disk, so it may take a while. You can
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..01ed9ac
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+hyphens.diff
+pre_configure.patch
diff --git a/debian/rules b/debian/rules
index 31ff2e4..65a36d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,10 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
# workaround for dash:
export PATH := $(PATH):.
+
+get-orig-source:
+ -uscan --upstream-version 0 --rename
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/magicrescue.git
More information about the forensics-changes
mailing list