[Forensics-changes] [exifprobe] 02/02: * New maintainer and co-maintainer. Thanks a lot to Martin Albisetti, the initial maintainer, for your nice work over this package. (Closes: #738911) * Migrations: - Copyright to 1.0 format. - Debian format from 1.0 to 3.0. - debian/rules to new (reduced) format. * debian/control: - Added the Vcs-* fields to control the Debian packaging. - Added 'xutils-dev' to Build-Depends field. - Added the Homepage field. - Bumped Standards-Version to 3.9.6. - Removed the reference to upstream homepage from long description. - Removed the duplicated 'most' word. Thanks to Aputsiaq Janussen <aj at isit.gl>. (Closes: #641179) - Updated the short and long description. * debian/dirs: useless. Removed. * debian/docs: - Moved CHANGES_2.0 to new debian/exifprobe.changelog file. - Removed the LICENSE.EXIFPROBE file. * debian/patches/: - Added the 'add_byteorder' and 'Makefile' patches to replace the direct changes made in upstream code in past. - Added the 'fix_manpages' and 'fix_spelling_error' patches. - Added the 'fix-exifgrep' patch. Thanks a lot to Daniel Friesel <derf at chaosdorf.de>. (Closes: #597123) * debian/rules: set a special target to install the upstream changelog. (Closes: #670994) * debian/watch: added. (Closes: #462040)
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Tue Oct 28 13:02:28 UTC 2014
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository exifprobe.
commit 1f238dca932f0eee41a446610a7e03308696d282
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Tue Oct 28 11:01:41 2014 -0200
* New maintainer and co-maintainer. Thanks a lot to Martin Albisetti,
the initial maintainer, for your nice work over this package.
(Closes: #738911)
* Migrations:
- Copyright to 1.0 format.
- Debian format from 1.0 to 3.0.
- debian/rules to new (reduced) format.
* debian/control:
- Added the Vcs-* fields to control the Debian packaging.
- Added 'xutils-dev' to Build-Depends field.
- Added the Homepage field.
- Bumped Standards-Version to 3.9.6.
- Removed the reference to upstream homepage from long description.
- Removed the duplicated 'most' word. Thanks to Aputsiaq Janussen
<aj at isit.gl>. (Closes: #641179)
- Updated the short and long description.
* debian/dirs: useless. Removed.
* debian/docs:
- Moved CHANGES_2.0 to new debian/exifprobe.changelog file.
- Removed the LICENSE.EXIFPROBE file.
* debian/patches/:
- Added the 'add_byteorder' and 'Makefile' patches to replace the
direct changes made in upstream code in past.
- Added the 'fix_manpages' and 'fix_spelling_error' patches.
- Added the 'fix-exifgrep' patch. Thanks a lot to Daniel Friesel
<derf at chaosdorf.de>. (Closes: #597123)
* debian/rules: set a special target to install the upstream changelog.
(Closes: #670994)
* debian/watch: added. (Closes: #462040)
---
debian/changelog | 35 +++++++++++-
debian/control | 24 ++++----
debian/copyright | 113 +++++++++++++++++++-------------------
debian/dirs | 2 -
debian/docs | 2 -
debian/patches/Makefile | 59 ++++++++++++++++++++
debian/patches/add_byteorder | 9 +++
debian/patches/fix-exifgrep | 38 +++++++++++++
debian/patches/fix-manpages | 92 +++++++++++++++++++++++++++++++
debian/patches/fix_spelling_error | 68 +++++++++++++++++++++++
debian/patches/series | 5 ++
debian/rules | 90 ++----------------------------
debian/source/format | 1 +
debian/watch | 2 +
14 files changed, 382 insertions(+), 158 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9e559e5..66c020a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,37 @@
+exifprobe (2.0.1-3) unstable; urgency=medium
+
+ * New maintainer and co-maintainer. Thanks a lot to Martin Albisetti,
+ the initial maintainer, for your nice work over this package.
+ (Closes: #738911)
+ * Migrations:
+ - Copyright to 1.0 format.
+ - Debian format from 1.0 to 3.0.
+ - debian/rules to new (reduced) format.
+ * debian/control:
+ - Added the Vcs-* fields to control the Debian packaging.
+ - Added 'xutils-dev' to Build-Depends field.
+ - Added the Homepage field.
+ - Bumped Standards-Version to 3.9.6.
+ - Removed the reference to upstream homepage from long description.
+ - Removed the duplicated 'most' word. Thanks to Aputsiaq Janussen
+ <aj at isit.gl>. (Closes: #641179)
+ - Updated the short and long description.
+ * debian/dirs: useless. Removed.
+ * debian/docs:
+ - Moved CHANGES_2.0 to new debian/exifprobe.changelog file.
+ - Removed the LICENSE.EXIFPROBE file.
+ * debian/patches/:
+ - Added the 'add_byteorder' and 'Makefile' patches to replace the
+ direct changes made in upstream code in past.
+ - Added the 'fix_manpages' and 'fix_spelling_error' patches.
+ - Added the 'fix-exifgrep' patch. Thanks a lot to Daniel Friesel
+ <derf at chaosdorf.de>. (Closes: #597123)
+ * debian/rules: set a special target to install the upstream changelog.
+ (Closes: #670994)
+ * debian/watch: added. (Closes: #462040)
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org> Mon, 27 Oct 2014 09:29:00 -0200
+
exifprobe (2.0.1-2) unstable; urgency=medium
* QA upload.
@@ -14,4 +48,3 @@ exifprobe (2.0.1-1) unstable; urgency=low
* Fixed Makefile and emailed changes upstream
-- Martin Albisetti <argentina at gmail.com> Wed, 13 Jun 2007 16:31:10 +0100
-
diff --git a/debian/control b/debian/control
index a6f6f55..3dee09c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,21 +1,23 @@
Source: exifprobe
Section: graphics
Priority: optional
-Maintainer: Debian QA Group <packages at qa.debian.org>
-Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.5
+Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
+Uploaders: Joao Eriberto Mota Filho <eriberto at debian.org>
+Build-Depends: debhelper (>= 9), xutils-dev
+Standards-Version: 3.9.6
+Homepage: https://github.com/hfiguiere/exifprobe
+Vcs-Browser: http://anonscm.debian.org/cgit/forensics/exifprobe.git
+Vcs-Git: git://anonscm.debian.org/forensics/exifprobe.git
Package: exifprobe
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Read metadata from digital pictures
+Description: read metadata from digital pictures
Exifprobe reads image files produced by digital cameras (including
several so-called "raw" file formats) and reports the structure of
- the files and the auxiliary data and metadata contained within
- them. In addition to TIFF, JPEG, and EXIF, the program understands
- several formats which may contain "raw" camera data, including MRW,
- CIFF/CRW, JP2/JPEG2000, RAF, and X3F, as well as most most
- TIFF-derived "raw" formats, including DNG, ORF, CR2, NEF,
- K25/KDC/DCR, and PEF.
+ the files and the auxiliary data and metadata contained within them.
.
- http://www.virtual-cafe.com/~dhh/tools.d/exifprobe.d/exifprobe.html
+ In addition to TIFF, JPEG and EXIF, the program understands several
+ formats which may contain "raw" camera data, including MRW, CIFF/CRW,
+ JP2/JPEG2000, RAF, and X3F, as well as most TIFF-derived "raw" formats,
+ including DNG, ORF, CR2, NEF, K25/KDC/DCR and PEF.
diff --git a/debian/copyright b/debian/copyright
index cfc89b7..c3834ed 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,58 +1,55 @@
-This package was debianized by Martin Albisetti <argentina at gmail.com> on
-Wed, 13 Jun 2007 16:31:10 0100.
-
-It was downloaded from http://www.virtual-cafe.com/~dhh/tools.d/exifprobe.d/exifprobe.html
-
-Upstream Author: Duane H. Hesser <dhh at virtual-cafe.com>
-
-Copyright: Copyright: (C) 2005 <dhh at virtual-cafe.com> Duane H. Hesser
-
-License:
-
-All of the files included in the EXIFPROBE distribution are:
-
- Copyright (C) 2005 by Duane H. Hesser. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-However, there is a little note:
-
-"Some individual files may be covered by other copyrights."
-
-Not finding any evidence of such different copyright, I mailed the
-author. Here is his reply:
-
-> There are no files in the distribution currently which bear separate
-> copyrights; all files included are "personally produced".
->
-> It is difficult to recall (it's been a while), but I may have intended
-> to include documents with external copyrights, although that has never
-> happened, and likely never will.
-
-
-The Debian packaging is (C) 2007, Martin Albisetti <argentina at gmail.com> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: exifprobe
+Source: https://github.com/hfiguiere/exifprobe
+Comment: the original source was this[1]. However, this homepage no longer
+ exist and the code appear has a new upstream[2].
+ [1] http://www.virtual-cafe.com/~dhh/tools.d/exifprobe.d/exifprobe.html
+ [2] https://github.com/hfiguiere/exifprobe
+
+Files: *
+Copyright: Duane H. Hesser <dhh at virtual-cafe.com>
+License: BSD-2-Clause
+
+Files: debian/*
+Copyright: 2007 Martin Albisetti <argentina at gmail.com>
+ 2014 Joao Eriberto Mota Filho <eriberto at debian.org>
+License: GPL-3.0+
+
+License: BSD-2-Clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE HOLDERS OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: GPL-3.0+
+ 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, either version 3 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 3 can be found in "/usr/share/common-licenses/GPL-3".
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index ca882bb..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/debian/docs b/debian/docs
index 88902ed..b3b781a 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,7 +1,5 @@
ABOUT_PIM
CAMERA_makes_and_models
-CHANGES_2.0
CREDITS
DESCRIPTION
-LICENSE.EXIFPROBE
MAKER_NOTES
diff --git a/debian/patches/Makefile b/debian/patches/Makefile
new file mode 100644
index 0000000..3b36651
--- /dev/null
+++ b/debian/patches/Makefile
@@ -0,0 +1,59 @@
+Description: makes Makefile compliant with Debian and add GCC hardening.
+Author: Martin Albisetti <argentina at gmail.com>
+Last-Update: 2007-06-13
+
+Index: exifprobe-2.0.1/Makefile
+===================================================================
+--- exifprobe-2.0.1.orig/Makefile
++++ exifprobe-2.0.1/Makefile
+@@ -3,7 +3,7 @@
+
+ # Any compiler should do
+ CC=cc
+-CFLAGS=-DCOLOR -O
++CFLAGS+=-DCOLOR -O
+
+ # You probably don't need these
+ # CFLAGS=-DCOLOR -g -O -Dlint -Wall -Wno-long-long
+@@ -22,9 +22,10 @@ CFLAGS=-DCOLOR -O
+ #CFLAGS += -DNATIVE_BYTEORDER_BIGENDIAN # or add to ./byteorder.h
+
+ # On Solaris, you may need to use 'gmake', or edit the next line.
+-PREFIX ?= /usr/local
+-BINDIR=$(PREFIX)/bin
+-MANDIR=$(PREFIX)/man/man1
++INSTALL = install -d -m 644
++PREFIX ?= $(DESTDIR)/usr
++BINDIR=$(PREFIX)/bin/local
++MANDIR=$(PREFIX)/share/man/man1
+
+
+ INCLUDES=defs.h extern.h misc.h tifftags.h exiftags.h \
+@@ -63,18 +64,21 @@ byteorder.h:
+ @echo
+
+ veclib.o: lib/veclib.c
+- $(CC) -o veclib.o -c $(CFLAGS) lib/veclib.c
++ $(CC) -o veclib.o -c $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) lib/veclib.c
+
+ # Need the math library to calculate some APEX things...
+ exifprobe: $(OBJS) $(INCLUDES) Makefile
+ ./mkcomptime > comptime.c
+- $(CC) -o exifprobe $(CFLAGS) $(OBJS) comptime.c -lm
++ $(CC) -o exifprobe $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) $(OBJS) comptime.c -lm
+
+ install: all
+- cp exifprobe $(BINDIR)
+- cp exifgrep $(BINDIR)
+- cp exifprobe.1 $(MANDIR)
+- cp exifgrep.1 $(MANDIR)
++ install -d $(PREFIX)/bin
++ install -d $(PREFIX)/share/man/man1
++ install -c -m 755 exifprobe $(PREFIX)/bin
++ install -c -m 755 exifgrep $(PREFIX)/bin
++ install -c -m 644 exifprobe.1 $(PREFIX)/share/man/man1
++ install -c -m 644 exifgrep.1 $(PREFIX)/share/man/man1
++
+
+ # if you want HTML man pages, pick a target; I prefer man2html
+ rman: exifprobe.1 exifgrep.1
diff --git a/debian/patches/add_byteorder b/debian/patches/add_byteorder
new file mode 100644
index 0000000..d5bac1a
--- /dev/null
+++ b/debian/patches/add_byteorder
@@ -0,0 +1,9 @@
+Description: add the byteorder.h file.
+Author: Martin Albisetti <argentina at gmail.com>
+Last-Update: 2007-06-13
+Index: exifprobe-2.0.1/byteorder.h
+===================================================================
+--- /dev/null
++++ exifprobe-2.0.1/byteorder.h
+@@ -0,0 +1 @@
++#define NATIVE_BYTEORDER_UNKNOWN /* assume little-endian */
diff --git a/debian/patches/fix-exifgrep b/debian/patches/fix-exifgrep
new file mode 100644
index 0000000..e2a54d7
--- /dev/null
+++ b/debian/patches/fix-exifgrep
@@ -0,0 +1,38 @@
+Description: makes exifgrep to escape patterns
+Author: Daniel Friesel <derf at chaosdorf.de>
+Last-Update: 2010-09-16
+Index: exifprobe-2.0.1/exifgrep
+===================================================================
+--- exifprobe-2.0.1.orig/exifgrep
++++ exifprobe-2.0.1/exifgrep
+@@ -183,7 +183,7 @@ do
+ *) notpattern="$2"; shift; shift; break ;;
+ esac
+ ;;
+- *) pattern=$1; shift
++ *) pattern="$1"; shift
+ case $1 in
+ NOT) case "$2" in
+ -f) notpattern="-f $3"; shift; shift; shift; break ;;
+@@ -213,17 +213,17 @@ esac
+ # exifprobe -L output.
+
+ case $# in
+- 0) egrep ${egrep_options} ${pattern} | format
++ 0) egrep ${egrep_options} "${pattern}" | format
+ ;;
+ *) case $# in
+ 1) ;;
+ *) nameopt="-n" ;; # Use names if more than one file
+ esac
+ case "${notpattern}" in
+- "") ${PROBE} -L ${coloropt} ${nameopt} ${tagopt} $* | egrep ${egrep_options} ${pattern} | format ;;
++ "") ${PROBE} -L ${coloropt} ${nameopt} ${tagopt} $* | egrep ${egrep_options} "${pattern}" | format ;;
+ *) case "${pattern}" in
+- "") ${PROBE} -L ${coloropt} ${nameopt} ${tagopt} $* | egrep ${egrep_options} -v ${notpattern} | format ;;
+- *) ${PROBE} -L ${coloropt} ${nameopt} ${tagopt} $* | egrep ${egrep_options} ${pattern} | egrep -v ${notpattern} | format ;;
++ "") ${PROBE} -L ${coloropt} ${nameopt} ${tagopt} $* | egrep ${egrep_options} -v "${notpattern}" | format ;;
++ *) ${PROBE} -L ${coloropt} ${nameopt} ${tagopt} $* | egrep ${egrep_options} "${pattern}" | egrep -v "${notpattern}" | format ;;
+ esac
+ ;;
+ esac
diff --git a/debian/patches/fix-manpages b/debian/patches/fix-manpages
new file mode 100644
index 0000000..6e14011
--- /dev/null
+++ b/debian/patches/fix-manpages
@@ -0,0 +1,92 @@
+Description: fix some mistakes in manpages.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2014-10-27
+Index: exifprobe-2.0.1/exifgrep.1
+===================================================================
+--- exifprobe-2.0.1.orig/exifgrep.1
++++ exifprobe-2.0.1/exifgrep.1
+@@ -1,8 +1,8 @@
+-...
+-... (C) Copyright 2003, 2005 Duane H. Hesser, see LICENSE.EXIFPROBE file
+-... @(#) $Id: exifgrep.1,v 1.3 2005/07/02 13:08:18 alex Exp $
+-...
+-
++.\" ...
++.\" ... (C) Copyright 2003, 2005 Duane H. Hesser, see LICENSE.EXIFPROBE file
++.\" ... @(#) $Id: exifgrep.1,v 1.3 2005/07/02 13:08:18 alex Exp $
++.\" ...
++.\"
+ .TH EXIFGREP 1 LOCAL
+ .SH NAME
+ exifgrep \- select and reformat the output of \fBexifprobe\fP
+Index: exifprobe-2.0.1/exifprobe.1
+===================================================================
+--- exifprobe-2.0.1.orig/exifprobe.1
++++ exifprobe-2.0.1/exifprobe.1
+@@ -1,8 +1,8 @@
+-...
+-... (C) Copyright 2002, 2003, 2005 Duane H. Hesser, see LICENSE.EXIFPROBE file
+-... @(#) $Id: exifprobe.1,v 1.30 2005/07/12 18:16:47 alex Exp $
+-...
+-
++.\" ...
++.\" ... (C) Copyright 2002, 2003, 2005 Duane H. Hesser, see LICENSE.EXIFPROBE file
++.\" ... @(#) $Id: exifprobe.1,v 1.30 2005/07/12 18:16:47 alex Exp $
++.\" ...
++.\"
+ .TH EXIFPROBE 1 LOCAL
+ .SH NAME
+ exifprobe \- probe and report structure and metadata content of camera image files
+@@ -15,7 +15,7 @@ exifprobe \- probe and report structure
+ .B Exifprobe
+ reads image files produced by digital cameras (including several
+ so-called "raw" file formats) and reports the structure of the files and
+-the auxilliary data and metadata contained within them. In addition to
++the auxiliary data and metadata contained within them. In addition to
+ TIFF, JPEG, and EXIF, the program understands several formats which may
+ contain "raw" camera data, including MRW, CIFF/CRW, JP2/JPEG2000, RAF,
+ and X3F, as well as most most TIFF-derived "raw" formats, including DNG,
+@@ -162,7 +162,7 @@ in red. These sequences are effective,
+ course, only for terminals or terminal emulators (e.g. \fBxterm\fP)
+ which respond to ANSI color escape sequences. If a pager is used
+ to display the output when these sequences are present, a \*(lqraw\*(rq
+-option to the pager may be required (e.g. \fBless\fP -R). The use
++option to the pager may be required (e.g. \fBless\fP \-R). The use
+ of these sequences may be toggled by the \fB-c\fP option. LIST mode
+ turns color sequences off.
+
+@@ -334,7 +334,7 @@ contains multiple image sections.
+ The \*(lqvalue\*(rq of tags or items which represent an offset to a subsection
+ or image are printed in \fIlist\fP format as \*(lq\fI at offset:length\fP\*(rq.
+
+-The List format is used by the auxilliary script \fBexifgrep\fP, which permits
++The List format is used by the auxiliary script \fBexifgrep\fP, which permits
+ selective extraction of information e.g. for photo galleries, and output in
+ (almost) \*(lqshell variable\*(rq format.
+
+@@ -348,14 +348,14 @@ in the pre-defined formats.
+ As an example, the command:
+ .nf
+
+- \fIexifprobe -Z -et somefile.tif\fP
++ \fIexifprobe \-Z \-et somefile.tif\fP
+
+ .fi
+ may be used to list just the TIFF and Exif tags, without values (or anything
+ else) in \*(lqlong name\*(rq format.
+ .nf
+
+- \fI exifprobe -eNnT somefile.tif\fP
++ \fI exifprobe \-eNnT somefile.tif\fP
+
+ .fi
+ will print in structural format, suppressing output of hex and decimal
+@@ -369,7 +369,7 @@ The environment variable \fBEXIFPROBE_OP
+ valid option string, which will be evaluated before command line
+ options. E.g.
+
+-export EXIFPROBE_OPTIONS='-L -c'
++export EXIFPROBE_OPTIONS='\-L \-c'
+
+ will make list format the default output format, and re-enable the
+ color sequences turned off by \fI-L\fP.
diff --git a/debian/patches/fix_spelling_error b/debian/patches/fix_spelling_error
new file mode 100644
index 0000000..de1334b
--- /dev/null
+++ b/debian/patches/fix_spelling_error
@@ -0,0 +1,68 @@
+Description: fix a spelling error in some files.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2014-10-27
+Index: exifprobe-2.0.1/maker_agfa.c
+===================================================================
+--- exifprobe-2.0.1.orig/maker_agfa.c
++++ exifprobe-2.0.1/maker_agfa.c
+@@ -394,7 +394,7 @@ agfa1_interpret_offset_makervalue(FILE *
+ switch(value)
+ {
+ case 0: chpr += printf("Normal"); break;
+- case 1: chpr += printf("Unkown"); break;
++ case 1: chpr += printf("Unknown"); break;
+ case 2: chpr += printf("Fast"); break;
+ case 3: chpr += printf("Panorama,");
+ value = read_ulong(inptr,byteorder,HERE);
+Index: exifprobe-2.0.1/maker_epson.c
+===================================================================
+--- exifprobe-2.0.1.orig/maker_epson.c
++++ exifprobe-2.0.1/maker_epson.c
+@@ -508,7 +508,7 @@ epson1_interpret_offset_makervalue(FILE
+ switch(value)
+ {
+ case 0: chpr += printf("Normal"); break;
+- case 1: chpr += printf("Unkown"); break;
++ case 1: chpr += printf("Unknown"); break;
+ case 2: chpr += printf("Fast"); break;
+ case 3: chpr += printf("Panorama,");
+ value = read_ulong(inptr,byteorder,HERE);
+Index: exifprobe-2.0.1/maker_minolta.c
+===================================================================
+--- exifprobe-2.0.1.orig/maker_minolta.c
++++ exifprobe-2.0.1/maker_minolta.c
+@@ -596,7 +596,7 @@ minolta1_interpret_offset_makervalue(FIL
+ switch(value)
+ {
+ case 0: chpr += printf("Normal"); break;
+- case 1: chpr += printf("Unkown"); break;
++ case 1: chpr += printf("Unknown"); break;
+ case 2: chpr += printf("Fast"); break;
+ case 3: chpr += printf("Panorama,");
+ value = read_ulong(inptr,byteorder,HERE);
+Index: exifprobe-2.0.1/maker_olympus.c
+===================================================================
+--- exifprobe-2.0.1.orig/maker_olympus.c
++++ exifprobe-2.0.1/maker_olympus.c
+@@ -464,7 +464,7 @@ olympus1_interpret_offset_makervalue(FIL
+ switch(value)
+ {
+ case 0: chpr += printf("Normal"); break;
+- case 1: chpr += printf("Unkown"); break;
++ case 1: chpr += printf("Unknown"); break;
+ case 2: chpr += printf("Fast"); break;
+ case 3: chpr += printf("Panorama,");
+ value = read_ulong(inptr,byteorder,HERE);
+Index: exifprobe-2.0.1/maker_sanyo.c
+===================================================================
+--- exifprobe-2.0.1.orig/maker_sanyo.c
++++ exifprobe-2.0.1/maker_sanyo.c
+@@ -605,7 +605,7 @@ sanyo1_interpret_offset_makervalue(FILE
+ switch(value)
+ {
+ case 0: chpr += printf("Normal"); break;
+- case 1: chpr += printf("Unkown"); break;
++ case 1: chpr += printf("Unknown"); break;
+ case 2: chpr += printf("Fast"); break;
+ case 3: chpr += printf("Panorama,");
+ value = read_ulong(inptr,byteorder,HERE);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5b4f621
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+fix-exifgrep
+fix-manpages
+fix_spelling_error
+add_byteorder
+Makefile
diff --git a/debian/rules b/debian/rules
index bf97bfc..44e9e35 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,88 +1,10 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
+# export DH_VERBOSE=1
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+%:
+ dh $@
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
-
- touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
- #docbook-to-man debian/exifprobe.sgml > exifprobe.1
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) clean
- -$(MAKE) distclean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/exifprobe.
- $(MAKE) install DESTDIR=$(CURDIR)/debian/exifprobe
-
-
-# Build architecture-independent files here.
-binary-indep: install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
-# dh_install
- dh_installman
- dh_link usr/share/doc/CHANGES_2.0.gz usr/share/doc/exifprobe/changelog.gz
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_installchangelogs:
+ dh_installchangelogs CHANGES_2.0
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..1d2bdfc
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://github.com/hfiguiere/exifprobe/releases .*/archive/(\d\S+)\.tar\.(?:bz2|gz|xz)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/exifprobe.git
More information about the forensics-changes
mailing list