[Forensics-changes] [metacam] 01/01: Imported Debian patch 1.2-9
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Mon Nov 28 12:02:43 UTC 2016
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository metacam.
commit a24c41decd6cbccbf07bf93a2f98bc2eee3c32c1
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Wed Nov 23 13:53:34 2016 -0200
Imported Debian patch 1.2-9
---
debian/changelog | 23 +++++
debian/compat | 2 +-
debian/control | 12 +--
debian/copyright | 28 +----
debian/docs | 2 +-
debian/man/genallman.sh | 27 -----
debian/man/metacam.header | 1 -
debian/manpage/create-man.sh | 13 +++
debian/{man => manpage}/metacam.1 | 4 +-
debian/{man => manpage}/metacam.txt | 0
debian/manpages | 2 +-
.../{Makefile => 10_add-GCC-hardening.patch} | 0
.../patches/{fix-gcc-4.3 => 20_fix-gcc-4.3.patch} | 0
debian/patches/30_fix-GCC-warnings.patch | 113 +++++++++++++++++++++
debian/patches/series | 5 +-
debian/rules | 1 -
debian/watch | 4 +-
17 files changed, 170 insertions(+), 67 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5e8ee60..f63e7cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+metacam (1.2-9) unstable; urgency=medium
+
+ * Bumped DH level to 10.
+ * debian/control:
+ - Bumped Standards-Version to 3.9.8.
+ - Updated the Vcs-* fields to use https instead of http and git.
+ * debian/copyright:
+ - Grouped all upstream copyright blocks.
+ - Updated the packaging copyright years.
+ * debian/man/:
+ - Renamed to debian/manpage.
+ - Using create-man.sh instead of genallman.sh.
+ * debian/patches/:
+ - Added 30_fix-GCC-warnings.patch to fix some GCC warnings.
+ - fix-gcc-4.3: renamed to 20_fix-gcc-4.3.patch.
+ - Makefile: renamed to 10_add-GCC-hardening.patch.
+ * debian/rules: removed the unnecessary variable DEB_CFLAGS_MAINT_APPEND.
+ * debian/watch:
+ - Bumped to version 4.
+ - Removed the extra source to avoid conflicts with uscan.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org> Wed, 23 Nov 2016 13:53:34 -0200
+
metacam (1.2-8) unstable; urgency=medium
* Upload to unstable.
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index d9ccf5f..23c6f01 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,15 @@ 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)
-Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 10)
+Standards-Version: 3.9.8
Homepage: http://www.cheeseplant.org/~daniel/pages/metacam.html
-Vcs-Browser: http://anonscm.debian.org/cgit/forensics/metacam.git
-Vcs-Git: git://anonscm.debian.org/forensics/metacam.git
+Vcs-Browser: https://anonscm.debian.org/git/forensics/metacam.git
+Vcs-Git: https://anonscm.debian.org/git/forensics/metacam.git
Package: metacam
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: extract EXIF information from digital camera files
EXIF (Exchangeable Image File Format) is a standard for storing interchange
information in image files, especially those using JPEG compression. Most
@@ -22,4 +22,4 @@ Description: extract EXIF information from digital camera files
fields, MetaCam also supports vendor-specific extensions from Nikon, Olympus,
Canon and Casio.
.
- This program is useful in forensics insvestigations.
+ This program is useful in forensics investigations.
diff --git a/debian/copyright b/debian/copyright
index e2e9393..8c9a084 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,44 +1,26 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: metacam
+Upstream-Contact: Daniel Sthepens <daniel at cheeseplant.org>
Source: http://www.cheeseplant.org/~daniel/pages/metacam.html
-
Files: *
Copyright: 2000-2004 Daniel Sthepens <daniel at cheeseplant.org>
+ 2001 Jan Brittenson <bson at rockgarden.net>
+ 2001 Patrick Tullmann <pat at tullmann.org>
License: GPL-2+
-
-
-Files: canontags.cc
-Copyright: 2000 Daniel Stephens <daniel at cheeseplant.org>
- 2001 Jan Brittenson <bson at rockgarden.net>
-License: GPL-2+
-
-
-Files: casiotags.cc
-Copyright: 2000 Daniel Stephens <daniel at cheeseplant.org>
- 2001 Jan Brittenson <bson at rockgarden.net>
- Patrick Tullmann <pat at tullmann.org>
-License: GPL-2+
-
-
-Files: dpyfuncs.cc
-Copyright: 2000-2004 Daniel Sthepens <daniel at cheeseplant.org>
-License: GPL-2+
-Comments: This file theere is a reference to a document, originally
+Comments: The file dpyfuncs.cc makes reference to a document, originally
at http://members.aol.com/khancock/pilot/nbuddy/, that has
Copyright 1997 Ken Hancock <kenh at kagi.com>, that provides
information about Nikkor lenses.
-
Files: debian/*
Copyright: 2001 Alp Toker <alp at toker.com>
2003 Julien Lemoine <speedblue at debian.org>
2004-2007 Jarno Elonen <elonen at debian.org>
2007-2008 Juan Angulo Moreno <juan at apuntale.com>
- 2014 Joao Eriberto Mota Filho <eriberto at debian.org>
+ 2014-2016 Joao Eriberto Mota Filho <eriberto at debian.org>
License: GPL-2+
-
License: 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
diff --git a/debian/docs b/debian/docs
index bde522d..0ce1b4d 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,4 +1,4 @@
+BUGS
README.canon
README.casio
THANKS
-BUGS
diff --git a/debian/man/genallman.sh b/debian/man/genallman.sh
deleted file mode 100755
index 130ecf8..0000000
--- a/debian/man/genallman.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-# Generate several manpages at the same time.
-# C 2014 Joao Eriberto Mota Filho <eriberto at debian.org>
-#
-# You can use this code in the same terms of the BSD-3-clause license or,
-# optionally, in the same terms of the license used in debian/ directory
-# in this Debian package. Please, to the last option, refer the package
-# name when using.
-#
-# This script uses txt2man. You need 2 files: program_name.txt and
-# program_name.header.
-#
-# The program_name.header must be use this structure:
-#
-# .TH <program_name> "<manpage_level>" "<date>" "<program_name_upper_case> <program_version>" "<program_description>"
-#
-# Example:
-#
-# .TH mac-robber "1" "May 2013" "MAC-ROBBER 1.02" "collects data about allocated files in mounted filesystems"
-
-for NAME in $(ls | grep header | cut -d'.' -f1)
-do
- LEVEL=$(cat $NAME.header | cut -d" " -f3 | tr -d '"')
- cat $NAME.header > $NAME.$LEVEL
- txt2man $NAME.txt | grep -v '^.TH ' >> $NAME.$LEVEL
-done
diff --git a/debian/man/metacam.header b/debian/man/metacam.header
deleted file mode 100644
index ec37369..0000000
--- a/debian/man/metacam.header
+++ /dev/null
@@ -1 +0,0 @@
-.TH metacam "1" "Sep 2007" "METACAM 1.2" "extract EXIF information from digital camera files"
diff --git a/debian/manpage/create-man.sh b/debian/manpage/create-man.sh
new file mode 100755
index 0000000..977ba7f
--- /dev/null
+++ b/debian/manpage/create-man.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# by Eriberto
+# Create the manpage using txt2man command.
+
+T2M_DATE="4 Sep 2007"
+T2M_NAME=metacam
+T2M_VERSION=1.2
+T2M_LEVEL=1
+T2M_DESC="extract EXIF information from digital camera files"
+
+# Don't change the following line
+txt2man -d "$T2M_DATE" -t $T2M_NAME -r $T2M_NAME-$T2M_VERSION -s $T2M_LEVEL -v "$T2M_DESC" $T2M_NAME.txt > $T2M_NAME.$T2M_LEVEL
diff --git a/debian/man/metacam.1 b/debian/manpage/metacam.1
similarity index 85%
rename from debian/man/metacam.1
rename to debian/manpage/metacam.1
index 059d4ee..0a0b2fd 100644
--- a/debian/man/metacam.1
+++ b/debian/manpage/metacam.1
@@ -1,5 +1,5 @@
-.TH metacam "1" "Sep 2007" "METACAM 1.2" "extract EXIF information from digital camera files"
-.\"Text automatically generated by txt2man
+.\" Text automatically generated by txt2man
+.TH metacam 1 "4 Sep 2007" "metacam-1.2" "extract EXIF information from digital camera files"
.SH NAME
\fBmetacam \fP- extract EXIF information from digital camera files
.SH SYNOPSIS
diff --git a/debian/man/metacam.txt b/debian/manpage/metacam.txt
similarity index 100%
rename from debian/man/metacam.txt
rename to debian/manpage/metacam.txt
diff --git a/debian/manpages b/debian/manpages
index 75312a0..511a016 100644
--- a/debian/manpages
+++ b/debian/manpages
@@ -1 +1 @@
-debian/man/metacam.1
+debian/manpage/metacam.1
diff --git a/debian/patches/Makefile b/debian/patches/10_add-GCC-hardening.patch
similarity index 100%
rename from debian/patches/Makefile
rename to debian/patches/10_add-GCC-hardening.patch
diff --git a/debian/patches/fix-gcc-4.3 b/debian/patches/20_fix-gcc-4.3.patch
similarity index 100%
rename from debian/patches/fix-gcc-4.3
rename to debian/patches/20_fix-gcc-4.3.patch
diff --git a/debian/patches/30_fix-GCC-warnings.patch b/debian/patches/30_fix-GCC-warnings.patch
new file mode 100644
index 0000000..b9a7760
--- /dev/null
+++ b/debian/patches/30_fix-GCC-warnings.patch
@@ -0,0 +1,113 @@
+Description: fix some GCC warnings.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2016-11-23
+Index: metacam-1.2/dpyfuncs.cc
+===================================================================
+--- metacam-1.2.orig/dpyfuncs.cc
++++ metacam-1.2/dpyfuncs.cc
+@@ -428,7 +428,7 @@ dpyCanonBlock1(OutputContext &ctx, const
+ }
+
+ if (v[4]) {
+- static char *flashmodes[] = {
++ static char const *flashmodes[] = {
+ "Auto", "On", "Red-Eye Reduction", "Slow Synchro",
+ "Auto + Red-Eye Reduction", "On + Red-Eye Reduction"
+ };
+@@ -444,7 +444,7 @@ dpyCanonBlock1(OutputContext &ctx, const
+ if (n >= 32 && v[32]) {
+ fmt(ctx, "Focus Mode", "Continuous");
+ } else if (v[7] <= 6) {
+- static char *focusModes[] = {
++ static const char *focusModes[] = {
+ "One-Shot", "AI Servo", "AI Focus", "Manual Focus",
+ "Single Focus", "Continuous Focus", "Manual Focus"
+ };
+@@ -452,14 +452,14 @@ dpyCanonBlock1(OutputContext &ctx, const
+ }
+
+ if (v[10] <= 2) {
+- static char *imageSizes[] = {
++ static const char *imageSizes[] = {
+ "Large", "Medium", "Small"
+ };
+ fmt(ctx, "Image Size", imageSizes[v[10]]);
+ }
+
+ {
+- static char *adjustment[] = { "Low", "Normal", "High", "unknown" };
++ static const char *adjustment[] = { "Low", "Normal", "High", "unknown" };
+
+ fmt(ctx, "Contrast", adjustment[((short)v[13] + 1) & 0x3]);
+ fmt(ctx, "Saturation", adjustment[((short)v[14] + 1) & 0x3]);
+@@ -467,34 +467,34 @@ dpyCanonBlock1(OutputContext &ctx, const
+ }
+
+ if (v[16] >= 15 && v[16] <= 19) {
+- static char *speeds[] = { "auto", "50", "100", "200", "400" };
++ static const char *speeds[] = { "auto", "50", "100", "200", "400" };
+
+ fmt(ctx, "ISO Speed", speeds[v[16] - 15]);
+ }
+
+ if (v[17] >= 3 && v[17] <= 5) {
+- static char *meterModes[] = {
++ static const char *meterModes[] = {
+ "Evaluative", "Partial", "Center-weighted"
+ };
+ fmt(ctx, "Metering Mode", meterModes[v[17] - 3]);
+ }
+
+ if (v[18] >= 0x3000 && v[18] <= 0x3004) {
+- static char *afPoints[] = {
++ static const char *afPoints[] = {
+ "Manual Focus", "Auto-Select", "Right", "Center", "Left"
+ };
+ fmt(ctx, "Autofocus Point", afPoints[v[18] - 0x3000]);
+ }
+
+ if (v[20] <= 5) {
+- static char *exposureModes[] = {
++ static const char *exposureModes[] = {
+ "Preprogrammed", "Program", "Tv-priority", "Av-priority",
+ "Manual", "A-DEP"
+ };
+ fmt(ctx, "Exposure Mode", exposureModes[v[20]]);
+ }
+ if (v[20] == 0 && v[11] <= 11) {
+- static char *shootModes[] = {
++ static const char *shootModes[] = {
+ "Full Auto", "Manual", "Landscape", "Fast Shutter", "Slow Shutter",
+ "Night", "B&W", "Sepia", "Portrait", "Sports", "Macro / Close-Up",
+ "Pan Focus"
+@@ -547,7 +547,7 @@ extern void dpyCanonBlock4(OutputContext
+ // int n = v[0] / 2;
+
+ if (v[7] <= 6) {
+- static char *whiteBalances[] = {
++ static const char *whiteBalances[] = {
+ "Auto", "Sunny", "Cloudy", "Tungsten", "Fluorescent", "Flash", "Custom"
+ };
+ fmt(ctx, "White Balance", whiteBalances[v[7]]);
+@@ -561,7 +561,7 @@ extern void dpyCanonBlock4(OutputContext
+ }
+
+ {
+- struct { unsigned short value; char *bias; } flashBias[] = {
++ struct { unsigned short value; char const *bias; } flashBias[] = {
+ {0xffc0, "-2 EV"}, {0xffcc, "-1.67 EV"}, {0xffd0, "-1.50 EV"},
+ {0xffd4, "-1.33 EV"}, {0xffe0, "-1 EV"}, {0xffec, "-0.67 EV"},
+ {0xfff0, "-0.50 EV"}, {0xfff4, "-0.33 EV"}, {0x0000, "0 EV"},
+Index: metacam-1.2/filetiff.cc
+===================================================================
+--- metacam-1.2.orig/filetiff.cc
++++ metacam-1.2/filetiff.cc
+@@ -72,7 +72,7 @@ size_t
+ _FileTIFF::getData(unsigned char *buf, size_t bytes)
+ {
+ is.read((char*)buf, bytes);
+- if (is.gcount() != bytes) {
++ if ((unsigned)is.gcount() != bytes) {
+ // int err = errno;
+ // cerr << "Read failed: " << strerror(err) << endl;
+ // exit(2);
diff --git a/debian/patches/series b/debian/patches/series
index a904bcf..111bdce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-Makefile
-fix-gcc-4.3
+10_add-GCC-hardening.patch
+20_fix-gcc-4.3.patch
+30_fix-GCC-warnings.patch
diff --git a/debian/rules b/debian/rules
index b345a40..6553251 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_CFLAGS_MAINT_APPEND = -D_FORTIFY_SOURCE=2
%:
dh $@
diff --git a/debian/watch b/debian/watch
index cc02f18..7507023 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
-version=3
+version=4
http://www.cheeseplant.org/metacam/downloads/metacam-([\d\S]+)\.tar\.(?:bz2|gz|xz)
-http://www.cheeseplant.org/~daniel/pages/metacam.html .*/metacam/downloads/metacam-([\d\S]+)\.tar\.(?:bz2|gz|xz)
+#http://www.cheeseplant.org/~daniel/pages/metacam.html .*/metacam/downloads/metacam-([\d\S]+)\.tar\.(?:bz2|gz|xz)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/metacam.git
More information about the forensics-changes
mailing list