[Forensics-changes] [recoverjpeg] 06/20: Imported Debian patch 1.1.1-1.2

[Joao Eriberto Mota Filho]

This is an automated email from the git hooks/post-receive script.

eriberto pushed a commit to branch debian
in repository recoverjpeg.

commit f22fe1447339d1a069946f0c9e976037d8ba2c57
Author: Wouter Verhelst <wouter at debian.org>
Date:   Mon Aug 25 23:30:52 2008 +0200

    Imported Debian patch 1.1.1-1.2
---
 debian/changelog     | 18 ++++++++++++++++++
 debian/compat        |  1 +
 debian/control       |  3 ++-
 debian/debhelper.log | 13 +++++++++++++
 debian/rules         |  4 ++--
 debian/substvars     |  1 +
 recoverjpeg.c        |  2 +-
 sort-pictures        |  2 +-
 8 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3630624..8d36802 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+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
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
index c4a2479..20abce5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,12 @@ Section: graphics
 Priority: optional
 Maintainer: Cyril Bouthors <cyril at bouthors.org>
 Build-Depends: debhelper (>= 4.0.0)
-Standards-Version: 3.6.1
+Standards-Version: 3.8.0
 
 Package: recoverjpeg
 Architecture: any
 Depends: ${shlibs:Depends}
+Suggests: imagemagick, exif
 Description: Recover jpeg pictures 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
diff --git a/debian/debhelper.log b/debian/debhelper.log
new file mode 100644
index 0000000..9fbbf23
--- /dev/null
+++ b/debian/debhelper.log
@@ -0,0 +1,13 @@
+dh_installdirs
+dh_installchangelogs
+dh_installdocs
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_shlibdeps
+dh_gencontrol
+dh_md5sums
+dh_builddeb
diff --git a/debian/rules b/debian/rules
index e4edfa3..f67cd3f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 # ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 # 	cp -f /usr/share/misc/config.sub config.sub
 # endif
@@ -39,7 +39,7 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/recoverjpeg
 
 # Build architecture-independent files here.
 binary-indep: build install
diff --git a/debian/substvars b/debian/substvars
new file mode 100644
index 0000000..36e5a58
--- /dev/null
+++ b/debian/substvars
@@ -0,0 +1 @@
+shlibs:Depends=libc6 (>= 2.7-1)
diff --git a/recoverjpeg.c b/recoverjpeg.c
index 3d8e208..31538ce 100644
--- a/recoverjpeg.c
+++ b/recoverjpeg.c
@@ -205,7 +205,7 @@ main (int argc, char *argv[])
   int page_size;
   off_t offset;
   unsigned char *format;
-  char c;
+  int c;
 
   read_size = 128*1024*1024;
   block_size = 512;
diff --git a/sort-pictures b/sort-pictures
index 05680e2..d26fa2b 100755
--- a/sort-pictures
+++ b/sort-pictures
@@ -33,7 +33,7 @@ dependencies () {
 }
 
 identify > /dev/null 2>&1 || dependencies
-exif > /dev/null 2>&1 || dependencies
+exif --help > /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