[Forensics-changes] [recoverjpeg] 02/02: Imported Debian patch 2.6.1-1
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Fri Nov 18 09:44:08 UTC 2016
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository recoverjpeg.
commit 23968d0ffbcf7fc1c5706777bc6a04c8c82a2ade
Merge: f5cfcc2 a9c2db9
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Wed Nov 16 11:52:19 2016 -0200
Imported Debian patch 2.6.1-1
.gitignore | 14 +
.indent.pro | 1 +
.travis.yml | 14 +
ChangeLog | 483 ---
Makefile.am | 19 +-
Makefile.in | 916 ----
aclocal.m4 | 1152 -----
compile | 347 --
config.h.in | 25 -
configure | 5327 ------------------------
configure.ac | 8 +-
debian/changelog | 18 +
debian/clean | 1 +
debian/compat | 2 +-
debian/control | 16 +-
debian/copyright | 5 +-
debian/watch | 4 +-
depcomp | 791 ----
doc/Makefile.am | 4 +
doc/README.md | 114 +
doc/recoverjpeg.md | 146 +
doc/recovermov.md | 83 +
doc/remove-duplicates.md | 37 +
doc/sort-pictures.md | 46 +
install-sh | 501 ---
missing | 215 -
recoverjpeg.1 | 198 -
recovermov.1 | 100 -
remove-duplicates.1 | 33 -
scripts/Makefile.am | 1 +
remove-duplicates => scripts/remove-duplicates | 0
sort-pictures => scripts/sort-pictures | 2 +-
sort-pictures.1 | 39 -
src/Makefile.am | 4 +
recoverjpeg.c => src/recoverjpeg.c | 14 +-
recovermov.cpp => src/recovermov.cpp | 16 +-
utils.c => src/utils.c | 49 +-
utils.h => src/utils.h | 12 +-
support/test-build.sh | 15 +
tests/Makefile.am | 6 +
tests/chdir-not-ok.test | 9 +
tests/chdir-ok.test | 10 +
42 files changed, 614 insertions(+), 10183 deletions(-)
diff --cc debian/changelog
index aa40de4,0000000..90879be
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,189 -1,0 +1,207 @@@
++recoverjpeg (2.6.1-1) unstable; urgency=medium
++
++ * New upstream release. (LP: #1603685)
++ * Bumped DH level to 10.
++ * debian/clean: added to remove files forgotten after build process.
++ * debian/control:
++ - Added pandoc to Build-Depends field.
++ - Bumped Standards-Version to 3.9.8.
++ - Updated the Vcs-* fields to use https instead of http and git.
++ * debian/copyright:
++ - Added an Upstream-Contact field.
++ - Updated the upstream and packaging copyright years.
++ * debian/watch:
++ - Bumped to version 4.
++ - Removed a source to avoid conflicts with uscan.
++
++ -- Joao Eriberto Mota Filho <eriberto at debian.org> Wed, 16 Nov 2016 11:52:19 -0200
++
+recoverjpeg (2.6-1) unstable; urgency=medium
+
+ * New upstream release.
+ * debian/patches/: removed all patches. The upstream fixed the source code.
+ Thanks.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org> Sun, 11 Oct 2015 22:11:21 -0300
+
+recoverjpeg (2.4-1) unstable; urgency=medium
+
+ * New upstream release.
+ * debian/copyright: updated the upstream copyright years.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org> Sun, 11 Oct 2015 10:23:32 -0300
+
+recoverjpeg (2.3-3) unstable; urgency=medium
+
+ * debian/control: using imagemagick as alternative to
+ graphicsmagick-imagemagick-compat to provide the identify command.
+ Thanks to David Evensky <evensky at gmail.com>. (Closes: #788300)
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org> Tue, 16 Jun 2015 12:30:40 -0300
+
+recoverjpeg (2.3-2) unstable; urgency=medium
+
+ * debian/control: little adjustments in long description.
+ * debian/copyright: added Jan Funke as upstream.
+ * debian/patches/fix-makefile: fixed a spelling error.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org> Tue, 19 May 2015 21:53:40 -0300
+
+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/clean
index 0000000,0000000..43e261f
new file mode 100644
--- /dev/null
+++ b/debian/clean
@@@ -1,0 -1,0 +1,1 @@@
++doc/*.1
diff --cc debian/compat
index ec63514,0000000..f599e28
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 9
++10
diff --cc debian/control
index 559b81a,0000000..aa736c2
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,30 -1,0 +1,30 @@@
+Source: recoverjpeg
+Section: graphics
+Priority: optional
+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
++Build-Depends: debhelper (>= 10), dh-autoreconf, pandoc
++Standards-Version: 3.9.8
+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
++Vcs-Browser: https://anonscm.debian.org/git/forensics/recoverjpeg.git
++Vcs-Git: https://anonscm.debian.org/git/forensics/recoverjpeg.git
+
+Package: recoverjpeg
+Architecture: any
- Depends: ${shlibs:Depends},
- ${misc:Depends},
- exif,
++Depends: exif,
+ graphicsmagick-imagemagick-compat | imagemagick,
- python
++ python,
++ ${misc:Depends},
++ ${shlibs:Depends}
+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.
+ .
+ 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 package acts as a carver (data carving) and is useful in forensics
+ investigations.
diff --cc debian/copyright
index 0d33b61,0000000..9d001a7
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,35 -1,0 +1,36 @@@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: recoverjpeg
++Upstream-Contact: Samuel Tardieu <sam at rfc1149.net>
+Source: http://www.rfc1149.net/devel/recoverjpeg.html or
+ https://github.com/samueltardieu/recoverjpeg
+
+Files: *
- Copyright: 2004-2015 Samuel Tardieu <sam at rfc1149.net>
++Copyright: 2004-2016 Samuel Tardieu <sam at rfc1149.net>
+ 2010-2013 Jan Funke <jan.funke at inf.tu-dresden.de>
+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>
++ 2015-2016 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/watch
index c093ef9,0000000..4c709a9
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,4 -1,0 +1,2 @@@
- version=3
- http://www.rfc1149.net/download/recoverjpeg recoverjpeg-(\d\S+)\.tar\.(?:bz2|gz|xz)
++version=4
+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