[Forensics-changes] [recoverjpeg] 12/20: Imported Debian patch 2.0-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 6846b5a6076d4c07fec6064303c570127b7237a6
Merge: c0ccf52 f185496
Author: William Vera <billy at billy.com.mx>
Date:   Tue Mar 2 20:50:44 2010 -0600

    Imported Debian patch 2.0-1

 Makefile.am                               |    7 +-
 Makefile.in                               |  381 ++-
 README                                    |   16 +-
 aclocal.m4                                |  297 +-
 configure                                 | 4238 ++++++++++++++++-------------
 configure.ac                              |    3 +-
 debian/README.source                      |   38 +
 debian/changelog                          |   13 +
 debian/control                            |    7 +-
 debian/patches/00list                     |    1 +
 debian/patches/02_fix_recovermov.1.dpatch |   19 +
 debian/rules                              |    2 +-
 depcomp                                   |   87 +-
 install-sh                                |    5 +-
 missing                                   |   49 +-
 recoverjpeg.1                             |    5 +-
 recoverjpeg.c                             |   69 +-
 recovermov.1                              |   59 +
 recovermov.cpp                            |  173 ++
 sort-pictures                             |    2 +-
 sort-pictures.1                           |    4 +-
 utils.c                                   |   41 +
 utils.h                                   |   27 +
 23 files changed, 3333 insertions(+), 2210 deletions(-)

diff --cc debian/README.source
index 0000000,0000000..fc98b3d
new file mode 100644
--- /dev/null
+++ b/debian/README.source
@@@ -1,0 -1,0 +1,38 @@@
++This package uses dpatch to manage all modifications to the upstream
++source. Changes are stored in the source package as diffs in
++debian/patches and applied during the build.
++
++To get the fully patched source after unpacking the source package, cd
++to the root level of the source package and run:
++
++    debian/rules patch
++
++Removing a patch is as simple as removing its entry from the
++debian/patches/00list file, and please also remove the patch file
++itself.
++
++Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
++where you should replace XX with a new number and patchname with a
++descriptive shortname of the patch. You can then simply edit all the
++files your patch wants to edit, and then simply "exit 0" from the shell
++to actually create the patch file.
++
++To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
++and replace XX_patchname with the actual filename from debian/patches
++you want to use.
++
++To clean up afterwards again, "debian/rules unpatch" will do the
++work for you - or you can of course choose to call
++"fakeroot debian/rules clean" all together.
++
++
++--- 
++
++this documentation is part of dpatch package, and may be used by
++packages using dpatch to comply with policy on README.source. This
++documentation is meant to be useful to users who are not proficient in
++dpatch in doing work with dpatch-based packages. Please send any
++improvements to the BTS of dpatch package.
++
++original text by Gerfried Fuchs, edited by Junichi Uekawa <dancer at debian.org>
++10 Aug 2008.
diff --cc debian/changelog
index ced6500,0000000..d96086b
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,64 -1,0 +1,77 @@@
++recoverjpeg (2.0-1) unstable; urgency=low
++
++  * New upstream release (Closes: #572234).
++  * Updated Standards Version to 3.8.4.
++  * Added README.source for dpatch.
++  * Added ${misc:Depends} in the control file.
++  * Added DM-Upload-Allowed: yes, in the control file.
++  * Changed the homepage field in control file.
++  * Added a patch to fix "hyphen-used-as-minus-sign" in recovermov.1.
++  * Changed dh_clean to dh_prep in debian/rules install target.
++
++ -- William Vera <billy at billy.com.mx>  Tue, 02 Mar 2010 20:50:44 -0600
++
 +recoverjpeg (1.1.4-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * Removed deprecated dh_clean -k at the debian/rules file.
 +  * Updated Standards-Version to 3.8.1.
 +  * Added python as suggests dep.
 +
 + -- William Vera <billy at billy.com.mx>  Wed, 13 May 2009 09:58:00 -0500
 +
 +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/control
index 1cdc617,0000000..5ac5082
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,16 -1,0 +1,17 @@@
 +Source: recoverjpeg
 +Section: graphics
 +Priority: optional
 +Maintainer: William Vera <billy at billy.com.mx>
++DM-Upload-Allowed: yes
 +Build-Depends: debhelper (>= 7.0.0), dpatch
- Standards-Version: 3.8.1
- Homepage: http://www.rfc1149.net/download/recoverjpeg/
++Standards-Version: 3.8.4
++Homepage: http://www.rfc1149.net/devel/recoverjpeg
 +
 +Package: recoverjpeg
 +Architecture: any
- Depends: ${shlibs:Depends}
++Depends: ${shlibs:Depends}, ${misc:Depends}
 +Suggests: imagemagick, exif, python (>=2.5.4-2)
 +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/patches/00list
index fe4a1b7,0000000..e168bfa
mode 100644,000000..100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@@ -1,1 -1,0 +1,2 @@@
 +01_manpagefix.dpatch
++02_fix_recovermov.1.dpatch
diff --cc debian/patches/02_fix_recovermov.1.dpatch
index 0000000,0000000..a2c2c47
new file mode 100644
--- /dev/null
+++ b/debian/patches/02_fix_recovermov.1.dpatch
@@@ -1,0 -1,0 +1,19 @@@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 02_fix_recovermov.1.dpatch by William Vera <billy at billy.com.mx>
++##
++## DP: Minor fix for manpage syntax.
++
++
++ at DPATCH@
++diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' recoverjpeg-2.0~/recovermov.1 recoverjpeg-2.0/recovermov.1
++--- recoverjpeg-2.0~/recovermov.1	2010-01-16 09:20:55.000000000 -0600
+++++ recoverjpeg-2.0/recovermov.1	2010-03-03 20:23:16.000000000 -0600
++@@ -43,7 +43,7 @@
++ (which does not necessarily store files at block boundaries) in
++ \fI/dev/hdb1\fP:
++ 
++-  recovermov -b 1 /dev/hdb1
+++  recovermov \-b 1 /dev/hdb1
++ 
++ .SH AUTHOR
++ .B Recovermov
diff --cc debian/rules
index 03daabb,0000000..5657c76
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,62 -1,0 +1,62 @@@
 +#!/usr/bin/make -f
 +#export DH_VERBOSE=1
 +
 +CFLAGS = -Wall -g
 +
 +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 +	CFLAGS += -O0
 +else
 +	CFLAGS += -O2
 +endif
 +
 +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:  configure-stamp
 +	dh_testdir
 +	$(MAKE)
 +	touch build-stamp
 +
 +clean: unpatch
 +	dh_testdir
 +	dh_testroot
 +	rm -f build-stamp
 +	[ ! -f Makefile ] || $(MAKE) distclean
 +	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
++	dh_prep
 +	dh_installdirs
 +	$(MAKE) install DESTDIR=$(CURDIR)/debian/recoverjpeg
 +
 +binary-indep: build install
 +
 +binary-arch: build install
 +	dh_testdir
 +	dh_testroot
 +	dh_installchangelogs
 +	dh_installdocs
 +	dh_installman
 +	dh_link
 +	dh_strip
 +	dh_compress
 +	dh_fixperms
 +	dh_installdeb
 +	dh_shlibdeps
 +	dh_gencontrol
 +	dh_md5sums
 +	dh_builddeb
 +
 +binary: binary-indep binary-arch
 +.PHONY: build clean binary-indep binary-arch binary install

-- 
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