On Mon, Dec 05, 2011 at 02:15:32AM +0100, Jakub Wilk wrote:
> (I'm not the maintainer of this package.)
Thanks for looking these over!
> This is incorrect. The -dev package includes HTML documentation
> which is generated at build time. The HTML documents have embedded
> timestamps, which will, of course, differ across architectures.
Ugh, good point.
> >-usr/lib/lib*.{a,la,so}
> >+usr/lib/*/lib*.[a|so]
>
> Ooops. After this change the package doesn't contain the .so symlink
> anymore.
Urg. Okay, switched to multiple lines instead. Should check the libdv4
multiarch patch too, it might have the same problem.
Updated debdiff attached...
Thanks!
-Kees
--
Kees Cook @debian.org
diff -Nru libexif-0.6.20/debian/changelog libexif-0.6.20/debian/changelog
--- libexif-0.6.20/debian/changelog 2011-04-27 11:27:47.000000000 -0700
+++ libexif-0.6.20/debian/changelog 2011-12-04 17:22:02.000000000 -0800
@@ -1,3 +1,16 @@
+libexif (0.6.20-2) UNRELEASED; urgency=low
+
+ * debian/copyright: fix empty lines in multi-line section, add missing
+ intended "license" lines, add missing BSD license for pt_BR.po.
+ * debian/libexif-dev.install:
+ - use multiple lines instead of technically unsupported {}.
+ - remove .la file, per release goal; there are no build dep using it.
+ * debian/control:
+ - bump standards; no changes needed.
+ * debian/{control,compat,*.install,rules}: build for Multi-Arch support.
+
+ -- Kees Cook <k...@debian.org> Sun, 04 Dec 2011 13:42:04 -0800
+
libexif (0.6.20-1) unstable; urgency=low
* New upstream release
diff -Nru libexif-0.6.20/debian/compat libexif-0.6.20/debian/compat
--- libexif-0.6.20/debian/compat 2011-04-10 08:51:31.000000000 -0700
+++ libexif-0.6.20/debian/compat 2011-12-04 13:57:38.000000000 -0800
@@ -1 +1 @@
-7
+9
diff -Nru libexif-0.6.20/debian/control libexif-0.6.20/debian/control
--- libexif-0.6.20/debian/control 2011-04-11 13:45:46.000000000 -0700
+++ libexif-0.6.20/debian/control 2011-12-04 17:21:28.000000000 -0800
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian PhotoTools Maintainers
<pkg-phototools-de...@lists.alioth.debian.org>
Uploaders: Emmanuel Bouthenot <kol...@debian.org>, Frederic Peters
<fpet...@debian.org>
-Build-Depends: debhelper (>= 7.0.50), autotools-dev, doxygen, graphviz
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 8.1.3~), autotools-dev, doxygen, graphviz
+Standards-Version: 3.9.2
Homepage: http://libexif.sourceforge.net/
Vcs-Browser: http://git.debian.org/?p=pkg-phototools/libexif.git
Vcs-Git: git://git.debian.org/git/pkg-phototools/libexif.git
@@ -23,6 +23,8 @@
Package: libexif12
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: library to parse EXIF files
Most digital cameras produce EXIF files, which are JPEG files with
diff -Nru libexif-0.6.20/debian/copyright libexif-0.6.20/debian/copyright
--- libexif-0.6.20/debian/copyright 2011-04-10 13:50:59.000000000 -0700
+++ libexif-0.6.20/debian/copyright 2011-12-04 14:24:58.000000000 -0800
@@ -12,20 +12,22 @@
2002-2005, Hans Ulrich Niedermann <g...@n-dimensional.de>
2007-2010, Dan Fandrich <d...@coneharvesters.com>
License: LGPL-2.1+
+
+License: LGPL-2.1+
This library is free software; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the Free
Software Foundation; either version 2.1 of the License, or (at your option)
any
later version.
-
+ .
This library 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 Lesser General Public License for more
details.
-
+ .
You should have received a copy of the GNU Lesser General Public License along
with this library; if not, write to the Free Software Foundation, Inc., 51
Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
+ .
On Debian systems, the complete text of the GNU Lesser General Public License
version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1`.
@@ -40,15 +42,18 @@
2003, Torgeir Hansen <torg...@trenger.ro>
2003, Roberto Costa <roberto.co...@ensta.org>
2004, Angela Wrobel
+License: LGPL-2.1+
Files: libjpeg/jpeg-data.c
Copyright: 2002, Basil Dias <basil.d...@wipro.com>
2003, Ralph Heidelberg <rheidelb...@pinnaclesys.com>
+License: LGPL-2.1+
Files: libexif/exif-tag.c
Copyright: 2002, Javier Achirica <achir...@ttd.net>
2003, Gernot Jander <ger...@bigpond.com>
2004, Antonio Scuri <sc...@tecgraf.puc-rio.br>
+License: LGPL-2.1+
Files: libexif/exif-entry.c
Copyright: 2002, Javier Achirica <achir...@ttd.net>
@@ -60,119 +65,175 @@
2004, Ralf Holzer <rhol...@cmu.edu>
2007, Jef Driesen <jefdrie...@hotmail.com>
2009, Vladimir Petrov <vppet...@mm-sol.com>
+License: LGPL-2.1+
Files: libexif/exif-tag.h
Copyright: 2002, Javier Achirica <achir...@ttd.net>
+License: LGPL-2.1+
Files: libexif.spec.in configure.in Makefile.am
Copyright: 2002, Mark Pulford <m...@kyne.com.au>
+License: LGPL-2.1+
Files: libexif/exif-content.h libexif/exif-entry.h
Copyright: 2002, Semyon Sosin <s...@best.com>
+License: LGPL-2.1+
Files: libexif/*.h
Copyright: 2002, Marcus Meissner <mar...@jet.franken.de>
+License: LGPL-2.1+
Files: libexif/exif-loader.c
Copyright: 2003, Jens Finke <j...@triq.net>
2007, Meder Kydyraliev
2008, Mika Raento <mi...@google.com>
+License: LGPL-2.1+
Files: libexif/exif-loader.h
Copyright: 2003, Jens Finke <j...@triq.net>
+License: LGPL-2.1+
Files: libexif.spec.in
Copyright: 2003, Peter Bieringer <p...@bieringer.de>
+License: LGPL-2.1+
Files: libjpeg/jpeg-marker.h
Copyright: 2004, Antonio Scuri <sc...@tecgraf.puc-rio.br>
+License: LGPL-2.1+
Files: po/nl.po
Copyright: 2008-2010, Erwin Poeze
+License: LGPL-2.1+
Files: po/de.po
Copyright: 2008-2010, Marcus Meissner
+License: LGPL-2.1+
Files: po/pl.po
Copyright: 2008-2010, Jakub Bogusz
+License: LGPL-2.1+
Files: po/sk.po
Copyright: 2008, Ivan Masár
+License: LGPL-2.1+
Files: po/vi.po
Copyright: 2008-2010, Clytie Siddall
+License: LGPL-2.1+
Files: po/sv.po
Copyright: 2009, Daniel Nylander
+License: LGPL-2.1+
Files: po/cs.po
Copyright: 2009, Jan Patera
+License: LGPL-2.1+
Files: po/sr.po
Copyright: 2009-2010, Marko Uskokovic
-
-Files: po/pt_BR.po
-Copyright: 2009, André Gondi
+License: LGPL-2.1+
Files: po/zh_CN.po
Copyright: 2009-2010, Tao Wei <weitao1...@gmail.com>
+License: LGPL-2.1+
Files: po/sq.po
Copyright: 2009-2010, Vilson Gjeci <vilsongj...@gmail.com>
+License: LGPL-2.1+
Files: po/pt.po
Copyright: 2009, nglnx
2010, Launchpad Translators
+License: LGPL-2.1+
Files: po/ja.po
Copyright: 2009, Shushi Kurose
2009-2010, Tadashi Jokagi
+License: LGPL-2.1+
Files: po/it.po
Copyright: 2009-2010, Sergio Zanchetta
+License: LGPL-2.1+
Files: po/en_GB.po
Copyright: 2009, Bruce Cowan
+License: LGPL-2.1+
Files: po/be.po
Copyright: 2009-2010, Iryna Nikanchuk <defragbr...@gmail.com>
+License: LGPL-2.1+
Files: po/da.po
Copyright: 2009-2010, Joe Hansen
+License: LGPL-2.1+
Files: po/tr.po
Copyright: 2010, Enes Ateş <e.n....@hotmail.com>
+License: LGPL-2.1+
Files: po/bs.po
Copyright: 2010, Launchpad Translators
+License: LGPL-2.1+
Files: po/en_GB.po
Copyright: 2010, Robert Readman
+License: LGPL-2.1+
Files: po/pt_BR.po
Copyright: 2010, André Gondim <andregon...@ubuntu.com>
+License: LGPL-2.1+
Files: po/ru.po
Copyright: 2010, Alexey Ivanov <alexey.iva...@gmail.com>
+License: LGPL-2.1+
+
+Files: po/pt_BR.po
+Copyright: 2009, André Gondi
+License: BSD-2-Clause
+
+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:
+ .
+ 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 FREEBSD PROJECT ``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 FREEBSD PROJECT 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.
Files: debian/*
Copyright: 2002-2004, Christophe Barbe <christo...@debian.org>
2004-2007, Frederic Peters <fpet...@debian.org>
2009-2011, Emmanuel Bouthenot <kol...@debian.org>
License: GPL-2+
+
+License: GPL-2+
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 2 of the License, or (at your option) any later
version.
-
+ .
This program 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 full text of the GNU General Public License version 2
can be found in the file `/usr/share/common-licenses/GPL-2'.
-
diff -Nru libexif-0.6.20/debian/libexif-dev.install
libexif-0.6.20/debian/libexif-dev.install
--- libexif-0.6.20/debian/libexif-dev.install 2011-04-10 08:51:31.000000000
-0700
+++ libexif-0.6.20/debian/libexif-dev.install 2011-12-04 17:21:42.000000000
-0800
@@ -1,4 +1,5 @@
-libexif.pc usr/lib/pkgconfig
+usr/lib/*/pkgconfig/*
usr/include/libexif/*
-usr/lib/lib*.{a,la,so}
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
doc/doxygen-output/* usr/share/doc/libexif-dev
diff -Nru libexif-0.6.20/debian/libexif12.install
libexif-0.6.20/debian/libexif12.install
--- libexif-0.6.20/debian/libexif12.install 2011-04-10 08:51:31.000000000
-0700
+++ libexif-0.6.20/debian/libexif12.install 2011-12-04 13:57:21.000000000
-0800
@@ -1,2 +1,2 @@
usr/share/locale
-usr/lib/libexif.so.*
+usr/lib/*/libexif.so.*
diff -Nru libexif-0.6.20/debian/rules libexif-0.6.20/debian/rules
--- libexif-0.6.20/debian/rules 2011-04-11 13:39:02.000000000 -0700
+++ libexif-0.6.20/debian/rules 2011-12-04 13:48:05.000000000 -0800
@@ -9,9 +9,11 @@
dh_clean
rm -f config.guess config.sub
-# removing JQuery embedded copy
override_dh_install:
+ # remove JQuery embedded copy
rm -f
debian/libexif-dev/usr/share/doc/libexif-dev/libexif-api.html/jquery.js
+ # Install pkgconfig file in full triplet directory.
+ install -D -m 644 libexif.pc
debian/libexif-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libexif.pc
dh_install
# Upstream sources contains a directory named 'binary'
