Tue Oct 28 12:44:08 UTC 2014

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

eriberto pushed a commit to branch debian
in repository metacam.

commit 07b293596c8eb44c06f2b103229f27174806e2e5
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Tue Oct 28 10:43:35 2014 -0200

      * New maintainer and co-maintainer. Thanks a lot to  Juan Angulo
          Moreno <juan at apuntale.com>, the last maintainer of this package.
      * Migrations:
          - Converted the manpage to txt2man system. Consequently, created
            the debian/man/ directory, removed debian/metacam.1 file and
            updated the debian/manpages file.
          - Debian format to 3.0.
          - debian/copyright to 1.0 format.
          - debhelper level to 9.
          - Dropped the CDBS system.
          - Patches to quilt system (01_makefile_clean.diff was dropped;
            02_gcc-4.3-fix.diff and 03_metacam_gcc-4.3.diff was merged).
      * debian/clean: added to remove a file forgotten by upstream.
      * debian/control:
          - Added the ${misc:Depends} variable to binary block.
          - Bumped Standards-Version to 3.9.6.
          - Improved the long description.
      * debian/copyright: updated the upstream and packaging data.
      * debian/manpages: added to install the manpage.
      * debian/patches/Makefile: added to provide GCC hardening.
      * debian/rules: added the DEB_CFLAGS_MAINT_APPEND variable to fix
          the issues pointed by blhc.
      * debian/watch: improved.
    
     -- Joao Eriberto Mota Filho <eriberto at debian.org>  Tue, 07 Oct 2014 18:19:00 -0300
---
 debian/changelog                       |  28 +++++++
 debian/clean                           |   1 +
 debian/compat                          |   2 +-
 debian/control                         |  28 ++++---
 debian/copyright                       | 137 ++++++++++++++-------------------
 debian/dirs                            |   2 -
 debian/install                         |   2 +-
 debian/man/genallman.sh                |  27 +++++++
 debian/man/metacam.1                   |  38 +++++++++
 debian/man/metacam.header              |   1 +
 debian/man/metacam.txt                 |  21 +++++
 debian/manpages                        |   1 +
 debian/metacam.1                       |  33 --------
 debian/patches/01_makefile_clean.diff  |  19 -----
 debian/patches/02_gcc-4.3-fix.diff     |  40 ----------
 debian/patches/03_metacam_gcc-4.3.diff |  21 -----
 debian/patches/Makefile                |  25 ++++++
 debian/patches/fix-gcc-4.3             |  70 +++++++++++++++++
 debian/patches/series                  |   2 +
 debian/rules                           |  11 +--
 debian/source/format                   |   1 +
 debian/watch                           |   7 +-
 22 files changed, 295 insertions(+), 222 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f17757b..9be0654 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+metacam (1.2-6) unstable; urgency=medium
+
+  * New maintainer and co-maintainer. Thanks a lot to  Juan Angulo
+      Moreno <juan at apuntale.com>, the last maintainer of this package.
+  * Migrations:
+      - Converted the manpage to txt2man system. Consequently, created
+        the debian/man/ directory, removed debian/metacam.1 file and
+        updated the debian/manpages file.
+      - Debian format to 3.0.
+      - debian/copyright to 1.0 format.
+      - debhelper level to 9.
+      - Dropped the CDBS system.
+      - Patches to quilt system (01_makefile_clean.diff was dropped;
+        02_gcc-4.3-fix.diff and 03_metacam_gcc-4.3.diff was merged).
+  * debian/clean: added to remove a file forgotten by upstream.
+  * debian/control:
+      - Added the ${misc:Depends} variable to binary block.
+      - Bumped Standards-Version to 3.9.6.
+      - Improved the long description.
+  * debian/copyright: updated the upstream and packaging data.
+  * debian/manpages: added to install the manpage.
+  * debian/patches/Makefile: added to provide GCC hardening.
+  * debian/rules: added the DEB_CFLAGS_MAINT_APPEND variable to fix
+      the issues pointed by blhc.
+  * debian/watch: improved.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Tue, 07 Oct 2014 18:19:00 -0300
+
 metacam (1.2-5) unstable; urgency=low
 
   * Update Standards-version 3.7.3.
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..246d52f
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+libmetacam.a
diff --git a/debian/compat b/debian/compat
index 1e8b314..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+9
diff --git a/debian/control b/debian/control
index 1b5a1b6..513d652 100644
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,24 @@
 Source: metacam
 Section: graphics
 Priority: optional
