[Forensics-changes] [recoverjpeg] 01/02: Imported Upstream version 2.6

Mon Oct 12 13:27:51 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 455df2054cb54c6641fdac89d881e4dee91df5d7
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Mon Oct 12 10:27:22 2015 -0300

    Imported Upstream version 2.6
---
 ChangeLog     | 21 +++++++++++++++++++++
 Makefile.am   |  2 --
 Makefile.in   |  2 --
 configure     | 20 ++++++++++----------
 configure.ac  |  2 +-
 sort-pictures |  4 ++--
 6 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a724861..a007e41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2015-10-11  Samuel Tardieu <sam at rfc1149.net>
+
+	* configure.ac: Version 2.6
+
+2015-10-11  Samuel Tardieu <sam at rfc1149.net>
+
+	* Makefile.am: Fix #7: impossible rebuild without pandoc after
+	distclean
+
+2015-10-11  Samuel Tardieu <sam at rfc1149.net>
+
+	* configure.ac: Version 2.5
+
+2015-10-11  Samuel Tardieu <sam at rfc1149.net>
+
+	* sort-pictures: Fix #8: sort-pictures always fail
+
+2015-09-22  Samuel Tardieu <sam at rfc1149.net>
+
+	* .travis.yml: Fix typo in .travis.yml
+
 2015-09-22  Samuel Tardieu <sam at rfc1149.net>
 
 	* configure.ac: Version 2.4
diff --git a/Makefile.am b/Makefile.am
index 5128dae..a4e8dd3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,5 +17,3 @@ recovermov_SOURCES = recovermov.cpp utils.c utils.h
 
 .md.1:
 	pandoc -s -w man $< -o $@
-
-CLEANFILES = recoverjpeg.1
diff --git a/Makefile.in b/Makefile.in
index a15ce0c..9a8dd79 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -325,7 +325,6 @@ dist_man_MANS = recoverjpeg.1 recovermov.1 sort-pictures.1 remove-duplicates.1
 extra_DIST = ChangeLog
 recoverjpeg_SOURCES = recoverjpeg.c utils.c utils.h
 recovermov_SOURCES = recovermov.cpp utils.c utils.h
-CLEANFILES = recoverjpeg.1
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -797,7 +796,6 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
diff --git a/configure b/configure
index d1752b1..752c7ca 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for recoverjpeg 2.4.
+# Generated by GNU Autoconf 2.69 for recoverjpeg 2.6.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -576,8 +576,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='recoverjpeg'
 PACKAGE_TARNAME='recoverjpeg'
-PACKAGE_VERSION='2.4'
-PACKAGE_STRING='recoverjpeg 2.4'
+PACKAGE_VERSION='2.6'
+PACKAGE_STRING='recoverjpeg 2.6'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1231,7 +1231,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures recoverjpeg 2.4 to adapt to many kinds of systems.
+\`configure' configures recoverjpeg 2.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1297,7 +1297,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of recoverjpeg 2.4:";;
+     short | recursive ) echo "Configuration of recoverjpeg 2.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1389,7 +1389,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-recoverjpeg configure 2.4
+recoverjpeg configure 2.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1482,7 +1482,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by recoverjpeg $as_me 2.4, which was
+It was created by recoverjpeg $as_me 2.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2346,7 +2346,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='recoverjpeg'
- VERSION='2.4'
+ VERSION='2.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4401,7 +4401,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by recoverjpeg $as_me 2.4, which was
+This file was extended by recoverjpeg $as_me 2.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4467,7 +4467,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-recoverjpeg config.status 2.4
+recoverjpeg config.status 2.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 3711572..0eabb08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([recoverjpeg], [2.4])
+AC_INIT([recoverjpeg], [2.6])
 AC_CONFIG_SRCDIR([recoverjpeg.c])
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADER([config.h])
diff --git a/sort-pictures b/sort-pictures
index 13efcea..1a925f2 100755
--- a/sort-pictures
+++ b/sort-pictures
@@ -32,8 +32,8 @@ dependencies () {
  exit 1
 }
 
-identify > /dev/null 2>&1 || dependencies
-exif --version > /dev/null 2>&1 || dependencies
+type identify > /dev/null 2>&1 || dependencies
+type exif > /dev/null 2>&1 || dependencies
 
 for i in image?????*.jpg; do
  d=`destdir $i`

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

