[Forensics-changes] [recoverjpeg] 09/20: Imported Debian patch 1.1.2-1

Joao Eriberto Mota Filho eriberto at moszumanska.debian.org
Mon May 18 23:14:46 UTC 2015


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

eriberto pushed a commit to branch debian
in repository recoverjpeg.

commit 4ba3f159521b88141714b4ae8f83262da16b22a2
Merge: 1974207 1cc2f95
Author: William Vera <billy at billy.com.mx>
Date:   Mon Oct 6 21:25:00 2008 -0500

    Imported Debian patch 1.1.2-1

 Makefile.am                         |    2 +-
 Makefile.in                         |  114 +-
 aclocal.m4                          |  174 +-
 configure                           | 3586 ++++++++++++++++++++---------------
 configure.ac                        |    2 +-
 debian/changelog                    |   11 +
 debian/compat                       |    2 +-
 debian/control                      |    7 +-
 debian/copyright                    |    8 +-
 debian/manpages                     |    1 +
 debian/patches/00list               |    1 +
 debian/patches/01_manpagefix.dpatch |   24 +
 debian/remove-duplicates.1          |   31 +
 debian/rules                        |   38 +-
 debian/watch                        |    4 +
 depcomp                             |   71 +-
 install-sh                          |  348 +++-
 missing                             |   68 +-
 remove-duplicates                   |   32 -
 sort-pictures                       |    2 +-
 20 files changed, 2655 insertions(+), 1871 deletions(-)

