[Forensics-changes] [recoverjpeg] 18/20: Imported Debian patch 2.2-1
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Mon May 18 23:14:47 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 54f638e0c410efe36e2557ba3025582e88bc458c
Merge: 0b084ad ee39730
Author: William Vera <billy at billy.com.mx>
Date: Tue Aug 21 16:27:21 2012 -0500
Imported Debian patch 2.2-1
ChangeLog | 352 ++++++++++
Makefile.am | 9 +
Makefile.in | 233 +++++--
README | 78 ---
aclocal.m4 | 347 +++++-----
config.h.in | 25 +
configure | 924 ++++++++++++++++----------
configure.ac | 3 +-
debian/changelog | 18 +
debian/compat | 2 +-
debian/control | 2 +-
debian/docs | 1 -
debian/patches/01_manpagefix.patch | 22 +-
debian/patches/02_fix_recovermov.1.patch | 13 -
debian/patches/03_fix_ftbfs_with_gcc_4.7.diff | 10 -
debian/patches/series | 2 -
debian/rules | 3 +
depcomp | 189 ++++--
install-sh | 35 +-
missing | 148 ++---
recoverjpeg.1 | 29 +-
recoverjpeg.c | 240 ++++---
recovermov.1 | 8 +-
recovermov.cpp | 18 +-
sort-pictures | 2 +-
sort-pictures.1 | 2 +-
utils.c | 21 +-
utils.h | 16 +-
28 files changed, 1757 insertions(+), 995 deletions(-)
diff --cc debian/changelog
index 74bdbe3,0000000..ee44c73
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,101 -1,0 +1,119 @@@
++recoverjpeg (2.2-1) unstable; urgency=low
++
++ * New upstream release.
++ * Deleted debian/docs.
++ * Changed debian/rules for Hardening Options.
++ * Updated debian/compat to 9.
++ * debian/control
++ + Added dpkg-dev (>= 1.16.1~) as build-dep.
++ + Updated debhelper version.
++ * debian/patches
++ + Updated 01_manpagefix.patch.
++ + Removed 02_fix_recovermov.1.patch.
++ + Removed 03_fix_ftbfs_with_gcc_4.7.diff.
++ * Acknowledge NMU.
++ + Thanks Matthias Klose.
++
++ -- William Vera <billy at billy.com.mx> Tue, 21 Aug 2012 16:27:21 -0500
++
+recoverjpeg (2.0-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS with gcc 4.7 by fixing missing <unistd.h> include (Cyril
+ Brulebois). Closes: #667353.
+
+ -- Matthias Klose <doko at debian.org> Thu, 05 Apr 2012 09:19:41 +0000
+
+recoverjpeg (2.0-3) unstable; urgency=low
+
+ * Change the patches format for quilt and delete 00list on debian/patches.
+ + This fix FTBFS: dpkg-buildpackage: error (Closes: 643274).
+ * Bump Standards-Version to 3.9.3.
+
+ -- William Vera <billy at billy.com.mx> Mon, 05 Mar 2012 23:11:31 -0600
+
+recoverjpeg (2.0-2) unstable; urgency=low
+
+ * Bump Standards-Version to 3.9.0.
+ * Bump debhelper version to 7.0.50 in the control file.
+ * Switch to dpkg-source 3.0 (quilt) format.
+
+ -- William Vera <billy at billy.com.mx> Wed, 30 Jun 2010 13:18:59 -0500
+
+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/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 39d97f9,0000000..d698350
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,17 -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.50)
++Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~)
+Standards-Version: 3.9.3
+Homepage: http://www.rfc1149.net/devel/recoverjpeg
+
+Package: recoverjpeg
+Architecture: any
+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/01_manpagefix.patch
index f761ffe,0000000..c449948
mode 100755,000000..100644
--- a/debian/patches/01_manpagefix.patch
+++ b/debian/patches/01_manpagefix.patch
@@@ -1,19 -1,0 +1,13 @@@
+Author: William Vera <billy at billy.com.mx>
+Description: Minor fix for manpage syntax.
- --- 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
++--- a/recoverjpeg.1 2012-07-10 09:33:13.000000000 -0500
+++++ b/recoverjpeg.1 2012-08-21 16:39:34.215657508 -0500
++@@ -82,7 +82,7 @@
+
- Do the same thing in a memory constrained environment where no more than
- 16MB of RAM can be used for the operation:
++ Do the same thing but ignore files smaller than one megabyte:
+
- - recoverjpeg -b 1 -r 16m /dev/hdb1
- + recoverjpeg \-b 1 \-r 16m /dev/hdb1
++- recoverjpeg -s 1m /dev/sdc
+++ recoverjpeg \-s 1m /dev/sdc
+
- .SH AUTHOR
- .B Recoverjpeg
++ Recover as many pictures as possible from a crashed ReiserFS file system
++ (which does not necessarily store pictures at block boundaries) in
diff --cc debian/patches/series
index 8e4af44,0000000..2946cc1
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,1 @@@
+01_manpagefix.patch
- 02_fix_recovermov.1.patch
- 03_fix_ftbfs_with_gcc_4.7.diff
diff --cc debian/rules
index 397d966,0000000..a8166ef
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,19 -1,0 +1,22 @@@
+#!/usr/bin/make -f
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+#export DH_OPTIONS=-v
+
++DPKG_EXPORT_BUILDFLAGS = 1
++include /usr/share/dpkg/buildflags.mk
++
+%:
+ dh $@
+
+# Use override_dh_* targets to customize this.
+# ---------------------------------------------------
+# Followings are the old debian/rules
+#
+# #!/usr/bin/make -f
+#
+# %:
+# dh ${@}
+#
+# override_dh_auto_install:
+# $(MAKE) install prefix=$(CURDIR)/debian/recoverjpeg/usr
--
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