--- lensfun-0.2.3.orig/debian/copyright +++ lensfun-0.2.3/debian/copyright @@ -0,0 +1,423 @@ +This package was debianized by Mark Purcell on +Sat, 05 Jul 2008 11:33:25 +1000. + +It was downloaded from http://lensfun.berlios.de + +Upstream Authors: + +CODE: + Andrew Zabolotny + +LENS DATA: + Tom Niemann: original open-source ptlens database. + +Copyright: + + [Copyright: 2005-2007 Andrew Zabolotny] + +License: + + The libraries which are part of this package are licensed under the terms + of the GNU Lesser General Public License, version 3. Libraries are located + under the subdirectory libs/ of the source package. A copy of the license + is available in the file lgpl-3.0.txt which can be found in the source + archive. You can read it here: http://www.gnu.org/licenses/lgpl-3.0.html + + Applications which are part of this package are licensed under the terms + of the GNU General Public License, version 3. Applications are located + under the apps/ subdirectory of the source package. A copy of the license + can be found in the file gpl-3.0.txt which can be found in the source + achive. You can read it here: http://www.gnu.org/licenses/gpl-3.0.html + + Also the build system (the contents of the build/ subdirectory plus the + ac.py file) is licensed under GPL v3. + + Test programs and tools are put into public domain, unless explicitly + specified otherwise in the header of the source files. Test programs + are located under the tests/ subdirectory, and tools are located in tools/. + + The lens database is licensed under the Creative Commons Attribution-Share + Alike 3.0 license. The database is located under the data/ subdirectory + of the source package. You can read it here: + http://creativecommons.org/licenses/by-sa/ + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-3'. + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL-3'. + +The Debian packaging is Copyright 2008, Mark Purcell and +is licensed under the GPL, see `/usr/share/common-licenses/GPL-3'. + +Other Files: +tools/makedep/pr.cpp: MIT/X11 (BSD like) + [Copyright: 1993, 1994 X Consortium] + +tools/makedep/cppsetup.cpp: MIT/X11 (BSD like) + [Copyright: 1993, 1994 X Consortium] + +tools/makedep/include.cpp: MIT/X11 (BSD like) + [Copyright: 1993, 1994 X Consortium] + +tools/makedep/parse.cpp: MIT/X11 (BSD like) + [Copyright: 1993, 1994 X Consortium] + +tools/makedep/ifparser.cpp: UNKNOWN + [Copyright: 1992 Network Computing Devices, Inc] + +tools/makedep/main.cpp: MIT/X11 (BSD like) + [Copyright: 1993, 1994 X Consortium] + + +Creative Commons Attribution-Share Alike 3.0 Unported License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE +COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY +COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS +AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO +BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE +CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED +HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + + 1. "Adaptation" means a work based upon the Work, or upon the Work and + other pre-existing works, such as a translation, adaptation, + derivative work, arrangement of music or other alterations of a + literary or artistic work, or phonogram or performance and includes + cinematographic adaptations or any other form in which the Work may + be recast, transformed, or adapted including in any form recognizably + derived from the original, except that a work that constitutes a + Collection will not be considered an Adaptation for the purpose of + this License. For the avoidance of doubt, where the Work is a musical + work, performance or phonogram, the synchronization of the Work in + timed-relation with a moving image ("synching") will be considered an + Adaptation for the purpose of this License. + + 2. "Collection" means a collection of literary or artistic works, such + as encyclopedias and anthologies, or performances, phonograms or + broadcasts, or other works or subject matter other than works listed + in Section 1(f) below, which, by reason of the selection and + arrangement of their contents, constitute intellectual creations, in + which the Work is included in its entirety in unmodified form along + with one or more other contributions, each constituting separate and + independent works in themselves, which together are assembled into a + collective whole. A work that constitutes a Collection will not be + considered an Adaptation (as defined below) for the purposes of this + License. + + 3. "Creative Commons Compatible License" means a license that is listed + at http://creativecommons.org/compatiblelicenses that has been + approved by Creative Commons as being essentially equivalent to this + License, including, at a minimum, because that license: (i) contains + terms that have the same purpose, meaning and effect as the License + Elements of this License; and, (ii) explicitly permits the + relicensing of adaptations of works made available under that license + under this License or a Creative Commons jurisdiction license with + the same License Elements as this License. + + 4. "Distribute" means to make available to the public the original and + copies of the Work or Adaptation, as appropriate, through sale or + other transfer of ownership. + + 5. "License Elements" means the following high-level license attributes + as selected by Licensor and indicated in the title of this License: + Attribution, ShareAlike. + + 6. "Licensor" means the individual, individuals, entity or entities that + offer(s) the Work under the terms of this License. + + 7. "Original Author" means, in the case of a literary or artistic work, + the individual, individuals, entity or entities who created the Work + or if no individual or entity can be identified, the publisher; and + in addition (i) in the case of a performance the actors, singers, + musicians, dancers, and other persons who act, sing, deliver, + declaim, play in, interpret or otherwise perform literary or artistic + works or expressions of folklore; (ii) in the case of a phonogram the + producer being the person or legal entity who first fixes the sounds + of a performance or other sounds; and, (iii) in the case of + broadcasts, the organization that transmits the broadcast. + + 8. "Work" means the literary and/or artistic work offered under the + terms of this License including without limitation any production in + the literary, scientific and artistic domain, whatever may be the + mode or form of its expression including digital form, such as a + book, pamphlet and other writing; a lecture, address, sermon or other + work of the same nature; a dramatic or dramatico-musical work; a + choreographic work or entertainment in dumb show; a musical + composition with or without words; a cinematographic work to which + are assimilated works expressed by a process analogous to + cinematography; a work of drawing, painting, architecture, sculpture, + engraving or lithography; a photographic work to which are + assimilated works expressed by a process analogous to photography; a + work of applied art; an illustration, map, plan, sketch or + three-dimensional work relative to geography, topography, + architecture or science; a performance; a broadcast; a phonogram; a + compilation of data to the extent it is protected as a copyrightable + work; or a work performed by a variety or circus performer to the + extent it is not otherwise considered a literary or artistic work. + + 9. "You" means an individual or entity exercising rights under this + License who has not previously violated the terms of this License + with respect to the Work, or who has received express permission from + the Licensor to exercise rights under this License despite a previous + violation. + + 10. "Publicly Perform" means to perform public recitations of the Work + and to communicate to the public those public recitations, by any + means or process, including by wire or wireless means or public + digital performances; to make available to the public Works in such a + way that members of the public may access these Works from a place + and at a place individually chosen by them; to perform the Work to + the public by any means or process and the communication to the + public of the performances of the Work, including by public digital + performance; to broadcast and rebroadcast the Work by any means + including signs, sounds or images. + + 11. "Reproduce" means to make copies of the Work by any means including + without limitation by sound or visual recordings and the right of + fixation and reproducing fixations of the Work, including storage of + a protected performance or phonogram in digital form or other + electronic medium. + +2. Fair Dealing Rights. Nothing in this License is intended to reduce, +limit, or restrict any uses free from copyright or rights arising from +limitations or exceptions that are provided for in connection with the +copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, +Licensor hereby grants You a worldwide, royalty-free, non-exclusive, +perpetual (for the duration of the applicable copyright) license to +exercise the rights in the Work as stated below: + + 1. to Reproduce the Work, to incorporate the Work into one or more + Collections, and to Reproduce the Work as incorporated in the + Collections; + + 2. to create and Reproduce Adaptations provided that any such + Adaptation, including any translation in any medium, takes reasonable + steps to clearly label, demarcate or otherwise identify that changes + were made to the original Work. For example, a translation could be + marked "The original work was translated from English to Spanish," or + a modification could indicate "The original work has been modified."; + + 3. to Distribute and Publicly Perform the Work including as incorporated + in Collections; and, + + 4. to Distribute and Publicly Perform Adaptations. + + 5. For the avoidance of doubt: + + 1. Non-waivable Compulsory License Schemes. In those jurisdictions + in which the right to collect royalties through any statutory or + compulsory licensing scheme cannot be waived, the Licensor reserves + the exclusive right to collect such royalties for any exercise by You + of the rights granted under this License; + + 2. Waivable Compulsory License Schemes. In those jurisdictions in + which the right to collect royalties through any statutory or + compulsory licensing scheme can be waived, the Licensor waives the + exclusive right to collect such royalties for any exercise by You of + the rights granted under this License; and, + + 3. Voluntary License Schemes. The Licensor waives the right to + collect royalties, whether individually or, in the event that the + Licensor is a member of a collecting society that administers + voluntary licensing schemes, via that society, from any exercise by + You of the rights granted under this License. + +The above rights may be exercised in all media and formats whether now + known or hereafter devised. The above rights include the right to + make such modifications as are technically necessary to exercise the + rights in other media and formats. Subject to Section 8(f), all + rights not expressly granted by Licensor are hereby reserved. + +4. Restrictions. The license granted in Section 3 above is expressly made +subject to and limited by the following restrictions: + + 1. You may Distribute or Publicly Perform the Work only under the terms + of this License. You must include a copy of, or the Uniform Resource + Identifier (URI) for, this License with every copy of the Work You + Distribute or Publicly Perform. You may not offer or impose any terms + on the Work that restrict the terms of this License or the ability of + the recipient of the Work to exercise the rights granted to that + recipient under the terms of the License. You may not sublicense the + Work. You must keep intact all notices that refer to this License and + to the disclaimer of warranties with every copy of the Work You + Distribute or Publicly Perform. When You Distribute or Publicly + Perform the Work, You may not impose any effective technological + measures on the Work that restrict the ability of a recipient of the + Work from You to exercise the rights granted to that recipient under + the terms of the License. This Section 4(a) applies to the Work as + incorporated in a Collection, but this does not require the + Collection apart from the Work itself to be made subject to the terms + of this License. If You create a Collection, upon notice from any + Licensor You must, to the extent practicable, remove from the + Collection any credit as required by Section 4(c), as requested. If + You create an Adaptation, upon notice from any Licensor You must, to + the extent practicable, remove from the Adaptation any credit as + required by Section 4(c), as requested. + + 2. You may Distribute or Publicly Perform an Adaptation only under the + terms of: (i) this License; (ii) a later version of this License with + the same License Elements as this License; (iii) a Creative Commons + jurisdiction license (either this or a later license version) that + contains the same License Elements as this License (e.g., + Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible + License. If you license the Adaptation under one of the licenses + mentioned in (iv), you must comply with the terms of that license. If + you license the Adaptation under the terms of any of the licenses + mentioned in (i), (ii) or (iii) (the "Applicable License"), you must + comply with the terms of the Applicable License generally and the + following provisions: (I) You must include a copy of, or the URI for, + the Applicable License with every copy of each Adaptation You + Distribute or Publicly Perform; (II) You may not offer or impose any + terms on the Adaptation that restrict the terms of the Applicable + License or the ability of the recipient of the Adaptation to exercise + the rights granted to that recipient under the terms of the + Applicable License; (III) You must keep intact all notices that refer + to the Applicable License and to the disclaimer of warranties with + every copy of the Work as included in the Adaptation You Distribute + or Publicly Perform; (IV) when You Distribute or Publicly Perform the + Adaptation, You may not impose any effective technological measures + on the Adaptation that restrict the ability of a recipient of the + Adaptation from You to exercise the rights granted to that recipient + under the terms of the Applicable License. This Section 4(b) applies + to the Adaptation as incorporated in a Collection, but this does not + require the Collection apart from the Adaptation itself to be made + subject to the terms of the Applicable License. + + 3. If You Distribute, or Publicly Perform the Work or any Adaptations or + Collections, You must, unless a request has been made pursuant to + Section 4(a), keep intact all copyright notices for the Work and + provide, reasonable to the medium or means You are utilizing: (i) the + name of the Original Author (or pseudonym, if applicable) if + supplied, and/or if the Original Author and/or Licensor designate + another party or parties (e.g., a sponsor institute, publishing + entity, journal) for attribution ("Attribution Parties") in + Licensor's copyright notice, terms of service or by other reasonable + means, the name of such party or parties; (ii) the title of the Work + if supplied; (iii) to the extent reasonably practicable, the URI, if + any, that Licensor specifies to be associated with the Work, unless + such URI does not refer to the copyright notice or licensing + information for the Work; and (iv) , consistent with Ssection 3(b), + in the case of an Adaptation, a credit identifying the use of the + Work in the Adaptation (e.g., "French translation of the Work by + Original Author," or "Screenplay based on original Work by Original + Author"). The credit required by this Section 4(c) may be implemented + in any reasonable manner; provided, however, that in the case of a + Adaptation or Collection, at a minimum such credit will appear, if a + credit for all contributing authors of the Adaptation or Collection + appears, then as part of these credits and in a manner at least as + prominent as the credits for the other contributing authors. For the + avoidance of doubt, You may only use the credit required by this + Section for the purpose of attribution in the manner set out above + and, by exercising Your rights under this License, You may not + implicitly or explicitly assert or imply any connection with, + sponsorship or endorsement by the Original Author, Licensor and/or + Attribution Parties, as appropriate, of You or Your use of the Work, + without the separate, express prior written permission of the + Original Author, Licensor and/or Attribution Parties. + + 4. Except as otherwise agreed in writing by the Licensor or as may be + otherwise permitted by applicable law, if You Reproduce, Distribute + or Publicly Perform the Work either by itself or as part of any + Adaptations or Collections, You must not distort, mutilate, modify or + take other derogatory action in relation to the Work which would be + prejudicial to the Original Author's honor or reputation. Licensor + agrees that in those jurisdictions (e.g. Japan), in which any + exercise of the right granted in Section 3(b) of this License (the + right to make Adaptations) would be deemed to be a distortion, + mutilation, modification or other derogatory action prejudicial to + the Original Author's honor and reputation, the Licensor will waive + or not assert, as appropriate, this Section, to the fullest extent + permitted by the applicable national law, to enable You to reasonably + exercise Your right under Section 3(b) of this License (right to make + Adaptations) but not otherwise. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR +OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY +KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, +INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, +FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT +OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER +OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF +IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE +LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY +SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING +OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN +ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + 1. This License and the rights granted hereunder will terminate + automatically upon any breach by You of the terms of this License. + Individuals or entities who have received Adaptations or Collections + from You under this License, however, will not have their licenses + terminated provided such individuals or entities remain in full + compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will + survive any termination of this License. + + 2. Subject to the above terms and conditions, the license granted here + is perpetual (for the duration of the applicable copyright in the + Work). Notwithstanding the above, Licensor reserves the right to + release the Work under different license terms or to stop + distributing the Work at any time; provided, however that any such + election will not serve to withdraw this License (or any other + license that has been, or is required to be, granted under the terms + of this License), and this License will continue in full force and + effect unless terminated as stated above. + +8. Miscellaneous + + 1. Each time You Distribute or Publicly Perform the Work or a + Collection, the Licensor offers to the recipient a license to the + Work on the same terms and conditions as the license granted to You + under this License. + + 2. Each time You Distribute or Publicly Perform an Adaptation, Licensor + offers to the recipient a license to the original Work on the same + terms and conditions as the license granted to You under this + License. + + 3. If any provision of this License is invalid or unenforceable under + applicable law, it shall not affect the validity or enforceability of + the remainder of the terms of this License, and without further + action by the parties to this agreement, such provision shall be + reformed to the minimum extent necessary to make such provision valid + and enforceable. + + 4. No term or provision of this License shall be deemed waived and no + breach consented to unless such waiver or consent shall be in writing + and signed by the party to be charged with such waiver or consent. + + 5. This License constitutes the entire agreement between the parties + with respect to the Work licensed here. There are no understandings, + agreements or representations with respect to the Work not specified + here. Licensor shall not be bound by any additional provisions that + may appear in any communication from You. This License may not be + modified without the mutual written agreement of the Licensor and + You. + + 6. The rights granted under, and the subject matter referenced, in this + License were drafted utilizing the terminology of the Berne + Convention for the Protection of Literary and Artistic Works (as + amended on September 28, 1979), the Rome Convention of 1961, the WIPO + Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty + of 1996 and the Universal Copyright Convention (as revised on July + 24, 1971). These rights and subject matter take effect in the + relevant jurisdiction in which the License terms are sought to be + enforced according to the corresponding provisions of the + implementation of those treaty provisions in the applicable national + law. If the standard suite of rights granted under applicable + copyright law includes additional rights not granted under this + License, such additional rights are deemed to be included in the + License; this License is not intended to restrict the license of any + rights under applicable law. --- lensfun-0.2.3.orig/debian/control +++ lensfun-0.2.3/debian/control @@ -0,0 +1,73 @@ +Source: lensfun +Priority: extra +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Debian KDE Extras Team +Uploaders: Mark Purcell +Build-Depends: debhelper (>= 7), autotools-dev, cdbs, dpatch, python, doxygen, libglib2.0-dev, libpng12-dev +Standards-Version: 3.8.0 +Section: libs +Homepage: http://lensfun.berlios.de + +Package: liblensfun-dev +Section: libdevel +Architecture: any +Depends: liblensfun0 (= ${binary:Version}), ${misc:Depends} +Description: LensCorrection editor plugin library - development files + Development files for the lensfun library. + . + Database of photographic lenses and their characteristics. + . + The lensfun library not only provides a way to read the database + and search for specific things in it, but also provides a set of + algorithms for correcting images based on detailed knowledge of + lens properties. Right now lensfun is designed to correct + distortion, transversal (also known as lateral) chromatic aberrations, + vignetting and colour contribution of the lens (e.g. when sometimes + people says one lens gives "yellowish" images and another, say, "bluish"). + +Package: liblensfun0 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, liblensfun-data +Description: LensCorrection editor plugin library + Runtime files for the lensfun library. + . + Database of photographic lenses and their characteristics. + . + The lensfun library not only provides a way to read the database + and search for specific things in it, but also provides a set of + algorithms for correcting images based on detailed knowledge of + lens properties. Right now lensfun is designed to correct + distortion, transversal (also known as lateral) chromatic aberrations, + vignetting and colour contribution of the lens (e.g. when sometimes + people says one lens gives "yellowish" images and another, say, "bluish"). + +Package: liblensfun-data +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Lens Correction library + Database of photographic lenses and their characteristics. + . + The lensfun library not only provides a way to read the database + and search for specific things in it, but also provides a set of + algorithms for correcting images based on detailed knowledge of + lens properties. Right now lensfun is designed to correct + distortion, transversal (also known as lateral) chromatic aberrations, + vignetting and colour contribution of the lens (e.g. when sometimes + people says one lens gives "yellowish" images and another, say, "bluish"). + +Package: liblensfun-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Description: Lens Correction library + Manual for the lensfun library. + . + The lensfun library not only provides a way to read the database + and search for specific things in it, but also provides a set of + algorithms for correcting images based on detailed knowledge of + lens properties. Right now lensfun is designed to correct + distortion, transversal (also known as lateral) chromatic aberrations, + vignetting and colour contribution of the lens (e.g. when sometimes + people says one lens gives "yellowish" images and another, say, "bluish"). + + --- lensfun-0.2.3.orig/debian/compat +++ lensfun-0.2.3/debian/compat @@ -0,0 +1 @@ +7 --- lensfun-0.2.3.orig/debian/liblensfun-data.install +++ lensfun-0.2.3/debian/liblensfun-data.install @@ -0,0 +1 @@ +usr/share/lensfun --- lensfun-0.2.3.orig/debian/liblensfun-dev.install +++ lensfun-0.2.3/debian/liblensfun-dev.install @@ -0,0 +1,6 @@ +usr/include/* +#usr/lib/lib*.a +usr/lib/lib*.so +usr/lib/pkgconfig/* +#usr/lib/*.la +#usr/share/pkgconfig/* --- lensfun-0.2.3.orig/debian/liblensfun0.install +++ lensfun-0.2.3/debian/liblensfun0.install @@ -0,0 +1 @@ +usr/lib/lib*.so.* --- lensfun-0.2.3.orig/debian/watch +++ lensfun-0.2.3/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://developer.berlios.de/project/showfiles.php?group_id=9034 http://prdownload.berlios.de/lensfun/lensfun-(.*).tar.bz2 --- lensfun-0.2.3.orig/debian/rules +++ lensfun-0.2.3/debian/rules @@ -0,0 +1,13 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/dpatch.mk +include /usr/share/cdbs/1/class/makefile.mk + +configure/liblensfun-dev:: + ./configure --prefix=/usr --libdir=/usr/lib + +DEB_MAKE_BUILD_TARGET := all +DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp/ +DEB_MAKE_CHECK_TARGET := tests +DEB_DH_MAKESHLIBS_ARGS_ALL := -- -v0.2.3 --- lensfun-0.2.3.orig/debian/changelog +++ lensfun-0.2.3/debian/changelog @@ -0,0 +1,49 @@ +lensfun (0.2.3-0ubuntu5) karmic; urgency=low + + * Add 20-enum-sentinel patch to have g++-4.4 not remove the otherwise + unreachable code handling out-of-bounds enum values via the + c-wrapper functions. LP: #433368. + + -- Stefan Potyra Mon, 21 Sep 2009 22:51:28 +0200 + +lensfun (0.2.3-0ubuntu4) karmic; urgency=low + + * Add 10-makedep-fix-ftbfs.dpatch to fix FTBFS. + + -- Stefan Potyra Sat, 19 Sep 2009 16:21:30 +0200 + +lensfun (0.2.3-0ubuntu3) jaunty; urgency=low + + * Merge changes from Debian SVN + + [ Pascal de Bruijn ] + * Added patches: + - 01-lensfun-db-cameras-generic (APS-H, FourThirds) + - 02-lensfun-db-cameras-canon (5DmkII, 50D, 30D) + - 03-lensfun-db-cameras-nikon (D40, D40X, D60, D80, D90, D700, D3, D3X) + - 04-lensfun-db-cameras-pentax (K100D, K200D, K10D, K20D) + - 05-lensfun-db-cameras-samsung (GX20) + * Split up the data package into a data and doc package. + + [ Mark Purcell ] + * Update Maintainer: Debian KDE Extras Team + + -- Luka Renko Thu, 19 Mar 2009 18:09:49 +0100 + +lensfun (0.2.3-0ubuntu2) jaunty; urgency=low + + * Update debian/liblensfun0.symbols to match all symbols. + + -- Luka Renko Fri, 13 Feb 2009 09:25:51 +0100 + +lensfun (0.2.3-0ubuntu1) jaunty; urgency=low + + * Initial release (LP: #305965) + - packaging done by Mark Purcell for Debian + - package is taken directly from Debian NEW queue: + http://ftp-master.debian.org/new/lensfun_0.2.3-1.html + * Ubuntu specific changes: + - rules: add --libdir=/usr/lib to ./configure for amd64 libraries + - rules: pass -v0.2.3 to dpkg-gensymbols for version check to pass + + -- Luka Renko Sun, 01 Feb 2009 17:40:45 +0100 --- lensfun-0.2.3.orig/debian/liblensfun-doc.install +++ lensfun-0.2.3/debian/liblensfun-doc.install @@ -0,0 +1 @@ +usr/share/doc/*/manual usr/share/doc/liblensfun-doc/ --- lensfun-0.2.3.orig/debian/liblensfun0.symbols +++ lensfun-0.2.3/debian/liblensfun0.symbols @@ -0,0 +1,206 @@ +liblensfun.so.0 liblensfun0 #MINVER# + _Z10_lf_addobjPPPvPKvjPFbS3_S3_E@Base 0.2.3 + _Z10_lf_addobjPPPvPKvmPFbS3_S3_E@Base 0.2.3 + _Z10_lf_addstrPPPcPKc@Base 0.2.3 + _Z10_lf_delobjPPPvi@Base 0.2.3 + _Z10_lf_setstrPPcPKc@Base 0.2.3 + _Z10_lf_strcmpPKcS0_@Base 0.2.3 + _Z12_lf_mlstrcmpPKcPc@Base 0.2.3 + _Z13_lf_list_freePPv@Base 0.2.3 + _Z14_lf_xml_printfP8_GStringPKcz@Base 0.2.3 + _Z15_lf_interpolatefffff@Base 0.2.3 + _Z16_lf_lens_comparePKvS0_@Base 0.2.3 + _Z17_lf_mount_comparePKvS0_@Base 0.2.3 + _Z18_lf_camera_comparePKvS0_@Base 0.2.3 + _Z20_lf_xml_printf_mlstrP8_GStringPKcS2_Pc@Base 0.2.3 + _Z22_lf_lens_compare_scorePK6lfLensS1_P13lfFuzzyStrCmpPPKc@Base 0.2.3 + _Z25_lf_ptr_array_find_sortedPK10_GPtrArrayPvPFiPKvS4_E@Base 0.2.3 + _Z27_lf_ptr_array_insert_sortedP10_GPtrArrayPvPFiPKvS3_E@Base 0.2.3 + _Z27_lf_ptr_array_insert_uniqueP10_GPtrArrayPvPFiPKvS3_EPFvS1_E@Base 0.2.3 + _Z7_lf_rt3d@Base 0.2.3 + _ZN10lfDatabase4LoadEPKc@Base 0.2.3 + _ZN10lfDatabase4LoadEPKcS1_j@Base 0.2.3 + _ZN10lfDatabase4LoadEPKcS1_m@Base 0.2.3 + _ZN10lfDatabase4LoadEv@Base 0.2.3 + _ZN10lfDatabase4SaveEPKPK7lfMountPKPK8lfCameraPKPK6lfLens@Base 0.2.3 + _ZN10lfDatabase6CreateEv@Base 0.2.3 + _ZN10lfDatabase7DestroyEv@Base 0.2.3 + _ZN10lfModifier10InitializeEPK6lfLens13lfPixelFormatffff10lfLensTypeib@Base 0.2.3 + _ZN10lfModifier12GetAutoScaleEb@Base 0.2.3 + _ZN10lfModifier16AddColorCallbackEPFvPvffS0_iiEiS0_j@Base 0.2.3 + _ZN10lfModifier16AddColorCallbackEPFvPvffS0_iiEiS0_m@Base 0.2.3 + _ZN10lfModifier16AddCoordCallbackEPFvPvPfiEiS0_j@Base 0.2.3 + _ZN10lfModifier16AddCoordCallbackEPFvPvPfiEiS0_m@Base 0.2.3 + _ZN10lfModifier19AddColorCallbackCCIEPK6lfLens13lfPixelFormatb@Base 0.2.3 + _ZN10lfModifier19AddSubpixelCallbackEPFvPvPfiEiS0_j@Base 0.2.3 + _ZN10lfModifier19AddSubpixelCallbackEPFvPvPfiEiS0_m@Base 0.2.3 + _ZN10lfModifier21AddCoordCallbackScaleEfb@Base 0.2.3 + _ZN10lfModifier22AddSubpixelCallbackTCAER14lfLensCalibTCAb@Base 0.2.3 + _ZN10lfModifier24AddCoordCallbackGeometryE10lfLensTypeS0_f@Base 0.2.3 + _ZN10lfModifier26AddColorCallbackVignettingER21lfLensCalibVignetting13lfPixelFormatb@Base 0.2.3 + _ZN10lfModifier26AddCoordCallbackDistortionER21lfLensCalibDistortionb@Base 0.2.3 + _ZN10lfModifier6CreateEPK6lfLensfii@Base 0.2.3 + _ZN10lfModifier7DestroyEv@Base 0.2.3 + _ZN13lfExtModifier11AddCallbackEP10_GPtrArrayP14lfCallbackDataiPvj@Base 0.2.3 + _ZN13lfExtModifier11AddCallbackEP10_GPtrArrayP14lfCallbackDataiPvm@Base 0.2.3 + _ZN13lfExtModifier17ModifyCoord_ScaleEPvPfi@Base 0.2.3 + _ZN13lfExtModifier21ModifyCoord_Dist_FOV1EPvPfi@Base 0.2.3 + _ZN13lfExtModifier22ModifyCoord_Dist_Poly3EPvPfi@Base 0.2.3 + _ZN13lfExtModifier22ModifyCoord_Dist_Poly5EPvPfi@Base 0.2.3 + _ZN13lfExtModifier22ModifyCoord_TCA_LinearEPvPfi@Base 0.2.3 + _ZN13lfExtModifier23ModifyCoord_Dist_PTLensEPvPfi@Base 0.2.3 + _ZN13lfExtModifier23ModifyCoord_UnDist_FOV1EPvPfi@Base 0.2.3 + _ZN13lfExtModifier24ModifyCoord_UnDist_Poly3EPvPfi@Base 0.2.3 + _ZN13lfExtModifier24ModifyCoord_UnDist_Poly5EPvPfi@Base 0.2.3 + _ZN13lfExtModifier24ModifyCoord_UnTCA_LinearEPvPfi@Base 0.2.3 + _ZN13lfExtModifier25ModifyColor_Vignetting_PAIdEEvPvffPT_ii@Base 0.2.3 + _ZN13lfExtModifier25ModifyColor_Vignetting_PAIfEEvPvffPT_ii@Base 0.2.3 + _ZN13lfExtModifier25ModifyColor_Vignetting_PAIhEEvPvffPT_ii@Base 0.2.3 + _ZN13lfExtModifier25ModifyColor_Vignetting_PAIjEEvPvffPT_ii@Base 0.2.3 + _ZN13lfExtModifier25ModifyColor_Vignetting_PAItEEvPvffPT_ii@Base 0.2.3 + _ZN13lfExtModifier25ModifyCoord_UnDist_PTLensEPvPfi@Base 0.2.3 + _ZN13lfExtModifier27ModifyColor_DeVignetting_PAIdEEvPvffPT_ii@Base 0.2.3 + _ZN13lfExtModifier27ModifyColor_DeVignetting_PAIfEEvPvffPT_ii@Base 0.2.3 + _ZN13lfExtModifier27ModifyColor_DeVignetting_PAIhEEvPvffPT_ii@Base 0.2.3 + _ZN13lfExtModifier27ModifyColor_DeVignetting_PAIjEEvPvffPT_ii@Base 0.2.3 + _ZN13lfExtModifier27ModifyColor_DeVignetting_PAItEEvPvffPT_ii@Base 0.2.3 + _ZN13lfExtModifier27ModifyCoord_Geom_ERect_RectEPvPfi@Base 0.2.3 + _ZN13lfExtModifier27ModifyCoord_Geom_Rect_ERectEPvPfi@Base 0.2.3 + _ZN13lfExtModifier29ModifyCoord_Geom_FishEye_RectEPvPfi@Base 0.2.3 + _ZN13lfExtModifier29ModifyCoord_Geom_Rect_FishEyeEPvPfi@Base 0.2.3 + _ZN13lfExtModifier30ModifyCoord_Geom_ERect_FishEyeEPvPfi@Base 0.2.3 + _ZN13lfExtModifier30ModifyCoord_Geom_FishEye_ERectEPvPfi@Base 0.2.3 + _ZN13lfExtModifier31ModifyCoord_Geom_Panoramic_RectEPvPfi@Base 0.2.3 + _ZN13lfExtModifier31ModifyCoord_Geom_Rect_PanoramicEPvPfi@Base 0.2.3 + _ZN13lfExtModifier32ModifyCoord_Geom_ERect_PanoramicEPvPfi@Base 0.2.3 + _ZN13lfExtModifier32ModifyCoord_Geom_Panoramic_ERectEPvPfi@Base 0.2.3 + _ZN13lfExtModifier34ModifyCoord_Geom_FishEye_PanoramicEPvPfi@Base 0.2.3 + _ZN13lfExtModifier34ModifyCoord_Geom_Panoramic_FishEyeEPvPfi@Base 0.2.3 + _ZN13lfExtModifierC1EPK6lfLensfii@Base 0.2.3 + _ZN13lfExtModifierC2EPK6lfLensfii@Base 0.2.3 + _ZN13lfExtModifierD1Ev@Base 0.2.3 + _ZN13lfExtModifierD2Ev@Base 0.2.3 + _ZN13lfFuzzyStrCmp4FreeEP10_GPtrArray@Base 0.2.3 + _ZN13lfFuzzyStrCmp5SplitEPKcP10_GPtrArray@Base 0.2.3 + _ZN13lfFuzzyStrCmp7CompareEPKc@Base 0.2.3 + _ZN13lfFuzzyStrCmp7CompareEPc@Base 0.2.3 + _ZN13lfFuzzyStrCmpC1EPKcb@Base 0.2.3 + _ZN13lfFuzzyStrCmpC2EPKcb@Base 0.2.3 + _ZN13lfFuzzyStrCmpD1Ev@Base 0.2.3 + _ZN13lfFuzzyStrCmpD2Ev@Base 0.2.3 + _ZN6lfLens11AddCalibTCAEPK14lfLensCalibTCA@Base 0.2.3 + _ZN6lfLens14RemoveCalibTCAEi@Base 0.2.3 + _ZN6lfLens15GetLensTypeDescE10lfLensTypePPKc@Base 0.2.3 + _ZN6lfLens15GetTCAModelDescE10lfTCAModelPPKcPPPK11lfParameter@Base 0.2.3 + _ZN6lfLens15GuessParametersEv@Base 0.2.3 + _ZN6lfLens18AddCalibDistortionEPK21lfLensCalibDistortion@Base 0.2.3 + _ZN6lfLens18AddCalibVignettingEPK21lfLensCalibVignetting@Base 0.2.3 + _ZN6lfLens21RemoveCalibDistortionEi@Base 0.2.3 + _ZN6lfLens21RemoveCalibVignettingEi@Base 0.2.3 + _ZN6lfLens22GetDistortionModelDescE17lfDistortionModelPPKcPPPK11lfParameter@Base 0.2.3 + _ZN6lfLens22GetVignettingModelDescE17lfVignettingModelPPKcPPPK11lfParameter@Base 0.2.3 + _ZN6lfLens5CheckEv@Base 0.2.3 + _ZN6lfLens8AddMountEPKc@Base 0.2.3 + _ZN6lfLens8SetMakerEPKcS1_@Base 0.2.3 + _ZN6lfLens8SetModelEPKcS1_@Base 0.2.3 + _ZN6lfLensC1Ev@Base 0.2.3 + _ZN6lfLensC2Ev@Base 0.2.3 + _ZN6lfLensD1Ev@Base 0.2.3 + _ZN6lfLensD2Ev@Base 0.2.3 + _ZN6lfLensaSERKS_@Base 0.2.3 + _ZN7lfMount5CheckEv@Base 0.2.3 + _ZN7lfMount7SetNameEPKcS1_@Base 0.2.3 + _ZN7lfMount9AddCompatEPKc@Base 0.2.3 + _ZN7lfMountC1Ev@Base 0.2.3 + _ZN7lfMountC2Ev@Base 0.2.3 + _ZN7lfMountD1Ev@Base 0.2.3 + _ZN7lfMountD2Ev@Base 0.2.3 + _ZN7lfMountaSERKS_@Base 0.2.3 + _ZN8lfCamera10SetVariantEPKcS1_@Base 0.2.3 + _ZN8lfCamera5CheckEv@Base 0.2.3 + _ZN8lfCamera8SetMakerEPKcS1_@Base 0.2.3 + _ZN8lfCamera8SetModelEPKcS1_@Base 0.2.3 + _ZN8lfCamera8SetMountEPKc@Base 0.2.3 + _ZN8lfCameraC1Ev@Base 0.2.3 + _ZN8lfCameraC2Ev@Base 0.2.3 + _ZN8lfCameraD1Ev@Base 0.2.3 + _ZN8lfCameraD2Ev@Base 0.2.3 + _ZN8lfCameraaSERKS_@Base 0.2.3 + _ZNK10lfDatabase10FindLensesEPK6lfLensi@Base 0.2.3 + _ZNK10lfDatabase10FindLensesEPK8lfCameraPKcS4_i@Base 0.2.3 + _ZNK10lfDatabase10GetCamerasEv@Base 0.2.3 + _ZNK10lfDatabase11FindCamerasEPKcS1_@Base 0.2.3 + _ZNK10lfDatabase14FindCamerasExtEPKcS1_i@Base 0.2.3 + _ZNK10lfDatabase4SaveEPKc@Base 0.2.3 + _ZNK10lfDatabase4SaveEPKcPKPK7lfMountPKPK8lfCameraPKPK6lfLens@Base 0.2.3 + _ZNK10lfDatabase9FindMountEPKc@Base 0.2.3 + _ZNK10lfDatabase9GetLensesEv@Base 0.2.3 + _ZNK10lfDatabase9GetMountsEv@Base 0.2.3 + _ZNK10lfDatabase9MountNameEPKc@Base 0.2.3 + _ZNK10lfModifier22ApplyColorModificationEPvffiiii@Base 0.2.3 + _ZNK10lfModifier23ApplyGeometryDistortionEffiiPf@Base 0.2.3 + _ZNK10lfModifier23ApplySubpixelDistortionEffiiPf@Base 0.2.3 + _ZNK10lfModifier31ApplySubpixelGeometryDistortionEffiiPf@Base 0.2.3 + _ZNK6lfLens14InterpolateTCAEfR14lfLensCalibTCA@Base 0.2.3 + _ZNK6lfLens21InterpolateDistortionEfR21lfLensCalibDistortion@Base 0.2.3 + _ZNK6lfLens21InterpolateVignettingEfffR21lfLensCalibVignetting@Base 0.2.3 + lf_camera_check@Base 0.2.3 + lf_camera_copy@Base 0.2.3 + lf_camera_destroy@Base 0.2.3 + lf_camera_new@Base 0.2.3 + lf_db_destroy@Base 0.2.3 + lf_db_find_cameras@Base 0.2.3 + lf_db_find_cameras_ext@Base 0.2.3 + lf_db_find_lenses@Base 0.2.3 + lf_db_find_lenses_hd@Base 0.2.3 + lf_db_find_mount@Base 0.2.3 + lf_db_get_cameras@Base 0.2.3 + lf_db_get_lenses@Base 0.2.3 + lf_db_get_mounts@Base 0.2.3 + lf_db_load@Base 0.2.3 + lf_db_load_data@Base 0.2.3 + lf_db_load_file@Base 0.2.3 + lf_db_mount_name@Base 0.2.3 + lf_db_new@Base 0.2.3 + lf_db_save@Base 0.2.3 + lf_db_save_all@Base 0.2.3 + lf_db_save_file@Base 0.2.3 + lf_free@Base 0.2.3 + lf_get_distortion_model_desc@Base 0.2.3 + lf_get_lens_type_desc@Base 0.2.3 + lf_get_tca_model_desc@Base 0.2.3 + lf_get_vignetting_model_desc@Base 0.2.3 + lf_lens_add_calib_distortion@Base 0.2.3 + lf_lens_add_calib_tca@Base 0.2.3 + lf_lens_add_calib_vignetting@Base 0.2.3 + lf_lens_check@Base 0.2.3 + lf_lens_copy@Base 0.2.3 + lf_lens_destroy@Base 0.2.3 + lf_lens_guess_parameters@Base 0.2.3 + lf_lens_interpolate_distortion@Base 0.2.3 + lf_lens_interpolate_tca@Base 0.2.3 + lf_lens_interpolate_vignetting@Base 0.2.3 + lf_lens_new@Base 0.2.3 + lf_lens_remove_calib_distortion@Base 0.2.3 + lf_lens_remove_calib_tca@Base 0.2.3 + lf_lens_remove_calib_vignetting@Base 0.2.3 + lf_mlstr_add@Base 0.2.3 + lf_mlstr_dup@Base 0.2.3 + lf_mlstr_get@Base 0.2.3 + lf_modifier_add_color_callback@Base 0.2.3 + lf_modifier_add_color_callback_CCI@Base 0.2.3 + lf_modifier_add_color_callback_vignetting@Base 0.2.3 + lf_modifier_add_coord_callback@Base 0.2.3 + lf_modifier_add_subpixel_callback@Base 0.2.3 + lf_modifier_add_subpixel_callback_TCA@Base 0.2.3 + lf_modifier_apply_color_modification@Base 0.2.3 + lf_modifier_apply_geometry_distortion@Base 0.2.3 + lf_modifier_apply_subpixel_distortion@Base 0.2.3 + lf_modifier_apply_subpixel_geometry_distortion@Base 0.2.3 + lf_modifier_destroy@Base 0.2.3 + lf_modifier_get_auto_scale@Base 0.2.3 + lf_modifier_initialize@Base 0.2.3 + lf_modifier_new@Base 0.2.3 + lf_mount_check@Base 0.2.3 + lf_mount_destroy@Base 0.2.3 + lf_mount_new@Base 0.2.3 --- lensfun-0.2.3.orig/debian/patches/00list +++ lensfun-0.2.3/debian/patches/00list @@ -0,0 +1,7 @@ +01-lensfun-db-cameras-generic +02-lensfun-db-cameras-canon +03-lensfun-db-cameras-nikon +04-lensfun-db-cameras-pentax +05-lensfun-db-cameras-samsung +10-makedep-fix-ftbfs +20-enum-sentinel --- lensfun-0.2.3.orig/debian/patches/20-enum-sentinel.dpatch +++ lensfun-0.2.3/debian/patches/20-enum-sentinel.dpatch @@ -0,0 +1,39 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20-enum-sentinel.dpatch by Stefan Potyra +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: In c++, the enum with only two values may be reduced to fit into 1 bit +## DP: As a result, g++ (4.4) eliminate code from a method with a switch/case +## DP: block, that handles both values and returns from both, as the remainder +## DP: is effectively unreachable. +## DP: Sadly, this removed code handles the case, that an out-of-bounds value is +## DP: passed into the c-wrapper (where it is at least legal to do so from +## DP: a iso c perspective, as in c an enum must be mapped to an int in contrast +## DP: to c++). +## DP: This is basically jus ta band-aid for ucfraw's creative calling into +## DP: lensfun. +## DP: Cf.: https://bugs.launchpad.net/ubuntu/+source/lensfun/+bug/433368 + +@DPATCH@ +diff -urNad lensfun-0.2.3~/include/lensfun/lensfun.h lensfun-0.2.3/include/lensfun/lensfun.h +--- lensfun-0.2.3~/include/lensfun/lensfun.h 2008-06-22 11:27:04.000000000 +0200 ++++ lensfun-0.2.3/include/lensfun/lensfun.h 2009-09-21 22:44:57.000000000 +0200 +@@ -22,6 +22,7 @@ + #define __LENSFUN_H__ + + #include ++#include + + #ifdef __cplusplus + extern "C" { +@@ -455,7 +456,9 @@ + * Rd(R) = Ru(R) * k1, Rd(B) = Ru(B) * k2 + * Ref: http://cipa.icomos.org/fileadmin/papers/Torino2005/403.pdf + */ +- LF_TCA_MODEL_LINEAR ++ LF_TCA_MODEL_LINEAR, ++ /** sentinel, do not use. */ ++ LF_TCA_MODEL_SENTINEL = INT_MAX + }; + + C_TYPEDEF (enum, lfTCAModel) --- lensfun-0.2.3.orig/debian/patches/10-makedep-fix-ftbfs.dpatch +++ lensfun-0.2.3/debian/patches/10-makedep-fix-ftbfs.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10-makedep-fix-ftbfs.dpatch by Stefan Potyra +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: ugly fix for ftbfs. + +@DPATCH@ +diff -urNad lensfun-0.2.3~/tools/makedep/cppsetup.cpp lensfun-0.2.3/tools/makedep/cppsetup.cpp +--- lensfun-0.2.3~/tools/makedep/cppsetup.cpp 2007-11-04 00:52:20.000000000 +0100 ++++ lensfun-0.2.3/tools/makedep/cppsetup.cpp 2009-09-19 16:20:19.000000000 +0200 +@@ -181,7 +181,7 @@ + static long my_eval_variable (IfParser *ip, const char *var, int len) + { + struct symtab **s; +- char *eol; ++ const char *eol; + + s = lookup_variable (ip, var, len); + if (!s) +@@ -215,7 +215,7 @@ + + while (eol > var && isspace (eol [-1])) + eol--; +- *eol = 0; ++ *(char *)eol = 0; + + return strtol (var, NULL, 0); + } --- lensfun-0.2.3.orig/debian/patches/01-lensfun-db-cameras-generic.dpatch +++ lensfun-0.2.3/debian/patches/01-lensfun-db-cameras-generic.dpatch @@ -0,0 +1,39 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01-lensfun-db-cameras-generic.dpatch by Pascal de Bruijn +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add some generic cropfactors, like APS-H and Four Thirds + +@DPATCH@ + +diff -Nur lensfun-0.2.3-orig/data/db/generic.xml lensfun-0.2.3-generic/data/db/generic.xml +--- lensfun-0.2.3-orig/data/db/generic.xml 2008-06-01 23:27:11.000000000 +0200 ++++ lensfun-0.2.3-generic/data/db/generic.xml 2008-12-27 13:56:26.000000000 +0100 +@@ -46,6 +46,13 @@ + + + Generic ++ Crop-factor 1.3 ++ Generic ++ 1.3 ++ ++ ++ ++ Generic + Crop-factor 1.5 + Generic + 1.5 +@@ -65,6 +72,13 @@ + 1.7 + + ++ ++ Generic ++ Crop-factor 2.0 ++ Generic ++ 2.0 ++ ++ + + Generic + Rectilinear 10-1000mm f/1.0 --- lensfun-0.2.3.orig/debian/patches/05-lensfun-db-cameras-samsung.dpatch +++ lensfun-0.2.3/debian/patches/05-lensfun-db-cameras-samsung.dpatch @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05-lensfun-db-cameras-samsung.dpatch by Pascal de Bruijn +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add new Samsung camera like GX20 + +@DPATCH@ + +diff -Nur lensfun-0.2.3-orig/data/db/slr-samsung.xml lensfun-0.2.3-samsung/data/db/slr-samsung.xml +--- lensfun-0.2.3-orig/data/db/slr-samsung.xml 2008-05-30 22:48:39.000000000 +0200 ++++ lensfun-0.2.3-samsung/data/db/slr-samsung.xml 2008-12-27 14:00:50.000000000 +0100 +@@ -9,4 +9,13 @@ + 1.5 + + ++ ++ SAMSUNG TECHWIN Co. ++ Samsung ++ SAMSUNG GX20 ++ GX20 ++ Pentax KAF2 ++ 1.5 ++ ++ + --- lensfun-0.2.3.orig/debian/patches/03-lensfun-db-cameras-nikon.dpatch +++ lensfun-0.2.3/debian/patches/03-lensfun-db-cameras-nikon.dpatch @@ -0,0 +1,111 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03-lensfun-db-cameras-nikon.dpatch by Pascal de Bruijn +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add new Nikon cameras like D40, D40X, D60, D80, D90, D700, D3 and D3X + +@DPATCH@ + +diff -Nur lensfun-0.2.3-orig/data/db/slr-nikon.xml lensfun-0.2.3-nikon/data/db/slr-nikon.xml +--- lensfun-0.2.3-orig/data/db/slr-nikon.xml 2008-06-04 20:35:16.000000000 +0200 ++++ lensfun-0.2.3-nikon/data/db/slr-nikon.xml 2008-12-27 14:14:38.000000000 +0100 +@@ -48,6 +48,24 @@ + + NIKON CORPORATION + Nikon ++ NIKON D40 ++ D40 ++ Nikon F AF ++ 1.5 ++ ++ ++ ++ NIKON CORPORATION ++ Nikon ++ NIKON D40X ++ D40X ++ Nikon F AF ++ 1.5 ++ ++ ++ ++ NIKON CORPORATION ++ Nikon + NIKON D50 + D50 + Nikon F AF +@@ -57,6 +75,15 @@ + + NIKON CORPORATION + Nikon ++ NIKON D60 ++ D60 ++ Nikon F AF ++ 1.5 ++ ++ ++ ++ NIKON CORPORATION ++ Nikon + NIKON D70S + D70S + Nikon F AF +@@ -75,6 +102,24 @@ + + NIKON CORPORATION + Nikon ++ NIKON D80 ++ D80 ++ Nikon F AF ++ 1.5 ++ ++ ++ ++ NIKON CORPORATION ++ Nikon ++ NIKON D90 ++ D90 ++ Nikon F AF ++ 1.5 ++ ++ ++ ++ NIKON CORPORATION ++ Nikon + NIKON D100 + D100 + Nikon F AF +@@ -84,6 +129,33 @@ + + NIKON CORPORATION + Nikon ++ NIKON D700 ++ D700 ++ Nikon F ++ 1.0 ++ ++ ++ ++ NIKON CORPORATION ++ Nikon ++ NIKON D3X ++ D3X ++ Nikon F ++ 1.0 ++ ++ ++ ++ NIKON CORPORATION ++ Nikon ++ NIKON D3 ++ D3 ++ Nikon F ++ 1.0 ++ ++ ++ ++ NIKON CORPORATION ++ Nikon + NIKON D2Hs + D2Hs + Nikon F AF --- lensfun-0.2.3.orig/debian/patches/02-lensfun-db-cameras-canon.dpatch +++ lensfun-0.2.3/debian/patches/02-lensfun-db-cameras-canon.dpatch @@ -0,0 +1,56 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02-lensfun-db-cameras-canon.dpatch by Pascal de Bruijn +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add new Canon DSLR cameras like 5DmkII, 50D, and 30D + +@DPATCH@ + +diff -Nur lensfun-0.2.3-orig/data/db/slr-canon.xml lensfun-0.2.3-canon/data/db/slr-canon.xml +--- lensfun-0.2.3-orig/data/db/slr-canon.xml 2008-07-08 01:03:45.000000000 +0200 ++++ lensfun-0.2.3-canon/data/db/slr-canon.xml 2008-12-27 14:00:15.000000000 +0100 +@@ -23,6 +23,14 @@ + + + Canon ++ Canon EOS 5D Mark II ++ EOS 5D Mark II ++ Canon EF ++ 1.0 ++ ++ ++ ++ Canon + Canon EOS-1DS + EOS-1DS + Canon EF +@@ -154,6 +162,14 @@ + + + Canon ++ Canon EOS 50D ++ EOS 50D ++ Canon EF-S ++ 1.6 ++ ++ ++ ++ Canon + Canon EOS 40D + EOS 40D + Canon EF-S +@@ -162,6 +178,14 @@ + + + Canon ++ Canon EOS 30D ++ EOS 30D ++ Canon EF-S ++ 1.6 ++ ++ ++ ++ Canon + Canon EOS 20D + EOS 20D + Canon EF-S --- lensfun-0.2.3.orig/debian/patches/04-lensfun-db-cameras-pentax.dpatch +++ lensfun-0.2.3/debian/patches/04-lensfun-db-cameras-pentax.dpatch @@ -0,0 +1,61 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04-lensfun-db-cameras-pentax.dpatch by Pascal de Bruijn +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add new Pentax cameras like K200 and K20, and fix older entries + +@DPATCH@ + +diff -Nur lensfun-0.2.3-orig/data/db/slr-pentax.xml lensfun-0.2.3-pentax/data/db/slr-pentax.xml +--- lensfun-0.2.3-orig/data/db/slr-pentax.xml 2008-05-30 22:49:28.000000000 +0200 ++++ lensfun-0.2.3-pentax/data/db/slr-pentax.xml 2009-01-14 19:21:19.000000000 +0100 +@@ -93,8 +93,17 @@ + + PENTAX Corporation + Pentax +- PENTAX K100 +- K100 ++ PENTAX K100D ++ K100D ++ Pentax KAF2 ++ 1.5 ++ ++ ++ ++ PENTAX Corporation ++ Pentax ++ PENTAX K100D Super ++ K100D Super + Pentax KAF2 + 1.5 + +@@ -111,8 +120,26 @@ + + PENTAX Corporation + Pentax +- PENTAX K10 +- K10 ++ PENTAX K200D ++ K200D ++ Pentax KAF2 ++ 1.5 ++ ++ ++ ++ PENTAX Corporation ++ Pentax ++ PENTAX K10D ++ K10D ++ Pentax KAF2 ++ 1.5 ++ ++ ++ ++ PENTAX Corporation ++ Pentax ++ PENTAX K20D ++ K20D + Pentax KAF2 + 1.5 + +