[Forensics-changes] [recoverjpeg] 20/20: Imported Debian patch 2.3-1
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Mon May 18 23:14:48 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 f6db4edc9530a2dca85ac65425ca241e16937557
Merge: 54f638e 2428915
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Sun May 17 12:01:42 2015 -0300
Imported Debian patch 2.3-1
COPYING | 41 ++-
ChangeLog | 83 ++++++
Makefile.am | 7 +-
Makefile.in | 292 +++++++++++--------
aclocal.m4 | 439 ++++++++++++++++++++---------
compile | 347 +++++++++++++++++++++++
configure | 205 ++++++++++++--
configure.ac | 4 +-
debian/README.source | 38 ---
debian/changelog | 39 +++
debian/control | 34 ++-
debian/copyright | 59 ++--
debian/dirs | 1 -
debian/manpages | 1 -
debian/patched/01_manpagefix.dpatch | 1 -
debian/patched/02_fix_recovermov.1.dpatch | 1 -
debian/patches/01_manpagefix.patch | 13 -
debian/patches/fix-makefile | 13 +
debian/patches/fix-sort-pictures-command | 17 ++
debian/patches/series | 3 +-
debian/remove-duplicates.1 | 31 --
debian/rules | 21 +-
debian/watch | 4 +-
depcomp | 454 ++++++++++++++++++------------
missing | 405 ++++++++++----------------
recoverjpeg.1 | 240 +++++++++-------
recoverjpeg.c | 28 +-
recovermov.1 | 115 ++++----
remove-duplicates.1 | 33 +++
sort-pictures.1 | 72 +++--
utils.c | 15 +-
31 files changed, 1966 insertions(+), 1090 deletions(-)
diff --cc debian/changelog
index ee44c73,0000000..db342ed
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,119 -1,0 +1,158 @@@
++recoverjpeg (2.3-1) unstable; urgency=medium
++
++ * New maintainer and co-maintainer. Thanks to William Vera, the last
++ maintainer. (Closes: #781960)
++ * New upstream release. (Closes: #731079)
++ * debian/control:
++ * Added dh-autoreconf to Build-Depends field.
++ * Added the Vcs-* fields.
++ * Added exif and graphicsmagick-imagemagick-compat to Depends field.
++ * Bumped Standards-Version to 3.9.6.
++ * Improved and updated short and long descriptions.
++ * Moved python from Suggests to Depends field.
++ * Removed dpkg-dev from Build-Depends field. This is unnecessary now.
++ * Removed the deprecated field 'DM-Upload-Allowed'.
++ * Removed an unnecessary relationship for Python in Depends field.
++ * Removed the Suggests field.
++ * debian/copyright:
++ * Migrated to 1.0 format.
++ * Updated all information.
++ * debian/dirs: useless now. Removed.
++ * debian/manpages: removed. No longer needed.
++ * debian/patched/: useless. Removed.
++ * debian/patches:
++ - Added the fix-makefile patch to avoid remove a needed manpage.
++ - Added fix-sort-pictures-command to avoid a false positive in
++ sort-pictures command. (Closes: #766496)
++ - Removed the 01_manpagefix.patch. The upstream fixed the source code.
++ * debian/README.source: removed. This is no longer required.
++ * debian/remove-duplicates.1: removed. The upstream is providing this
++ manpage. Thanks!
++ * debian/rules:
++ - Added the variable DEB_BUILD_MAINT_OPTIONS to improve the hardening.
++ - Removed some useless lines.
++ * debian/watch:
++ - Improved the current source.
++ - Added a new source.
++
++ -- Joao Eriberto Mota Filho <eriberto at debian.org> Sun, 17 May 2015 12:01:42 -0300
++
+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/control
index d698350,0000000..6f432f3
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,17 -1,0 +1,31 @@@
+Source: recoverjpeg
+Section: graphics
+Priority: optional
- Maintainer: William Vera <billy at billy.com.mx>
- DM-Upload-Allowed: yes
- Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~)
- Standards-Version: 3.9.3
++Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
++Uploaders: Joao Eriberto Mota Filho <eriberto at debian.org>
++Build-Depends: debhelper (>= 9), dh-autoreconf
++Standards-Version: 3.9.6
+Homepage: http://www.rfc1149.net/devel/recoverjpeg
++Vcs-Browser: https://anonscm.debian.org/cgit/forensics/recoverjpeg.git
++Vcs-Git: git://anonscm.debian.org/forensics/recoverjpeg.git
+
+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.
++Depends: ${shlibs:Depends},
++ ${misc:Depends},
++ exif,
++ graphicsmagick-imagemagick-compat,
++ python
++Description: recover JFIF (JPEG) pictures and MOV movies
++ recoverjpeg tries to recover JFIF (JPEG) pictures and MOV movies from
++ a peripheral. This may be useful if you mistakenly overwrite a partition
++ or if a device such as a digital camera memory card is bogus. You can
++ also read the recoverjpeg story.
++ .
++ This package provides these executables: recoverjpeg, recovermov,
++ remove-duplicates and sort-pictures. The remove-duplicates is useful to
++ remove duplicate files found. sort-pictures can be used to sort pictures
++ according to exif date
++ .
++ This program acts as a carver (data carving) and is useful in forensics
++ investigations.
diff --cc debian/copyright
index 7d0a4e6,0000000..705dcdf
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,25 -1,0 +1,34 @@@
- 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 (C) 2004 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-2 file.
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Upstream-Name: recoverjpeg
++Source: http://www.rfc1149.net/devel/recoverjpeg.html or
++ https://github.com/samueltardieu/recoverjpeg
++
++Files: *
++Copyright: 2004-2014 Samuel Tardieu <sam at rfc1149.net>
++License: GPL-2
++
++Files: debian/*
++Copyright: 2004-2005 Cyril Bouthors <cyril at bouthors.org>
++ 2007 Aurélien GÉRÔME <ag at roxor.cx>
++ 2008 Wouter Verhelst <wouter at debian.org>
++ 2008-2012 William Vera <billy at billy.com.mx>
++ 2012 Matthias Klose <doko at debian.org>
++ 2015 Joao Eriberto Mota Filho <eriberto at debian.org>
++License: GPL-2+
++
++License: GPL-2 or 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 program. If not, see <http://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/patches/fix-makefile
index 0000000,0000000..ce7cf36
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix-makefile
@@@ -1,0 -1,0 +1,13 @@@
++Description: fix Makefile to avoid remove a essential manpage.
++Author: Joao Eriberto Mota Filho <eriberto at debian.org>
++Last-Update: 2015-05-17
++Index: recoverjpeg-2.3/Makefile.am
++===================================================================
++--- recoverjpeg-2.3.orig/Makefile.am
+++++ recoverjpeg-2.3/Makefile.am
++@@ -18,4 +18,4 @@ recovermov_SOURCES = recovermov.cpp util
++ .md.1:
++ pandoc -s -w man $< -o $@
++
++-CLEANFILES = recoverjpeg.1
+++#CLEANFILES = recoverjpeg.1
diff --cc debian/patches/fix-sort-pictures-command
index 0000000,0000000..4a145c6
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix-sort-pictures-command
@@@ -1,0 -1,0 +1,17 @@@
++Description: fix the sort-picture command.
++Bug: #766496
++Author: Joao Eriberto Mota Filho <eriberto at debian.org>
++Last-Update: 2015-05-17
++Index: recoverjpeg-2.3/sort-pictures
++===================================================================
++--- recoverjpeg-2.3.orig/sort-pictures
+++++ recoverjpeg-2.3/sort-pictures
++@@ -32,7 +32,7 @@ dependencies () {
++ exit 1
++ }
++
++-identify > /dev/null 2>&1 || dependencies
+++[ -f /usr/bin/identify ] || dependencies
++ exif --version > /dev/null 2>&1 || dependencies
++
++ for i in image?????*.jpg; do
diff --cc debian/patches/series
index 2946cc1,0000000..29a6d00
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
- 01_manpagefix.patch
++fix-sort-pictures-command
++fix-makefile
diff --cc debian/rules
index a8166ef,0000000..a4e5cca
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,22 -1,0 +1,7 @@@
+#!/usr/bin/make -f
- # Uncomment this to turn on verbose mode.
- #export DH_VERBOSE=1
- #export DH_OPTIONS=-v
++# export DH_VERBOSE=1
+
- DPKG_EXPORT_BUILDFLAGS = 1
- include /usr/share/dpkg/buildflags.mk
++export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+%:
- 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
++ dh $@ --with autoreconf
diff --cc debian/watch
index df3e0fe,0000000..c093ef9
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,4 -1,0 +1,4 @@@
+version=3
- http://www.rfc1149.net/download/recoverjpeg/ \
- recoverjpeg-([\d\.]*).tar.gz
++http://www.rfc1149.net/download/recoverjpeg recoverjpeg-(\d\S+)\.tar\.(?:bz2|gz|xz)
++https://github.com/samueltardieu/recoverjpeg/releases .*/archive/v?(\d\S+)\.tar\.(?:bz2|gz|xz)
+
--
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