rev 8971 - in kde-extras/exiv2/trunk/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Wed Jan 16 11:03:46 UTC 2008
Author: fabo
Date: 2008-01-16 11:03:46 +0000 (Wed, 16 Jan 2008)
New Revision: 8971
Added:
kde-extras/exiv2/trunk/debian/libexiv2-2.install
kde-extras/exiv2/trunk/debian/patches/01_gcc4.3.diff
kde-extras/exiv2/trunk/debian/patches/series
Removed:
kde-extras/exiv2/trunk/debian/dirs
kde-extras/exiv2/trunk/debian/libexiv2-0.install
kde-extras/exiv2/trunk/debian/patches/cve-2007-6353.diff
kde-extras/exiv2/trunk/debian/patches/rev-1124.diff
Modified:
kde-extras/exiv2/trunk/debian/changelog
kde-extras/exiv2/trunk/debian/compat
kde-extras/exiv2/trunk/debian/control
kde-extras/exiv2/trunk/debian/copyright
kde-extras/exiv2/trunk/debian/rules
Log:
* New upstream release (Closes: #441524, #455633, #461009)
* Remove patches, merged upstream:
* CVE-2007-6353
* Rev 1124 pull
* Add 01_gcc4.3.diff patch. Missing std:: removal not merged upstream yet
* Bump compat to 5
* Update copyright file
* Add myself in Uploaders field
* Clean up build dependencies:
* Remove g++ and dpkg-dev
* Add quilt and libexpat1-dev
* Bump Standard-Version to 3.7.3
* Use Homepage field
* Merge changes from Ubuntu:
* Add conflicts and replaces of libexiv2c2a, libexiv2-0.12 on libexiv2-0
so that digikam does not get held back on upgrades.
* Add Conflicts/Replaces libexiv2-0 for libexiv2-2
* Clean up rules
* Add clean target (Closes: 442560)
* Build with --no-undefined and --as-needed linker flags
Modified: kde-extras/exiv2/trunk/debian/changelog
===================================================================
--- kde-extras/exiv2/trunk/debian/changelog 2008-01-15 16:45:57 UTC (rev 8970)
+++ kde-extras/exiv2/trunk/debian/changelog 2008-01-16 11:03:46 UTC (rev 8971)
@@ -1,8 +1,27 @@
-exiv2 (0.16~pre1-1) UNRELEASED; urgency=low
+exiv2 (0.16-1) unstable; urgency=low
- * (NOT RELEASED YET) New upstream release
+ * New upstream release (Closes: #441524, #455633, #461009)
+ * Remove patches, merged upstream:
+ * CVE-2007-6353
+ * Rev 1124 pull
+ * Add 01_gcc4.3.diff patch. Missing std:: removal not merged upstream yet
+ * Bump compat to 5
+ * Update copyright file
+ * Add myself in Uploaders field
+ * Clean up build dependencies:
+ * Remove g++ and dpkg-dev
+ * Add quilt and libexpat1-dev
+ * Bump Standard-Version to 3.7.3
+ * Use Homepage field
+ * Merge changes from Ubuntu:
+ * Add conflicts and replaces of libexiv2c2a, libexiv2-0.12 on libexiv2-0
+ so that digikam does not get held back on upgrades.
+ * Add Conflicts/Replaces libexiv2-0 for libexiv2-2
+ * Clean up rules
+ * Add clean target (Closes: 442560)
+ * Build with --no-undefined and --as-needed linker flags
- -- Mark Purcell <msp at debian.org> Mon, 17 Dec 2007 19:37:48 +0100
+ -- Fathi Boudra <fabo at debian.org> Wed, 16 Jan 2008 09:17:08 +0100
exiv2 (0.15-2) unstable; urgency=high
Modified: kde-extras/exiv2/trunk/debian/compat
===================================================================
--- kde-extras/exiv2/trunk/debian/compat 2008-01-15 16:45:57 UTC (rev 8970)
+++ kde-extras/exiv2/trunk/debian/compat 2008-01-16 11:03:46 UTC (rev 8971)
@@ -1 +1 @@
-4
+5
Modified: kde-extras/exiv2/trunk/debian/control
===================================================================
--- kde-extras/exiv2/trunk/debian/control 2008-01-15 16:45:57 UTC (rev 8970)
+++ kde-extras/exiv2/trunk/debian/control 2008-01-16 11:03:46 UTC (rev 8971)
@@ -2,9 +2,12 @@
Section: graphics
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: KELEMEN Peter <fuji at debian.org>, Mark Purcell <msp at debian.org>
-Build-Depends: debhelper (>= 4.0.0), g++ (>= 4.0.0), autotools-dev, chrpath, dpkg-dev (>= 1.13.19), zlib1g-dev, cdbs, doxygen, graphviz, python, xsltproc
-Standards-Version: 3.7.2
+Uploaders: KELEMEN Peter <fuji at debian.org>, Mark Purcell <msp at debian.org>, Fathi Boudra <fabo at debian.org>
+Build-Depends: cdbs, debhelper (>= 5), quilt, chrpath,
+ autotools-dev, libexpat1-dev, zlib1g-dev,
+ doxygen, graphviz, python, xsltproc
+Standards-Version: 3.7.3
+Homepage: http://www.exiv2.org
Package: exiv2
Section: graphics
@@ -17,19 +20,19 @@
summary info, interpreted values, or the plain data for each tag
* print the IPTC metadata of JPEG images
* print, set and delete the JPEG comment of JPEG images
- * set, add and delete Exif and IPTC metadata of JPEG images
+ * set, add and delete Exif and IPTC metadata of JPEG images
* adjust the Exif timestamp (that's how it all started...)
* rename Exif image files according to the Exif timestamp
* extract, insert and delete Exif metadata, IPTC metadata and JPEG comments
* extract, insert and delete the thumbnail image embedded in the Exif metadata
* fix the Exif ISO setting of picture taken with Nikon cameras
- .
- Homepage: http://www.exiv2.org/
-Package: libexiv2-0
+Package: libexiv2-2
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libexiv2c2a, libexiv2-0.12, libexiv2-0
+Replaces: libexiv2c2a, libexiv2-0.12, libexiv2-0
Recommends: exiv2
Description: EXIF/IPTC metadata manipulation library
Exiv2 library supports:
@@ -51,7 +54,7 @@
Package: libexiv2-dev
Section: libdevel
Architecture: any
-Depends: libexiv2-0 (= ${binary:Version}), pkg-config
+Depends: libexiv2-2 (= ${binary:Version}), pkg-config
Suggests: libexiv2-doc
Description: EXIF/IPTC metadata manipulation library - development files
Exiv2 C++ header files.
Modified: kde-extras/exiv2/trunk/debian/copyright
===================================================================
--- kde-extras/exiv2/trunk/debian/copyright 2008-01-15 16:45:57 UTC (rev 8970)
+++ kde-extras/exiv2/trunk/debian/copyright 2008-01-16 11:03:46 UTC (rev 8971)
@@ -1,15 +1,26 @@
This package was debianized by KELEMEN Peter <fuji at debian.org> on
Wed, 8 Jun 2005 14:39:56 +0200.
-It was downloaded from http://home.arcor.de/ahuggel/exiv2/download.html .
+It was downloaded from http://www.exiv2.org
-Upstream Author: Andreas HUGGEL <ahuggel at gmx.net>
+Upstream Author:
-Copyright:
- Copyright (C) 2004, 2005, 2006 Andreas Huggel <ahuggel at gmx.net>
+ Andreas HUGGEL <ahuggel at gmx.net>
-License:
+Copyright:
+ (C) 2004-2008 Andreas Huggel <ahuggel at gmx.net>
+
+Copyright for MD5 algorithm tcode:
+
+ (C) 1991-2, RSA Data Security, Inc.
+
+Copyright for XMP sdk:
+
+ (C) 2005-2007 Adobe Systems Incorporated
+
+exiv2 license:
+
Exiv2 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
@@ -30,3 +41,154 @@
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
+
+MD5 algorithm license:
+
+ MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
+
+ Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All rights
+ reserved.
+
+ License to copy and use this software is granted provided that it is
+ identified as the "RSA Data Security, Inc. MD5 Message-Digest Algorithm" in
+ all material mentioning or referencing this software or this function.
+
+ License is also granted to make and use derivative works provided that such
+ works are identified as "derived from the RSA Data Security, Inc. MD5
+ Message-Digest Algorithm" in all material mentioning or referencing the
+ derived work.
+
+ RSA Data Security, Inc. makes no representations concerning either the
+ merchantability of this software or the suitability of this software for
+ any particular purpose. It is provided "as is" without express or implied
+ warranty of any kind.
+
+ These notices must be retained in any copies of any part of this
+ documentation and/or software.
+
+XMP sdk license:
+
+ NOTICE: Adobe permits you to use, modify, and distribute this file in
+ accordance with the terms of the Adobe license agreement accompanying it.
+
+ADOBE SYSTEMS INCORPORATED
+
+OPEN SOURCE LICENSE
+
+NOTICE TO USER: Adobe Systems Incorporated is providing the Software and
+Documentation for use under the terms of this Agreement. Any use, reproduction,
+modification or distribution of the Software or Documentation, or any
+derivatives or portions thereof, constitutes your acceptance of this Agreement.
+
+As used in this Agreement, "Adobe" means Adobe Systems Incorporated. "Software"
+means the software code accompanying this Agreement. "Documentation" means the
+documents, specifications and all other items accompanying this Agreement other
+than the Software.
+
+1. LICENSE GRANT
+Subject to the terms of this Agreement, Adobe hereby grants you
+a non-exclusive, worldwide, royalty free license to use, reproduce, prepare
+derivative works from, publicly display, publicly perform, distribute and
+sublicense the Software for any purpose, provided the copyright notice below
+appears in a conspicuous location within the source code of the distributed
+Software and this license is distributed in the supporting documentation of the
+Software you distribute.
+
+Copyright (date here) Adobe Systems Incorporated and others. All rights
+reserved. The original version of this source code may be found at
+http://adobe.com.
+
+Subject to the terms of this Agreement, Adobe hereby grants you a non-exclusive,
+worldwide, royalty free license to use, reproduce, publicly display, publicly
+perform, distribute and sublicense the Documentation for any purpose. You may
+not modify the Documentation.
+
+No title to the intellectual property in the Software or Documentation is
+transferred to you under the terms of this Agreement. You do not acquire any
+rights to the Software or the Documentation except as expressly set forth in
+this Agreement.
+
+If you choose to distribute the Software in a commercial product, you do so with
+the understanding that you agree to defend, indemnify and hold harmless Adobe
+against any losses, damages and costs arising from the claims, lawsuits or other
+legal actions arising out of such distribution. You may distribute the Software
+in object code form under your own license, provided that your license
+agreement:
+
+(a) complies with the terms and conditions of this license agreement;
+
+(b) effectively disclaims all warranties and conditions, express or implied,
+on behalf of Adobe;
+
+(c) effectively excludes all liability for damages on behalf of Adobe;
+
+(d) states that any provisions that differ from this Agreement are offered by
+you alone and not Adobe; and
+
+(e) states that the Software is available from you or Adobe and informs
+licensees how to obtain it in a reasonable manner on or through a medium
+customarily used for software exchange.
+
+2. DISCLAIMER OF WARRANTY
+ADOBE LICENSES THE SOFTWARE AND DOCUMENTATION TO YOU ONLY ON AN "AS IS" BASIS
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED,
+INCLUDING WITHOUT LIMITATION ANY WARRANTIES OR CONDITIONS OF TITLE, NON-
+INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. ADOBE MAKES
+NO WARRANTY THAT THE SOFTWARE OR DOCUMENTATION WILL BE ERROR-FREE. Each user of
+the Software or Documentation is solely responsible for determining the
+appropriateness of using and distributing the Software and Documentation and
+assumes all risks associated with its exercise of rights under this Agreement,
+including but not limited to the risks and costs of program errors, compliance
+with applicable laws, damage to or loss of data, programs, or equipment, and
+unavailability or interruption of operations. Use of the Software and
+Documentation is made with the understanding that Adobe will not provide you
+with any technical or customer support or maintenance. Some states or
+jurisdictions do not allow the exclusion of implied warranties or limitations on
+how long an implied warranty may last, so the above limitations may not apply to
+you. To the extent permissible, any implied warranties are limited to ninety
+(90) days.
+
+
+3. LIMITATION OF LIABILITY
+ADOBE AND ITS SUPPLIERS SHALL NOT BE LIABLE FOR LOSS OR DAMAGE ARISING OUT OF
+THIS AGREEMENT OR FROM THE USE OF THE SOFTWARE OR DOCUMENTATION. IN NO EVENT
+WILL ADOBE BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY DIRECT, INDIRECT,
+CONSEQUENTIAL, INCIDENTAL, OR SPECIAL DAMAGES INCLUDING LOST PROFITS, LOST
+SAVINGS, COSTS, FEES, OR EXPENSES OF ANY KIND ARISING OUT OF ANY PROVISION OF
+THIS AGREEMENT OR THE USE OR THE INABILITY TO USE THE SOFTWARE OR DOCUMENTATION,
+HOWEVER CAUSED AND UNDER ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE), EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES. ADOBE'S AGGREGATE LIABILITY AND THAT OF ITS
+SUPPLIERS UNDER OR IN CONNECTION WITH THIS AGREEMENT SHALL BE LIMITED TO THE
+AMOUNT PAID BY YOU FOR THE SOFTWARE AND DOCUMENTATION.
+
+4. TRADEMARK USAGE
+Adobe and XMP are the trademarks or registered trademarks of Adobe Systems
+Incorporated in the United States and other countries. Such trademarks may not
+be used to endorse or promote any product unless expressly permitted under
+separate agreement with Adobe.
+
+5. TERM
+Your rights under this Agreement shall terminate if you fail to comply with any
+of the material terms or conditions of this Agreement and do not cure such
+failure in a reasonable period of time after becoming aware of such
+noncompliance. If all your rights under this Agreement terminate, you agree to
+cease use and distribution of the Software and Documentation as soon as
+reasonably practicable.
+
+6. GOVERNING LAW AND JURISDICTION. This Agreement is governed by the statutes
+and laws of the State of California, without regard to the conflicts of law
+principles thereof. If any part of this Agreement is found void and
+unenforceable, it will not affect the validity of the balance of the Agreement,
+which shall remain valid and enforceable according to its terms. Any dispute
+arising out of or related to this Agreement shall be brought in the courts of
+Santa Clara County, California, USA.
+
+7. GENERAL
+You acknowledge that you have read this Agreement, understand it, and that it is
+the complete and exclusive statement of your agreement with Adobe which
+supersedes any prior agreement, oral or written, between Adobe and you with
+respect to the licensing to you of the Software and Documentation. No variation
+of the terms of this Agreement will be enforceable against Adobe unless Adobe
+gives its express consent in writing signed by an authorized signatory of Adobe.
+
Deleted: kde-extras/exiv2/trunk/debian/dirs
Deleted: kde-extras/exiv2/trunk/debian/libexiv2-0.install
Added: kde-extras/exiv2/trunk/debian/libexiv2-2.install
===================================================================
--- kde-extras/exiv2/trunk/debian/libexiv2-2.install (rev 0)
+++ kde-extras/exiv2/trunk/debian/libexiv2-2.install 2008-01-16 11:03:46 UTC (rev 8971)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lib*.so.*
Added: kde-extras/exiv2/trunk/debian/patches/01_gcc4.3.diff
===================================================================
--- kde-extras/exiv2/trunk/debian/patches/01_gcc4.3.diff (rev 0)
+++ kde-extras/exiv2/trunk/debian/patches/01_gcc4.3.diff 2008-01-16 11:03:46 UTC (rev 8971)
@@ -0,0 +1,11 @@
+--- a/src/basicio.cpp
++++ b/src/basicio.cpp
+@@ -428,7 +428,7 @@
+ // Minimum size for 1st block is 32kB
+ long size = std::max(32768 * (1 + need / 32768), size_);
+ byte* data = (byte*)std::malloc(size);
+- std::memcpy(data, data_, size_);
++ memcpy(data, data_, size_);
+ data_ = data;
+ sizeAlloced_ = size;
+ isMalloced_ = true;
Deleted: kde-extras/exiv2/trunk/debian/patches/cve-2007-6353.diff
Deleted: kde-extras/exiv2/trunk/debian/patches/rev-1124.diff
Added: kde-extras/exiv2/trunk/debian/patches/series
===================================================================
--- kde-extras/exiv2/trunk/debian/patches/series (rev 0)
+++ kde-extras/exiv2/trunk/debian/patches/series 2008-01-16 11:03:46 UTC (rev 8971)
@@ -0,0 +1 @@
+01_gcc4.3.diff
Modified: kde-extras/exiv2/trunk/debian/rules
===================================================================
--- kde-extras/exiv2/trunk/debian/rules 2008-01-15 16:45:57 UTC (rev 8970)
+++ kde-extras/exiv2/trunk/debian/rules 2008-01-16 11:03:46 UTC (rev 8971)
@@ -4,20 +4,25 @@
UPFILENAME = $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.gz
URL = http://www.exiv2.org/$(UPFILENAME)
+include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/utils.mk
+DEB_INSTALL_CHANGELOGS_ALL := doc/ChangeLog
+DEB_COMPRESS_EXCLUDE := .xls .js .idx .xml .php
+DEB_INSTALL_DOCS_ALL := -Xcmd.txt -XMakefile -Xtemplates -XChangeLog
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-undefined -Wl,--as-needed"
+
build/libexiv2-doc::
- $(MAKE) doc
+ [ ! -f Makefile ] || $(MAKE) doc
install/exiv2::
/usr/bin/chrpath -d $(CURDIR)/debian/tmp/usr/bin/exiv2
-DEB_INSTALL_CHANGELOGS_ALL := doc/ChangeLog
-DEB_COMPRESS_EXCLUDE := .xls .js .idx .xml .php
-DEB_INSTALL_DOCS_ALL := -Xcmd.txt -XMakefile -Xtemplates -XChangeLog
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath
+clean::
+ [ ! -f Makefile ] || $(MAKE) maintainer-clean
get-orig-source:
@@dh_testdir
@@ -32,3 +37,4 @@
@@echo DEB_UPSTREAM_VERSION: $(DEB_UPSTREAM_VERSION)
@@echo FILENAME: $(FILENAME)
@@echo URL: $(URL)
+
More information about the pkg-kde-commits
mailing list