-Maintainer: Juan Angulo Moreno <juan at apuntale.com>
-Build-Depends: cdbs, debhelper (>= 6)
-Standards-Version: 3.7.3
+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
+Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/metacam.git
+Vcs-Git: git://anonscm.debian.org/collab-maint/metacam.git
 
 Package: metacam
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: extract EXIF information from digital camera files
- EXIF stands for Exchangeable Image File Format, and is a standard for
- storing interchange information in image files, especially those using
- JPEG compression. Most digital cameras now use the EXIF format. The
- format is part of the DCF standard created by JEIDA to encourage
- interoperability between imaging devices. In addition to the standard
- EXIF fields, MetaCam also supports vendor-specific extensions from
- Nikon, Olympus, Canon and Casio.
+ EXIF (Exchangeable Image File Format) is a standard for storing interchange
+ information in image files, especially those using JPEG compression. Most
+ digital cameras, including mobile phones, now use the EXIF format.
  .
- 
+ The format is part of the DCF standard created by JEIDA to encourage the
+ interoperability between imaging devices. In addition to the standard EXIF
+ fields, MetaCam also supports vendor-specific extensions from Nikon, Olympus,
+ Canon and Casio.
+ .
+ This program is useful in forensics insvestigations.
diff --git a/debian/copyright b/debian/copyright
index c69dfe4..e2e9393 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,80 +1,57 @@
-This package was debianized by Juan Angulo Moreno <juan at apuntale.com> on
-Mon, 20 Aug 2007 10:27:02 -0400.
-
-It was downloaded from <http://www.cheeseplant.org/~daniel/pages/metacam.html>
-
-Upstream Author: 
-
-    Daniel Sthepens <daniel at cheeseplant.org>
-
-Copyright Holder: 
-
-    Daniel Sthepens <daniel at cheeseplant.org>
-    Jan Brittenson <bson at rockgarden.net>
-    Patrick Tullmann <pat at tullmann.org>
-
-License (metacam):
-
-    Copyright (C) 2000-2004 Daniel Sthepens <daniel at cheeseplant.org>
-
-    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 package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-
-License (canontags.cc):
-
-    Copyright (C) 2000 Daniel Stephens (daniel at cheeseplant.org)
-    Copyright (C) 2001 Jan Brittenson (bson at rockgarden.net)
-
-    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 package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-
-License (casiotags.cc):
-
-    Copyright (C) 2000 Daniel Stephens (daniel at cheeseplant.org)
-    Copyright (C) 2001 Jan Brittenson (bson at rockgarden.net)
-    Copyright (C) 2001 Patrick Tullmann (pat at tullmann.org)
-
-    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 package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-
-The Debian packaging is (C) 2007, Juan Angulo Moreno <juan at apuntale.com> and
-is licensed under the GPL, see above.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: metacam
+Source: http://www.cheeseplant.org/~daniel/pages/metacam.html
+
+
+Files: *
+Copyright: 2000-2004 Daniel Sthepens <daniel at cheeseplant.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
+          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>
+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
+ 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 --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 98d1583..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/man/man1
diff --git a/debian/install b/debian/install
index 16d05cc..987e215 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1 @@
-metacam                usr/bin/
+metacam		usr/bin
diff --git a/debian/man/genallman.sh b/debian/man/genallman.sh
new file mode 100755
index 0000000..130ecf8
--- /dev/null
+++ b/debian/man/genallman.sh
@@ -0,0 +1,27 @@
+#!/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.1 b/debian/man/metacam.1
new file mode 100644
index 0000000..059d4ee
--- /dev/null
+++ b/debian/man/metacam.1
@@ -0,0 +1,38 @@
+.TH metacam "1"  "Sep 2007" "METACAM 1.2" "extract EXIF information from digital camera files"
+.\"Text automatically generated by txt2man
+.SH NAME
+\fBmetacam \fP- extract EXIF information from digital camera files
+.SH SYNOPSIS
+.nf
+.fam C
+     \fBmetacam\fP [\fB-v\fP|\fB-a\fP|\fB-x\fP] [FILE]\.\.\.
+.fam T
+.fi
+.fam T
+.fi
+.SH DESCRIPTION
+\fBmetacam\fP supports all standard EXIF fields in addition to (known)
+vendor specific blocks from Nikon, Olympus, Canon and Casio.
+.SH OPTIONS
+.TP
+.B
+\fB-h\fP, \fB--help\fP
+Output help information and exit.
+.TP
+.B
+\fB-v\fP, \fB--verbose\fP
+Output unknown tags too.
+.TP
+.B
+\fB-a\fP, \fB--all\fP
+Output ALL tags (implies \fB-v\fP).
+.TP
+.B
+\fB-x\fP, \fB--xml\fP
+Output as XML.
+.SH AUTHORS
+\fBmetacam\fP was developed by Daniel Stephens <daniel at cheeseplant.org>.
+.PP
+This manual page was written by Alp Toker <alp at atoker.com>, Jarno Elonen
+<elonen at debian.org> and Juan Angulo Moreno <juan at apuntale.com> for
+Debian project (but may be used by others).
diff --git a/debian/man/metacam.header b/debian/man/metacam.header
new file mode 100644
index 0000000..ec37369
--- /dev/null
+++ b/debian/man/metacam.header
@@ -0,0 +1 @@
+.TH metacam "1"  "Sep 2007" "METACAM 1.2" "extract EXIF information from digital camera files"
diff --git a/debian/man/metacam.txt b/debian/man/metacam.txt
new file mode 100644
index 0000000..164f29f
--- /dev/null
+++ b/debian/man/metacam.txt
@@ -0,0 +1,21 @@
+NAME
+       metacam - extract EXIF information from digital camera files
+SYNOPSIS
+       metacam [-v|-a|-x] [FILE]...
+DESCRIPTION
+       metacam supports all standard EXIF fields in addition to (known)
+       vendor specific blocks from Nikon, Olympus, Canon and Casio.
+OPTIONS
+       -h, --help     Output help information and exit.
+
+       -v, --verbose  Output unknown tags too.
+
+       -a, --all      Output ALL tags (implies -v).
+
+       -x, --xml      Output as XML.
+AUTHORS
+       metacam was developed by Daniel Stephens <daniel at cheeseplant.org>.
+
+       This manual page was written by Alp Toker <alp at atoker.com>, Jarno Elonen
+       <elonen at debian.org> and Juan Angulo Moreno <juan at apuntale.com> for
+       Debian project (but may be used by others).
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..75312a0
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+debian/man/metacam.1
diff --git a/debian/metacam.1 b/debian/metacam.1
deleted file mode 100644
index bcd093d..0000000
--- a/debian/metacam.1
+++ /dev/null
@@ -1,33 +0,0 @@
-.TH "metacam" "1" "2001-2004" "Daniel Stephens" ""
-.SH "NAME"
-.LP 
-metacam \- extract EXIF information from digital camera files
-.SH "SYNOPSIS"
-.LP 
-.B metacam
-[\fB\-v\fP|\fB\-a\fP|\fB\-x\fP] [\fIFILE\fP]...
-.br 
-
-.SH "DESCRIPTION"
-.LP 
-.B metacam
-supports all standard EXIF fields in addition to (known) vendor specific blocks from Nikon, Olympus, Canon and Casio.
-.SH "OPTIONS"
-.LP 
-.TP 
-\fB\-h\fR, \fB\-\-help\fR
-Output help information and exit.
-.TP 
-\fB\-v\fR, \fB\-\-verbose\fR
-Output unknown tags too.
-.TP 
-\fB\-a\fR, \fB\-\-all\fR
-Output ALL tags (implies \-v).
-.TP
-\fB\-x\fR, \fB\-\-xml\fR
-Output as XML.
-.SH "AUTHORS"
-.LP 
-Daniel Stephens <daniel at cheeseplant.org>
-.br 
-Manual page by Alp Toker <alp at atoker.com>, Jarno Elonen <elonen at debian.org>, Juan Angulo Moreno <juan at apuntale.com>
diff --git a/debian/patches/01_makefile_clean.diff b/debian/patches/01_makefile_clean.diff
deleted file mode 100644
index 52fb5a7..0000000
--- a/debian/patches/01_makefile_clean.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile	2004-09-04 02:01:16.000000000 +0300
-+++ Makefile	2004-09-04 02:01:43.000000000 +0300
-@@ -47,14 +47,14 @@
- default:	metacam
- 
- clean:
--	-rm -f *.o *~ *-
-+	-rm -f *.o *.a *~ *-
- 
- tags:
- 	etags *.cc *.h
- 
- realclean:
- 	-rm -f metacam
--	-rm -f *.o *~ *-
-+	-rm -f *.o *.a *~ *-
- 	-rm -f *.dep
- 	-rm -f dependencies
- 	-rm -f TAGS
diff --git a/debian/patches/02_gcc-4.3-fix.diff b/debian/patches/02_gcc-4.3-fix.diff
deleted file mode 100644
index 9cc9861..0000000
--- a/debian/patches/02_gcc-4.3-fix.diff
+++ /dev/null
@@ -1,40 +0,0 @@
---- metacam.cc~ 2007-04-02 18:49:33.000000000 +0000
-+++ metacam.cc  2007-04-02 18:49:47.000000000 +0000
-@@ -23,6 +23,7 @@
- #include <iostream>
- #include <fstream>
- #include <cstdio>
-+#include <cstdlib>
- #include <errno.h>
- #include <netinet/in.h>
- #include <string.h>
---- datatiff.h~ 2007-04-02 18:51:37.000000000 +0000
-+++ datatiff.h  2007-04-02 18:51:45.000000000 +0000
-@@ -24,6 +24,7 @@
- #define DATATIFF_H_INCLUDED
- 
- #include "metatiff.h"
-+#include <cstdlib>
- 
- class _DataIFD;
- class _DataIFDEntry;
---- edittiff.h~ 2007-04-02 18:52:04.000000000 +0000
-+++ edittiff.h  2007-04-02 18:52:09.000000000 +0000
-@@ -24,6 +24,7 @@
- #define EDITTIFF_H_INCLUDED
- 
- #include "metatiff.h"
-+#include <cstdlib>
- 
- class _EditIFD;
- 
---- ocontext.cc~        2007-04-02 18:52:34.000000000 +0000
-+++ ocontext.cc 2007-04-02 18:52:40.000000000 +0000
-@@ -25,6 +25,7 @@
- #include "odrivers.h"
- 
- #include <ctype.h>
-+#include <cstdlib>
- 
- OutputContext::~OutputContext()
- {
diff --git a/debian/patches/03_metacam_gcc-4.3.diff b/debian/patches/03_metacam_gcc-4.3.diff
deleted file mode 100644
index 8433db2..0000000
--- a/debian/patches/03_metacam_gcc-4.3.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/dpyfuncs.cc
-+++ b/dpyfuncs.cc
-@@ -28,6 +28,8 @@
- #include "metacam.h"
- #include "dpyfuncs.h"
- 
-+#include <cstring>
-+
- static const char *rcsid __attribute__((unused))="$Id: dpyfuncs.cc,v 1.14 2004/08/21 17:54:20 daniel Exp $";
- 
- void
---- a/ocontext.cc
-+++ b/ocontext.cc
-@@ -26,6 +26,7 @@
- 
- #include <ctype.h>
- #include <cstdlib>
-+#include <cstring>
- 
- OutputContext::~OutputContext()
- {
diff --git a/debian/patches/Makefile b/debian/patches/Makefile
new file mode 100644
index 0000000..bf6a58d
--- /dev/null
+++ b/debian/patches/Makefile
@@ -0,0 +1,25 @@
+Description: add GCC hardening.
+Author: Joao Eriberto Mota Filho <eriberto at debian.org>
+Last-Update: 2014-10-19
+Index: metacam-1.2/Makefile
+===================================================================
+--- metacam-1.2.orig/Makefile
++++ metacam-1.2/Makefile
+@@ -30,7 +30,7 @@ OSCXXFLAGS=-ansi -pedantic
+ CXX=g++
+ INCLUDES=
+ 
+-CXXFLAGS=-Wall $(OSCXXFLAGS) -D_GNU_SOURCE -O2 $(INCLUDES)
++CXXFLAGS+=-Wall $(OSCXXFLAGS) -D_GNU_SOURCE -O2 $(INCLUDES)
+ 
+ LIBOBJS=rationals.o exiftags.o \
+      nikontags.o olympustags.o canontags.o casiotags.o dpyfuncs.o \
+@@ -65,7 +65,7 @@ libmetacam.a:	$(LIBOBJS)
+ 	mv -f libmetacam.a- libmetacam.a
+ 
+ metacam:	$(EXEOBJS) libmetacam.a
+-	$(CXX) $(CXXFLAGS) $(EXEOBJS) -o metacam -lm -L. -lmetacam
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(EXEOBJS) -o metacam -lm -L. -lmetacam
+ 
+ # Dependency rules
+ dependencies:	Makefile $(DEPS)
diff --git a/debian/patches/fix-gcc-4.3 b/debian/patches/fix-gcc-4.3
new file mode 100644
index 0000000..35d0d89
--- /dev/null
+++ b/debian/patches/fix-gcc-4.3
@@ -0,0 +1,70 @@
+Description: fix the GCC build.
+Author: Cyril Brulebois <kibi at debian.org>
+Last-Update: 2008-03-06
+Index: metacam-1.2/datatiff.h
+===================================================================
+--- metacam-1.2.orig/datatiff.h
++++ metacam-1.2/datatiff.h
+@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #define DATATIFF_H_INCLUDED
+ 
+ #include "metatiff.h"
++#include <cstdlib>
+ 
+ class _DataIFD;
+ class _DataIFDEntry;
+Index: metacam-1.2/edittiff.h
+===================================================================
+--- metacam-1.2.orig/edittiff.h
++++ metacam-1.2/edittiff.h
+@@ -1,3 +1,4 @@
++
+ /*
+ ------------------------------------------------------------------------------
+ MetaCam - Extract EXIF information from digital camera files, with
+@@ -24,6 +25,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #define EDITTIFF_H_INCLUDED
+ 
+ #include "metatiff.h"
++#include <cstdlib>
+ 
+ class _EditIFD;
+ 
+Index: metacam-1.2/metacam.cc
+===================================================================
+--- metacam-1.2.orig/metacam.cc
++++ metacam-1.2/metacam.cc
+@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suit
+ #include <iostream>
+ #include <fstream>
+ #include <cstdio>
++#include <cstdlib>
+ #include <errno.h>
+ #include <netinet/in.h>
+ #include <string.h>
+Index: metacam-1.2/ocontext.cc
+===================================================================
+--- metacam-1.2.orig/ocontext.cc
++++ metacam-1.2/ocontext.cc
+@@ -25,6 +25,8 @@ static const char *rcsid __attribute__((
+ #include "odrivers.h"
+ 
+ #include <ctype.h>
++#include <cstdlib>
++#include <cstring>
+ 
+ OutputContext::~OutputContext()
+ {
+Index: metacam-1.2/dpyfuncs.cc
+===================================================================
+--- metacam-1.2.orig/dpyfuncs.cc
++++ metacam-1.2/dpyfuncs.cc
+@@ -28,6 +28,8 @@ Foundation, Inc., 59 Temple Place - Suit
+ #include "metacam.h"
+ #include "dpyfuncs.h"
+ 
++#include <cstring>
++
+ static const char *rcsid __attribute__((unused))="$Id: dpyfuncs.cc,v 1.14 2004/08/21 17:54:20 daniel Exp $";
+ 
+ void
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a904bcf
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+Makefile
+fix-gcc-4.3
diff --git a/debian/rules b/debian/rules
index f44c50c..9edfdc5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+export DEB_CFLAGS_MAINT_APPEND = -D_FORTIFY_SOURCE=2
 
-DEB_MAKE_CLEAN_TARGET = realclean
-DEB_INSTALL_MANPAGES_metacam := debian/metacam.1
-
-clean::
-	rm -f *.a
+%:
+	dh $@
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
index 1361259..71545b3 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,2 @@
-version=2
-
-# Homepage  Pattern  [Version  [Action]]
-http://www.cheeseplant.org/metacam/downloads/metacam-([\d\.]*).tar.(gz|bz2) \
-	debian  uupdate
+version=3
+http://www.cheeseplant.org/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