diff --cc debian/changelog
index da03af4,0000000..f9222f9
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,44 -1,0 +1,55 @@@
++recoverjpeg (1.1.2-1) unstable; urgency=low
++
++  * New upstream release
++  * New maintainer (Closes: #500355).
++  * Added a manpage for remove-duplicates binary.
++  * Added a watch file.
++  * Added a patch to fix manpage syntax.
++  * Changed the synopsis at the Control file.
++
++ -- William Vera <billy at billy.com.mx>  Mon, 06 Oct 2008 21:25:00 -0500
++
 +recoverjpeg (1.1.1-1.3) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * Remove cruft from .diff.gz that somehow got in there during my last
 +    upload
 +
 + -- Wouter Verhelst <wouter at debian.org>  Sat, 06 Sep 2008 22:57:06 +0200
 +
 +recoverjpeg (1.1.1-1.2) unstable; urgency=low
 +
 +  * Non-maintainer upload.
 +  * recoverjpeg.c: Fix incorrect assumption about char signedness, which
 +    breaks on architectures where char is unsigned (powerpc, s390, and
 +    arm); Closes: #404717.
 +  * debian/compat, debian/rules: bump debhelper compat level to 5
 +  * debian/control: Add 'Suggests: imagemagick, exif' to debian/control,
 +    since sort-pictures wants to use those.
 +  * sort-pictures: Modify first exif call to 'exif --help', so that it
 +    won't incorrectly determine that exif is not on disk.
 +  * debian/rules: don't ignore make exit state on 'make distclean';
 +    silences lintian warning.
 +  * debian/control: Bump Standards-Version to 3.8.0 (no changes applicable to
 +    recoverjpeg)
 +
 + -- Wouter Verhelst <wouter at debian.org>  Mon, 25 Aug 2008 23:30:52 +0200
 +
 +recoverjpeg (1.1.1-1.1) unstable; urgency=high
 +
 +  * NMU
 +  * Fix license issue: recoverjpeg is GPLv2 only. (Closes: #434150)
 +
 + -- Aurélien GÉRÔME <ag at roxor.cx>  Sun, 02 Dec 2007 02:04:02 +0100
 +
 +recoverjpeg (1.1.1-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Cyril Bouthors <cyril at bouthors.org>  Mon, 30 May 2005 10:49:24 +0300
 +
 +recoverjpeg (1.0-1) unstable; urgency=low
 +
 +  * Initial Release.
 +
 + -- Cyril Bouthors <cyril at bouthors.org>  Fri, 31 Dec 2004 09:17:05 +0300
diff --cc debian/compat
index 7ed6ff8,0000000..7f8f011
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 5
++7
diff --cc debian/control
index 20abce5,0000000..f0eddf8
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,15 -1,0 +1,16 @@@
 +Source: recoverjpeg
 +Section: graphics
 +Priority: optional
- Maintainer: Cyril Bouthors <cyril at bouthors.org>
- Build-Depends: debhelper (>= 4.0.0)
++Maintainer: William Vera <billy at billy.com.mx>
++Build-Depends: debhelper (>= 7.0.0), dpatch
 +Standards-Version: 3.8.0
++Homepage: http://www.rfc1149.net/download/recoverjpeg/
 +
 +Package: recoverjpeg
 +Architecture: any
 +Depends: ${shlibs:Depends}
 +Suggests: imagemagick, exif
- Description: Recover jpeg pictures from a filesystem image
++Description: tool to recover JPEG images from a filesystem image
 + Recoverjpeg tries to identify jpeg pictures from a filesystem image.
 + To achieve this goal, it scans the filesystem image and looks for a
 + jpeg structure at blocks starting at 512 bytes boundaries.
diff --cc debian/copyright
index ea1c2d0,0000000..7d0a4e6
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,23 -1,0 +1,25 @@@
 +This package was debianized by Cyril Bouthors <cyril at bouthors.org> on
 +Fri, 31 Dec 2004 09:17:05 +0300.
 +
 +It was downloaded from http://www.rfc1149.net/download/recoverjpeg/
 +
- Copyright:
++Copyright (C) 2004 Samuel Tardieu <sam at rfc1149.net> 
 +
- Upstream Author: Samuel Tardieu <sam at rfc1149.net>
++Upstream Author: Samuel Tardieu <sam at rfc1149.net> 
 +
 +License:
 +
++Copyright (C) 1989, 1991 Free Software Foundation, Inc.
++
 +This program 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; version 2 of the License.
 +
 +This program 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 <http://www.opensource.org/gpl-license.html>
 +for more details.
 +
 +On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL file.
++can be found in /usr/share/common-licenses/GPL-2 file.
diff --cc debian/manpages
index 0000000,0000000..bd30ce9
new file mode 100644
--- /dev/null
+++ b/debian/manpages
@@@ -1,0 -1,0 +1,1 @@@
++debian/remove-duplicates.1
diff --cc debian/patches/00list
index 0000000,0000000..fe4a1b7
new file mode 100644
--- /dev/null
+++ b/debian/patches/00list
@@@ -1,0 -1,0 +1,1 @@@
++01_manpagefix.dpatch
diff --cc debian/patches/01_manpagefix.dpatch
index 0000000,0000000..96dc100
new file mode 100644
--- /dev/null
+++ b/debian/patches/01_manpagefix.dpatch
@@@ -1,0 -1,0 +1,24 @@@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 01_manpagefix.dpatch by  William Vera <billy at billy.com.mx>
++##
++## DP: Minor fix for manpage syntax.
++
++ at DPATCH@
++diff -urNad recoverjpeg-1.1.2~/recoverjpeg.1 recoverjpeg-1.1.2/recoverjpeg.1
++--- recoverjpeg-1.1.2~/recoverjpeg.1	2007-07-21 17:34:20.000000000 -0500
+++++ recoverjpeg-1.1.2/recoverjpeg.1	2008-10-07 20:44:23.000000000 -0500
++@@ -71,12 +71,12 @@
++ (which does not necessarily store pictures at block boundaries) in
++ \fI/dev/hdb1\fP:
++ 
++-  recoverjpeg -b 1 /dev/hdb1
+++  recoverjpeg \-b 1 /dev/hdb1
++ 
++ Do the same thing in a memory constrained environment where no more than
++ 16MB of RAM can be used for the operation:
++ 
++-  recoverjpeg -b 1 -r 16m /dev/hdb1
+++  recoverjpeg \-b 1 \-r 16m /dev/hdb1
++ 
++ .SH AUTHOR
++ .B Recoverjpeg
diff --cc debian/remove-duplicates.1
index 0000000,0000000..54cc77a
new file mode 100644
--- /dev/null
+++ b/debian/remove-duplicates.1
@@@ -1,0 -1,0 +1,31 @@@
++.TH REMOVE-DUPLICATES "1" "October 2008" "remove-duplicates" "User Commands"
++.SH NAME
++remove-duplicates \- remove duplicates of the same file in the current directory
++.SH SYNOPSIS
++.B remove-duplicate
++[\-f]
++.SH DESCRIPTION
++.B remove-duplicates
++Remove duplicates of the same file in the current directory if \-f is given. If \-f is not given, duplicate will be identified twice (once in every direction).
++
++.SH OPTIONS
++.TP
++.B \-f
++
++.SH AUTHOR
++.B Recoverjpeg
++has been written by Samuel Tardieu <sam at rfc1149.net>.
++
++If \fBrecoverjpeg\fP saves your day and you liked it, you are welcome
++to send me the best rescued ones by email (please send only 800x600
++versions of the pictures) and authorize me to put them online
++(indicate which contact information you want me to use for credits).
++
++.SH COPYRIGHT
++Copyright (c) 2004 Samuel Tardieu <sam at rfc1149.net>
++This is free software; see the source for copying conditions. There is
++NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR
++PURPOSE.
++
++.SH "SEE ALSO"
++\fIrecoverjpeg\fP(1) \fIsort-pictures\fP(1)
diff --cc debian/rules
index f67cd3f,0000000..ea0620b
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,80 -1,0 +1,62 @@@
 +#!/usr/bin/make -f
- # Uncomment this to turn on verbose mode.
 +#export DH_VERBOSE=1
 +
 +CFLAGS = -Wall -g
 +
 +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 +	CFLAGS += -O0
 +else
 +	CFLAGS += -O2
 +endif
 +
- config.status: configure
++configure: configure-stamp
++configure-stamp: patch
 +	dh_testdir
 +	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 +
 +build: build-stamp
- 
- build-stamp:  config.status
++build-stamp:  configure-stamp
 +	dh_testdir
 +	$(MAKE)
 +	touch build-stamp
 +
- clean:
++clean: unpatch
 +	dh_testdir
 +	dh_testroot
 +	rm -f build-stamp
 +	[ ! -f Makefile ] || $(MAKE) distclean
- # ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- # 	cp -f /usr/share/misc/config.sub config.sub
- # endif
- # ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- # 	cp -f /usr/share/misc/config.guess config.guess
- # endif
 +	dh_clean
++patch: patch-stamp
++patch-stamp:
++	dpatch apply-all
++unpatch:
++	dpatch deapply-all
++	rm -rf patch-stamp debian/patched
 +
 +install: build
 +	dh_testdir
 +	dh_testroot
 +	dh_clean -k
 +	dh_installdirs
 +	$(MAKE) install DESTDIR=$(CURDIR)/debian/recoverjpeg
 +
- # Build architecture-independent files here.
 +binary-indep: build install
- # We have nothing to do by default.
 +
- # Build architecture-dependent files here.
 +binary-arch: build install
 +	dh_testdir
 +	dh_testroot
 +	dh_installchangelogs
 +	dh_installdocs
- #	dh_installexamples
- #	dh_install
- #	dh_installmenu
- #	dh_installdebconf
- #	dh_installlogrotate
- #	dh_installemacsen
- #	dh_installpam
- #	dh_installmime
- #	dh_installinit
- #	dh_installcron
- #	dh_installinfo
 +	dh_installman
 +	dh_link
 +	dh_strip
 +	dh_compress
 +	dh_fixperms
- #	dh_perl
- #	dh_python
- #	dh_makeshlibs
 +	dh_installdeb
 +	dh_shlibdeps
 +	dh_gencontrol
 +	dh_md5sums
 +	dh_builddeb
 +
 +binary: binary-indep binary-arch
 +.PHONY: build clean binary-indep binary-arch binary install
diff --cc debian/watch
index 0000000,0000000..df3e0fe
new file mode 100644
--- /dev/null
+++ b/debian/watch
@@@ -1,0 -1,0 +1,4 @@@
++version=3
++http://www.rfc1149.net/download/recoverjpeg/ \
++recoverjpeg-([\d\.]*).tar.gz
++

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



More information about the forensics-changes mailing list