rev 15980 - in kde-extras/lensfun/trunk/debian: . patches
Pascal de Bruijn
pmjdebruijn-guest at alioth.debian.org
Thu Sep 24 16:55:34 UTC 2009
Author: pmjdebruijn-guest
Date: 2009-09-24 16:55:33 +0000 (Thu, 24 Sep 2009)
New Revision: 15980
Added:
kde-extras/lensfun/trunk/debian/patches/90-lensfun-db-update-rel-to-svn65.dpatch
kde-extras/lensfun/trunk/debian/patches/91-lensfun-db-update-svn65-to-pmjdebruijn.dpatch
Removed:
kde-extras/lensfun/trunk/debian/patches/01-lensfun-db-cameras-generic.dpatch
kde-extras/lensfun/trunk/debian/patches/02-lensfun-db-cameras-canon.dpatch
kde-extras/lensfun/trunk/debian/patches/03-lensfun-db-cameras-nikon.dpatch
kde-extras/lensfun/trunk/debian/patches/04-lensfun-db-cameras-pentax.dpatch
kde-extras/lensfun/trunk/debian/patches/05-lensfun-db-cameras-samsung.dpatch
Modified:
kde-extras/lensfun/trunk/debian/changelog
Log:
Added patches from Stefan Potyra to fix build issues with GCC 4.4.
Updated the lensfun database from lensfun svn, and then some.
Modified: kde-extras/lensfun/trunk/debian/changelog
===================================================================
--- kde-extras/lensfun/trunk/debian/changelog 2009-09-24 15:26:21 UTC (rev 15979)
+++ kde-extras/lensfun/trunk/debian/changelog 2009-09-24 16:55:33 UTC (rev 15980)
@@ -1,10 +1,24 @@
lensfun (0.2.3-3) UNRELEASED; urgency=low
+ [ Didier Raboud ]
* In debian/control, write a new common description for the binary packages
(Closes: #522168)
- -- Didier Raboud <didier at raboud.com> Wed, 24 Jun 2009 14:39:16 +0200
+ [ Stefan Potyra ]
+ * Add 10-makedep-fix-ftbfs patch to fix FTBFS.
+ * 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.
+
+ [ Pascal de Bruijn ]
+ * Drop all previous lensfun database patches.
+ * Add 90-lensfun-db-update-rel-to-svn65 patch, to update the lensfun
+ database to revision 65 of lensfun svn.
+ * Add 91-lensfun-db-update-svn65-to-pmjdebruijn patch, to update the
+ lensfun database from revision 65 to pmjdebruijn's local tree.
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Thu, 24 Sep 2009 18:44:52 +0200
+
lensfun (0.2.3-2) unstable; urgency=low
[ Luka Renko ]
Added: kde-extras/lensfun/trunk/debian/patches/90-lensfun-db-update-rel-to-svn65.dpatch
===================================================================
--- kde-extras/lensfun/trunk/debian/patches/90-lensfun-db-update-rel-to-svn65.dpatch (rev 0)
+++ kde-extras/lensfun/trunk/debian/patches/90-lensfun-db-update-rel-to-svn65.dpatch 2009-09-24 16:55:33 UTC (rev 15980)
@@ -0,0 +1,614 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90-lensfun-db-update-rel-to-svn65.dpatch by Pascal de Bruijn <pmjdebruijn at pcode.nl>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Update the lensfun database to Subversion revision 65
+
+ at DPATCH@
+diff -Nurpd lensfun-0.2.3/data/db/compact-canon.xml lensfun-svn65/data/db/compact-canon.xml
+--- lensfun-0.2.3/data/db/compact-canon.xml 2008-05-30 22:57:28.000000000 +0200
++++ lensfun-svn65/data/db/compact-canon.xml 2009-09-22 19:07:20.000000000 +0200
+@@ -56,6 +56,11 @@
+ </mount>
+
+ <mount>
++ <name>canonS5</name>
++ <compat>Generic</compat>
++ </mount>
++
++ <mount>
+ <name>canonA610</name>
+ <compat>Generic</compat>
+ </mount>
+@@ -602,6 +607,14 @@
+
+ <camera>
+ <maker>Canon</maker>
++ <model>Canon PowerShot S5 IS</model>
++ <model lang="en">PowerShot S5 IS</model>
++ <mount>canonS5</mount>
++ <cropfactor>6.0</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>Canon</maker>
+ <model>Canon PowerShot Pro90 IS</model>
+ <model lang="en">PowerShot Pro90 IS</model>
+ <mount>canonPro90</mount>
+@@ -998,4 +1011,38 @@
+ </calibration>
+ </lens>
+
++ <lens>
++ <maker>Canon</maker>
++ <model>Standard</model>
++ <mount>canonS5</mount>
++ <cropfactor>6.0</cropfactor>
++ <calibration>
++ <distortion model="ptlens" focal="6" a="0.019347" b="-0.049194" c="0" />
++ <distortion model="ptlens" focal="6.7" a="0.014225" b="-0.033434" c="0" />
++ <distortion model="ptlens" focal="7.2" a="0.012654" b="-0.028234" c="0" />
++ <distortion model="ptlens" focal="7.6" a="0.011063" b="-0.022491" c="0" />
++ <distortion model="ptlens" focal="9" a="0.007561" b="-0.012771" c="0" />
++ <distortion model="ptlens" focal="11.6" a="0" b="0.004476" c="0" />
++ <distortion model="ptlens" focal="46.3" a="0" b="0" c="0" />
++ <distortion model="ptlens" focal="72" a="0" b="0" c="0" />
++ </calibration>
++ </lens>
++
++ <lens>
++ <maker>Canon</maker>
++ <model>TC-DC58B</model>
++ <mount>canonS5</mount>
++ <cropfactor>6.0</cropfactor>
++ <calibration>
++ <distortion model="ptlens" focal="16.4" a="0" b="0.01755" c="0" />
++ <distortion model="ptlens" focal="20.7" a="0" b="0.01163" c="0" />
++ <distortion model="ptlens" focal="26.8" a="0" b="0.008009" c="0" />
++ <distortion model="ptlens" focal="34.3" a="0" b="0.005827" c="0" />
++ <distortion model="ptlens" focal="40.3" a="0" b="0.003938" c="0" />
++ <distortion model="ptlens" focal="51.8" a="0" b="0.003021" c="0" />
++ <distortion model="ptlens" focal="64.7" a="0" b="0.003778" c="0" />
++ <distortion model="ptlens" focal="72" a="0" b="0.003404" c="0" />
++ </calibration>
++ </lens>
++
+ </lensdatabase>
+diff -Nurpd lensfun-0.2.3/data/db/slr-canon.xml lensfun-svn65/data/db/slr-canon.xml
+--- lensfun-0.2.3/data/db/slr-canon.xml 2008-07-08 01:03:45.000000000 +0200
++++ lensfun-svn65/data/db/slr-canon.xml 2009-09-22 19:07:20.000000000 +0200
+@@ -15,6 +15,14 @@
+
+ <camera>
+ <maker>Canon</maker>
++ <model>Canon EOS 5D Mark II</model>
++ <model lang="en">EOS 5D Mark II</model>
++ <mount>Canon EF</mount>
++ <cropfactor>1.0</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>Canon</maker>
+ <model>Canon EOS 5D</model>
+ <model lang="en">EOS 5D</model>
+ <mount>Canon EF</mount>
+@@ -132,6 +140,14 @@
+ <maker>Canon</maker>
+ <model>Canon EOS 450D DIGITAL</model>
+ <model lang="en">EOS 450D</model>
++ <mount>Canon EF</mount>
++ <cropfactor>1.6</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>Canon</maker>
++ <model>Canon EOS 1000D DIGITAL</model>
++ <model lang="en">EOS 1000D</model>
+ <mount>Canon EF-S</mount>
+ <cropfactor>1.6</cropfactor>
+ </camera>
+@@ -154,6 +170,14 @@
+
+ <camera>
+ <maker>Canon</maker>
++ <model>Canon EOS 50D</model>
++ <model lang="en">EOS 50D</model>
++ <mount>Canon EF-S</mount>
++ <cropfactor>1.6</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>Canon</maker>
+ <model>Canon EOS 40D</model>
+ <model lang="en">EOS 40D</model>
+ <mount>Canon EF-S</mount>
+@@ -162,6 +186,14 @@
+
+ <camera>
+ <maker>Canon</maker>
++ <model>Canon EOS 30D</model>
++ <model lang="en">EOS 30D</model>
++ <mount>Canon EF-S</mount>
++ <cropfactor>1.6</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>Canon</maker>
+ <model>Canon EOS 20D</model>
+ <model lang="en">EOS 20D</model>
+ <mount>Canon EF-S</mount>
+@@ -172,7 +204,7 @@
+ <maker>Canon</maker>
+ <model>Canon EOS 10D</model>
+ <model lang="en">EOS 10D</model>
+- <mount>Canon EF</mount>
++ <mount>Canon EF-S</mount>
+ <cropfactor>1.6</cropfactor>
+ </camera>
+
+@@ -180,7 +212,7 @@
+ <maker>Canon</maker>
+ <model>Canon EOS D60</model>
+ <model lang="en">EOS D60</model>
+- <mount>Canon EF</mount>
++ <mount>Canon EF-S</mount>
+ <cropfactor>1.6</cropfactor>
+ </camera>
+
+@@ -188,7 +220,7 @@
+ <maker>Canon</maker>
+ <model>Canon EOS D30</model>
+ <model lang="en">EOS D30</model>
+- <mount>Canon EF</mount>
++ <mount>Canon EF-S</mount>
+ <cropfactor>1.6</cropfactor>
+ </camera>
+
+@@ -794,7 +826,17 @@
+
+ <lens>
+ <maker>Canon</maker>
+- <model>Canon EF 50mm f/1.8 I and II</model>
++ <model>Canon EF 50mm f/1.8</model>
++ <mount>Canon EF</mount>
++ <cropfactor>1.3</cropfactor>
++ <calibration>
++ <distortion model="ptlens" focal="50" a="-0.00016" b="-0.003951" c="0" />
++ </calibration>
++ </lens>
++
++ <lens>
++ <maker>Canon</maker>
++ <model>Canon EF 50mm f/1.8 MkII</model>
+ <mount>Canon EF</mount>
+ <cropfactor>1.3</cropfactor>
+ <calibration>
+diff -Nurpd lensfun-0.2.3/data/db/slr-nikon.xml lensfun-svn65/data/db/slr-nikon.xml
+--- lensfun-0.2.3/data/db/slr-nikon.xml 2008-06-04 20:35:16.000000000 +0200
++++ lensfun-svn65/data/db/slr-nikon.xml 2009-09-22 19:07:20.000000000 +0200
+@@ -39,8 +39,17 @@
+ <camera>
+ <maker>NIKON CORPORATION</maker>
+ <maker lang="en">Nikon</maker>
+- <model>NIKON D200</model>
+- <model lang="en">D200</model>
++ <model>NIKON D40</model>
++ <model lang="en">D40</model>
++ <mount>Nikon F AF</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>NIKON CORPORATION</maker>
++ <maker lang="en">Nikon</maker>
++ <model>NIKON D40X</model>
++ <model lang="en">D40X</model>
+ <mount>Nikon F AF</mount>
+ <cropfactor>1.5</cropfactor>
+ </camera>
+@@ -57,8 +66,8 @@
+ <camera>
+ <maker>NIKON CORPORATION</maker>
+ <maker lang="en">Nikon</maker>
+- <model>NIKON D70S</model>
+- <model lang="en">D70S</model>
++ <model>NIKON D60</model>
++ <model lang="en">D60</model>
+ <mount>Nikon F AF</mount>
+ <cropfactor>1.5</cropfactor>
+ </camera>
+@@ -75,6 +84,33 @@
+ <camera>
+ <maker>NIKON CORPORATION</maker>
+ <maker lang="en">Nikon</maker>
++ <model>NIKON D70s</model>
++ <model lang="en">D70s</model>
++ <mount>Nikon F AF</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>NIKON CORPORATION</maker>
++ <maker lang="en">Nikon</maker>
++ <model>NIKON D80</model>
++ <model lang="en">D80</model>
++ <mount>Nikon F AF</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>NIKON CORPORATION</maker>
++ <maker lang="en">Nikon</maker>
++ <model>NIKON D90</model>
++ <model lang="en">D90</model>
++ <mount>Nikon F AF</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>NIKON CORPORATION</maker>
++ <maker lang="en">Nikon</maker>
+ <model>NIKON D100</model>
+ <model lang="en">D100</model>
+ <mount>Nikon F AF</mount>
+@@ -84,8 +120,8 @@
+ <camera>
+ <maker>NIKON CORPORATION</maker>
+ <maker lang="en">Nikon</maker>
+- <model>NIKON D2Hs</model>
+- <model lang="en">D2Hs</model>
++ <model>NIKON D200</model>
++ <model lang="en">D200</model>
+ <mount>Nikon F AF</mount>
+ <cropfactor>1.5</cropfactor>
+ </camera>
+@@ -93,8 +129,53 @@
+ <camera>
+ <maker>NIKON CORPORATION</maker>
+ <maker lang="en">Nikon</maker>
+- <model>NIKON D2H</model>
+- <model lang="en">D2H</model>
++ <model>NIKON D300</model>
++ <model lang="en">D300</model>
++ <mount>Nikon F AF</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>NIKON CORPORATION</maker>
++ <maker lang="en">Nikon</maker>
++ <model>NIKON D300s</model>
++ <model lang="en">D300s</model>
++ <mount>Nikon F AF</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>NIKON CORPORATION</maker>
++ <maker lang="en">Nikon</maker>
++ <model>NIKON D700</model>
++ <model lang="en">D700</model>
++ <mount>Nikon F AF</mount>
++ <cropfactor>1.0</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>NIKON CORPORATION</maker>
++ <maker lang="en">Nikon</maker>
++ <model>NIKON D3000</model>
++ <model lang="en">D3000</model>
++ <mount>Nikon F AF</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>NIKON CORPORATION</maker>
++ <maker lang="en">Nikon</maker>
++ <model>NIKON D5000</model>
++ <model lang="en">D5000</model>
++ <mount>Nikon F AF</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>NIKON CORPORATION</maker>
++ <maker lang="en">Nikon</maker>
++ <model>NIKON D1</model>
++ <model lang="en">D1</model>
+ <mount>Nikon F AF</mount>
+ <cropfactor>1.5</cropfactor>
+ </camera>
+@@ -111,6 +192,33 @@
+ <camera>
+ <maker>NIKON CORPORATION</maker>
+ <maker lang="en">Nikon</maker>
++ <model>NIKON D1X</model>
++ <model lang="en">D1X</model>
++ <mount>Nikon F AF</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>NIKON CORPORATION</maker>
++ <maker lang="en">Nikon</maker>
++ <model>NIKON D2H</model>
++ <model lang="en">D2H</model>
++ <mount>Nikon F AF</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>NIKON CORPORATION</maker>
++ <maker lang="en">Nikon</maker>
++ <model>NIKON D2Hs</model>
++ <model lang="en">D2Hs</model>
++ <mount>Nikon F AF</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>NIKON CORPORATION</maker>
++ <maker lang="en">Nikon</maker>
+ <model>NIKON D2X</model>
+ <model lang="en">D2X</model>
+ <mount>Nikon F AF</mount>
+@@ -120,8 +228,8 @@
+ <camera>
+ <maker>NIKON CORPORATION</maker>
+ <maker lang="en">Nikon</maker>
+- <model>NIKON D1X</model>
+- <model lang="en">D1X</model>
++ <model>NIKON D2Xs</model>
++ <model lang="en">D2Xs</model>
+ <mount>Nikon F AF</mount>
+ <cropfactor>1.5</cropfactor>
+ </camera>
+@@ -129,17 +237,26 @@
+ <camera>
+ <maker>NIKON CORPORATION</maker>
+ <maker lang="en">Nikon</maker>
+- <model>NIKON D1</model>
+- <model lang="en">D1</model>
++ <model>NIKON D3</model>
++ <model lang="en">D3</model>
+ <mount>Nikon F AF</mount>
+- <cropfactor>1.5</cropfactor>
++ <cropfactor>1.0</cropfactor>
+ </camera>
+
+ <camera>
+ <maker>NIKON CORPORATION</maker>
+ <maker lang="en">Nikon</maker>
+- <model>NIKON D300</model>
+- <model lang="en">D300</model>
++ <model>NIKON D3X</model>
++ <model lang="en">D3X</model>
++ <mount>Nikon F AF</mount>
++ <cropfactor>1.0</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>FUJIFILM</maker>
++ <maker lang="en">Fujifilm</maker>
++ <model>FinePix S5Pro</model>
++ <model lang="en">FinePix S5 Pro</model>
+ <mount>Nikon F AF</mount>
+ <cropfactor>1.5</cropfactor>
+ </camera>
+@@ -284,6 +401,23 @@
+
+ <lens>
+ <maker>Nikon</maker>
++ <model>Nikkor 18-55mm f/3.5-5.6G AF-S DX VR</model>
++ <mount>Nikon F AF</mount>
++ <cropfactor>1.5</cropfactor>
++ <calibration>
++ <distortion model="ptlens" focal="18" a="0.000658776" b="-0.0150048" c="-0.00123339" />
++ <distortion model="ptlens" focal="20" a="0.0154927" b="-0.0685976" c="0.0638405" />
++ <distortion model="ptlens" focal="22" a="0.00163489" b="-0.0157578" c="0.0044202" />
++ <distortion model="ptlens" focal="24" a="0.0238367" b="-0.102409" c="0.124563" />
++ <distortion model="ptlens" focal="29" a="-5.82382e-05" b="0.0021913" c="-0.0142704" />
++ <distortion model="ptlens" focal="35" a="0.00346406" b="-0.0126111" c="0.013148" />
++ <distortion model="ptlens" focal="45" a="-0.000340008" b="-0.000412014" c="0.00561741" />
++ <distortion model="ptlens" focal="55" a="-0.000340008" b="-0.000412014" c="0.00561741" />
++ </calibration>
++ </lens>
++
++ <lens>
++ <maker>Nikon</maker>
+ <model>Nikkor 18-70mm f/3.5-4.5G ED-IF AF-S DX</model>
+ <mount>Nikon F AF</mount>
+ <cropfactor>1.5</cropfactor>
+@@ -602,7 +736,7 @@
+ <mount>Nikon F AF</mount>
+ <cropfactor>1.5</cropfactor>
+ <calibration>
+- <distortion model="ptlens" focal="24" a="0.004425" b="-0.013025" c="0" />
++ <distortion model="ptlens" focal="24" a="0.00112" b="-0.00753" c="-0.00379" />
+ </calibration>
+ </lens>
+
+@@ -796,4 +930,22 @@
+ </calibration>
+ </lens>
+
++
++ <lens>
++ <maker>Nikon</maker>
++ <model>Nikkor 16-85mm f/3.5-5.6G AF-S ED VR DX</model>
++ <mount>Nikon F AF</mount>
++ <cropfactor>1.5</cropfactor>
++ <calibration>
++ <distortion model="ptlens" focal="16" a="0.0199837" b="-0.0681903" c="0.0388181" />
++ <distortion model="ptlens" focal="18" a="0.0101226" b="-0.0323001" c="0.00392398" />
++ <distortion model="ptlens" focal="20" a="0.00337762" b="-0.0059244" c="-0.0160513" />
++ <distortion model="ptlens" focal="22" a="-0.00565925" b="0.0323698" c="-0.0738213" />
++ <distortion model="ptlens" focal="24" a="0.00498966" b="-0.0163608" c="0.011626" />
++ <distortion model="ptlens" focal="35" a="0.00452151" b="-0.0101545" c="0.00874731" />
++ <distortion model="ptlens" focal="50" a="0.00822439" b="-0.0246265" c="0.0257984" />
++ <distortion model="ptlens" focal="85" a="-0.00473509" b="0.0253574" c="-0.0342333" />
++ </calibration>
++ </lens>
++
+ </lensdatabase>
+diff -Nurpd lensfun-0.2.3/data/db/slr-samsung.xml lensfun-svn65/data/db/slr-samsung.xml
+--- lensfun-0.2.3/data/db/slr-samsung.xml 2008-05-30 22:48:39.000000000 +0200
++++ lensfun-svn65/data/db/slr-samsung.xml 2009-09-22 19:07:20.000000000 +0200
+@@ -9,4 +9,13 @@
+ <cropfactor>1.5</cropfactor>
+ </camera>
+
++ <camera>
++ <maker>SAMSUNG</maker>
++ <maker lang="en">Samsung</maker>
++ <model>GX20</model>
++ <model lang="en">GX20</model>
++ <mount>Pentax KAF2</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
+ </lensdatabase>
+diff -Nurpd lensfun-0.2.3/data/db/slr-sigma.xml lensfun-svn65/data/db/slr-sigma.xml
+--- lensfun-0.2.3/data/db/slr-sigma.xml 2008-07-21 23:56:52.000000000 +0200
++++ lensfun-svn65/data/db/slr-sigma.xml 2009-09-22 19:07:20.000000000 +0200
+@@ -184,7 +184,7 @@
+
+ <lens>
+ <maker>Sigma</maker>
+- <model>Sigma 18-125mm f/3.3-5.6 (3.5-5.6) DC</model>
++ <model>Sigma 18-125mm f/3.5-5.6 (3.3-5.6) DC</model>
+ <mount>Sigma</mount>
+ <mount>Canon EF</mount>
+ <mount>Nikon F AF</mount>
+@@ -205,7 +205,7 @@
+
+ <lens>
+ <maker>Sigma</maker>
+- <model>Sigma 18-125mm f/3.3-5.6 (3.5-5.6) DC</model>
++ <model>Sigma 18-125mm f/3.5-5.6 (3.3-5.6) DC</model>
+ <mount>Sigma</mount>
+ <mount>Canon EF</mount>
+ <mount>Nikon F AF</mount>
+diff -Nurpd lensfun-0.2.3/data/db/slr-tamron.xml lensfun-svn65/data/db/slr-tamron.xml
+--- lensfun-0.2.3/data/db/slr-tamron.xml 2007-11-04 00:52:24.000000000 +0100
++++ lensfun-svn65/data/db/slr-tamron.xml 2009-09-22 19:07:20.000000000 +0200
+@@ -4,7 +4,7 @@
+ <maker>Tamron</maker>
+ <model>Tamron 17-35mm f/2.8-4 Di LD</model>
+ <mount>Canon EF</mount>
+- <mount>Nikon F FA</mount>
++ <mount>Nikon F AF</mount>
+ <mount>Pentax KAF</mount>
+ <cropfactor>1.0</cropfactor>
+ <calibration>
+@@ -28,7 +28,7 @@
+ <maker>Tamron</maker>
+ <model>Tamron 18-200mm f/3.5-6.3 XR Di II LD</model>
+ <mount>Canon EF</mount>
+- <mount>Nikon F FA</mount>
++ <mount>Nikon F AF</mount>
+ <mount>Pentax KAF</mount>
+ <mount>Sony Alpha</mount>
+ <cropfactor>1.5</cropfactor>
+@@ -49,7 +49,7 @@
+ <maker>Tamron</maker>
+ <model>Tamron 18-200mm f/3.5-6.3 XR Di II LD</model>
+ <mount>Canon EF</mount>
+- <mount>Nikon F FA</mount>
++ <mount>Nikon F AF</mount>
+ <mount>Pentax KAF</mount>
+ <mount>Sony Alpha</mount>
+ <cropfactor>1.6</cropfactor>
+@@ -71,7 +71,7 @@
+ <maker>Tamron</maker>
+ <model>Tamron 19-35mm f/3.5-4.5</model>
+ <mount>Canon EF</mount>
+- <mount>Nikon F FA</mount>
++ <mount>Nikon F AF</mount>
+ <mount>Pentax KAF</mount>
+ <cropfactor>1.6</cropfactor>
+ <calibration>
+@@ -86,7 +86,7 @@
+ <maker>Tamron</maker>
+ <model>Tamron 24-135mm f/3.5-5.6 SP AD</model>
+ <mount>Canon EF</mount>
+- <mount>Nikon F FA</mount>
++ <mount>Nikon F AF</mount>
+ <mount>Pentax KAF</mount>
+ <cropfactor>1.6</cropfactor>
+ <calibration>
+@@ -107,7 +107,7 @@
+ <maker>Tamron</maker>
+ <model>Tamron 28-75mm f/2.8 XR Di</model>
+ <mount>Canon EF</mount>
+- <mount>Nikon F FA</mount>
++ <mount>Nikon F AF</mount>
+ <mount>Pentax KAF</mount>
+ <mount>Sony Alpha</mount>
+ <cropfactor>1.0</cropfactor>
+@@ -125,7 +125,7 @@
+ <maker>Tamron</maker>
+ <model>Tamron 28-105mm f/2.8 SP LD IF</model>
+ <mount>Canon EF</mount>
+- <mount>Nikon F FA</mount>
++ <mount>Nikon F AF</mount>
+ <mount>Pentax KAF</mount>
+ <cropfactor>1.0</cropfactor>
+ <calibration>
+@@ -145,7 +145,7 @@
+ <maker>Tamron</maker>
+ <model>Tamron 28-300mm f/3.5-6.3 XR Di LD</model>
+ <mount>Canon EF</mount>
+- <mount>Nikon F FA</mount>
++ <mount>Nikon F AF</mount>
+ <mount>Pentax KAF</mount>
+ <mount>Sony Alpha</mount>
+ <cropfactor>1.5</cropfactor>
+diff -Nurpd lensfun-0.2.3/data/db/slr-tokina.xml lensfun-svn65/data/db/slr-tokina.xml
+--- lensfun-0.2.3/data/db/slr-tokina.xml 2007-11-04 00:52:24.000000000 +0100
++++ lensfun-svn65/data/db/slr-tokina.xml 2009-09-22 19:07:20.000000000 +0200
+@@ -4,7 +4,7 @@
+ <maker>Tokina</maker>
+ <model>Tokina 12-24mm f/4 AT-X 124 AF PRO DX</model>
+ <mount>Canon EF</mount>
+- <mount>Nikon FA</mount>
++ <mount>Nikon AF</mount>
+ <cropfactor>1.5</cropfactor>
+ <calibration>
+ <distortion model="ptlens" focal="12" a="-0.005227" b="0.0018" c="0" />
+@@ -21,7 +21,7 @@
+ <maker>Tokina</maker>
+ <model>Tokina 19-35mm f/3.5-4.5 AF 193</model>
+ <mount>Canon EF</mount>
+- <mount>Nikon FA</mount>
++ <mount>Nikon AF</mount>
+ <cropfactor>1.6</cropfactor>
+ <calibration>
+ <distortion model="ptlens" focal="19" a="0" b="-0.005476" c="-0.022162" />
+@@ -39,7 +39,7 @@
+ <maker>Tokina</maker>
+ <model>Tokina 28-70mm f/2.8 AT-X 287 PRO SV</model>
+ <mount>Canon EF</mount>
+- <mount>Nikon FA</mount>
++ <mount>Nikon AF</mount>
+ <mount>Pentax KAF</mount>
+ <cropfactor>1.6</cropfactor>
+ <calibration>
+@@ -56,7 +56,7 @@
+ <maker>Tokina</maker>
+ <model>Tokina 17mm f/3.5 AT-X AF PRO</model>
+ <mount>Canon EF</mount>
+- <mount>Nikon FA</mount>
++ <mount>Nikon AF</mount>
+ <cropfactor>1.5</cropfactor>
+ <calibration>
+ <distortion model="ptlens" focal="17" a="0" b="-0.012125" c="0" />
+@@ -67,7 +67,7 @@
+ <maker>Tokina</maker>
+ <model>Tokina 17mm f/3.5 AT-X AF PRO</model>
+ <mount>Canon EF</mount>
+- <mount>Nikon FA</mount>
++ <mount>Nikon AF</mount>
+ <cropfactor>1.6</cropfactor>
+ <calibration>
+ <distortion model="ptlens" focal="17" a="0" b="-0.004083" c="-0.015672" />
Added: kde-extras/lensfun/trunk/debian/patches/91-lensfun-db-update-svn65-to-pmjdebruijn.dpatch
===================================================================
--- kde-extras/lensfun/trunk/debian/patches/91-lensfun-db-update-svn65-to-pmjdebruijn.dpatch (rev 0)
+++ kde-extras/lensfun/trunk/debian/patches/91-lensfun-db-update-svn65-to-pmjdebruijn.dpatch 2009-09-24 16:55:33 UTC (rev 15980)
@@ -0,0 +1,372 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 91-lensfun-db-update-svn65-to-pmjdebruijn.dpatch by Pascal de Bruijn <pmjdebruijn at pcode.nl>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Update the lensfun database from Subversion revision 65 to my private database
+
+ at DPATCH@
+diff -Nurpd lensfun-svn65/data/db/generic.xml lensfun-svn65-pmjdebruijn/data/db/generic.xml
+--- lensfun-svn65/data/db/generic.xml 2009-09-22 19:07:20.000000000 +0200
++++ lensfun-svn65-pmjdebruijn/data/db/generic.xml 2009-09-23 18:42:10.000000000 +0200
+@@ -32,7 +32,7 @@
+
+ <camera>
+ <maker>Generic</maker>
+- <model>Crop-factor 1.0</model>
++ <model>Crop-factor 1.0 (Full Frame)</model>
+ <mount>Generic</mount>
+ <cropfactor>1.0</cropfactor>
+ </camera>
+@@ -46,14 +46,21 @@
+
+ <camera>
+ <maker>Generic</maker>
+- <model>Crop-factor 1.5</model>
++ <model>Crop-factor 1.3 (APS-H)</model>
++ <mount>Generic</mount>
++ <cropfactor>1.3</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>Generic</maker>
++ <model>Crop-factor 1.5 (APS-C)</model>
+ <mount>Generic</mount>
+ <cropfactor>1.5</cropfactor>
+ </camera>
+
+ <camera>
+ <maker>Generic</maker>
+- <model>Crop-factor 1.6</model>
++ <model>Crop-factor 1.6 (APS-C)</model>
+ <mount>Generic</mount>
+ <cropfactor>1.6</cropfactor>
+ </camera>
+@@ -65,6 +72,13 @@
+ <cropfactor>1.7</cropfactor>
+ </camera>
+
++ <camera>
++ <maker>Generic</maker>
++ <model>Crop-factor 2.0 (Four-Thirds)</model>
++ <mount>Generic</mount>
++ <cropfactor>2.0</cropfactor>
++ </camera>
++
+ <lens>
+ <maker>Generic</maker>
+ <model>Rectilinear 10-1000mm f/1.0</model>
+diff -Nurpd lensfun-svn65/data/db/slr-canon.xml lensfun-svn65-pmjdebruijn/data/db/slr-canon.xml
+--- lensfun-svn65/data/db/slr-canon.xml 2009-09-22 19:07:20.000000000 +0200
++++ lensfun-svn65-pmjdebruijn/data/db/slr-canon.xml 2009-09-23 18:30:13.000000000 +0200
+@@ -138,7 +138,7 @@
+
+ <camera>
+ <maker>Canon</maker>
+- <model>Canon EOS 450D DIGITAL</model>
++ <model>Canon EOS 450D</model>
+ <model lang="en">EOS 450D</model>
+ <mount>Canon EF</mount>
+ <cropfactor>1.6</cropfactor>
+@@ -146,6 +146,14 @@
+
+ <camera>
+ <maker>Canon</maker>
++ <model>Canon EOS 500D</model>
++ <model lang="en">EOS 500D</model>
++ <mount>Canon EF</mount>
++ <cropfactor>1.6</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>Canon</maker>
+ <model>Canon EOS 1000D DIGITAL</model>
+ <model lang="en">EOS 1000D</model>
+ <mount>Canon EF-S</mount>
+@@ -170,7 +178,7 @@
+
+ <camera>
+ <maker>Canon</maker>
+- <model>Canon EOS 50D</model>
++ <model>EOS 50D</model>
+ <model lang="en">EOS 50D</model>
+ <mount>Canon EF-S</mount>
+ <cropfactor>1.6</cropfactor>
+diff -Nurpd lensfun-svn65/data/db/slr-olympus.xml lensfun-svn65-pmjdebruijn/data/db/slr-olympus.xml
+--- lensfun-svn65/data/db/slr-olympus.xml 2009-09-22 19:07:20.000000000 +0200
++++ lensfun-svn65-pmjdebruijn/data/db/slr-olympus.xml 2009-09-23 18:41:25.000000000 +0200
+@@ -14,6 +14,38 @@
+ <camera>
+ <maker>OLYMPUS IMAGING CORP.</maker>
+ <maker lang="en">Olympus</maker>
++ <model>E-400</model>
++ <mount>4/3 System</mount>
++ <cropfactor>2.0</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>OLYMPUS IMAGING CORP.</maker>
++ <maker lang="en">Olympus</maker>
++ <model>E-410</model>
++ <mount>4/3 System</mount>
++ <cropfactor>2.0</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>OLYMPUS IMAGING CORP.</maker>
++ <maker lang="en">Olympus</maker>
++ <model>E-420</model>
++ <mount>4/3 System</mount>
++ <cropfactor>2.0</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>OLYMPUS IMAGING CORP.</maker>
++ <maker lang="en">Olympus</maker>
++ <model>E-450</model>
++ <mount>4/3 System</mount>
++ <cropfactor>2.0</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>OLYMPUS IMAGING CORP.</maker>
++ <maker lang="en">Olympus</maker>
+ <model>E-500</model>
+ <mount>4/3 System</mount>
+ <cropfactor>2.0</cropfactor>
+@@ -22,6 +54,30 @@
+ <camera>
+ <maker>OLYMPUS IMAGING CORP.</maker>
+ <maker lang="en">Olympus</maker>
++ <model>E-510</model>
++ <mount>4/3 System</mount>
++ <cropfactor>2.0</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>OLYMPUS IMAGING CORP.</maker>
++ <maker lang="en">Olympus</maker>
++ <model>E-520</model>
++ <mount>4/3 System</mount>
++ <cropfactor>2.0</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>OLYMPUS IMAGING CORP.</maker>
++ <maker lang="en">Olympus</maker>
++ <model>E-620</model>
++ <mount>4/3 System</mount>
++ <cropfactor>2.0</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>OLYMPUS IMAGING CORP.</maker>
++ <maker lang="en">Olympus</maker>
+ <model>E-330</model>
+ <mount>4/3 System</mount>
+ <cropfactor>2.0</cropfactor>
+diff -Nurpd lensfun-svn65/data/db/slr-pentax.xml lensfun-svn65-pmjdebruijn/data/db/slr-pentax.xml
+--- lensfun-svn65/data/db/slr-pentax.xml 2009-09-22 19:07:20.000000000 +0200
++++ lensfun-svn65-pmjdebruijn/data/db/slr-pentax.xml 2009-09-23 18:28:09.000000000 +0200
+@@ -91,6 +91,15 @@
+ </camera>
+
+ <camera>
++ <maker>PENTAX</maker>
++ <maker lang="en">Pentax</maker>
++ <model>PENTAX K-m</model>
++ <model lang="en">K-m</model>
++ <mount>Pentax KAF2</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
+ <maker>PENTAX Corporation</maker>
+ <maker lang="en">Pentax</maker>
+ <model>PENTAX K100</model>
+@@ -102,6 +111,15 @@
+ <camera>
+ <maker>PENTAX Corporation</maker>
+ <maker lang="en">Pentax</maker>
++ <model>PENTAX K100D Super</model>
++ <model lang="en">K100D Super</model>
++ <mount>Pentax KAF2</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>PENTAX Corporation</maker>
++ <maker lang="en">Pentax</maker>
+ <model>PENTAX K110</model>
+ <model lang="en">K110</model>
+ <mount>Pentax KAF2</mount>
+@@ -111,12 +129,40 @@
+ <camera>
+ <maker>PENTAX Corporation</maker>
+ <maker lang="en">Pentax</maker>
+- <model>PENTAX K10</model>
+- <model lang="en">K10</model>
++ <model>PENTAX K200D</model>
++ <model lang="en">K200D</model>
++ <mount>Pentax KAF2</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>PENTAX Corporation</maker>
++ <maker lang="en">Pentax</maker>
++ <model>PENTAX K10D</model>
++ <model lang="en">K10D</model>
+ <mount>Pentax KAF2</mount>
+ <cropfactor>1.5</cropfactor>
+ </camera>
+
++ <camera>
++ <maker>PENTAX Corporation</maker>
++ <maker lang="en">Pentax</maker>
++ <model>PENTAX K20D</model>
++ <model lang="en">K20D</model>
++ <mount>Pentax KAF2</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>PENTAX</maker>
++ <maker lang="en">Pentax</maker>
++ <model>PENTAX K-7</model>
++ <model lang="en">K-7</model>
++ <mount>Pentax KAF2</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++
+ <lens>
+ <maker>Pentax</maker>
+ <model>SMC Pentax DA 16-45mm f/4.0 ED AL</model>
+diff -Nurpd lensfun-svn65/data/db/slr-samsung.xml lensfun-svn65-pmjdebruijn/data/db/slr-samsung.xml
+--- lensfun-svn65/data/db/slr-samsung.xml 2009-09-22 19:07:20.000000000 +0200
++++ lensfun-svn65-pmjdebruijn/data/db/slr-samsung.xml 2009-09-23 18:30:25.000000000 +0200
+@@ -10,7 +10,7 @@
+ </camera>
+
+ <camera>
+- <maker>SAMSUNG</maker>
++ <maker>SAMSUNG TECHWIN Co.</maker>
+ <maker lang="en">Samsung</maker>
+ <model>GX20</model>
+ <model lang="en">GX20</model>
+diff -Nurpd lensfun-svn65/data/db/slr-sony.xml lensfun-svn65-pmjdebruijn/data/db/slr-sony.xml
+--- lensfun-svn65/data/db/slr-sony.xml 2009-09-22 19:07:20.000000000 +0200
++++ lensfun-svn65-pmjdebruijn/data/db/slr-sony.xml 2009-09-23 18:36:00.000000000 +0200
+@@ -7,4 +7,112 @@
+ <compat>Generic</compat>
+ </mount>
+
++ <camera>
++ <maker>SONY</maker>
++ <maker lang="en">Sony</maker>
++ <model>DSLR-A100</model>
++ <model lang="en">Alpha 100</model>
++ <mount>Sony Alpha</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>SONY</maker>
++ <maker lang="en">Sony</maker>
++ <model>DSLR-A200</model>
++ <model lang="en">Alpha 200</model>
++ <mount>Sony Alpha</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>SONY</maker>
++ <maker lang="en">Sony</maker>
++ <model>DSLR-A230</model>
++ <model lang="en">Alpha 230</model>
++ <mount>Sony Alpha</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>SONY</maker>
++ <maker lang="en">Sony</maker>
++ <model>DSLR-A300</model>
++ <model lang="en">Alpha 300</model>
++ <mount>Sony Alpha</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>SONY</maker>
++ <maker lang="en">Sony</maker>
++ <model>DSLR-A330</model>
++ <model lang="en">Alpha 330</model>
++ <mount>Sony Alpha</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>SONY</maker>
++ <maker lang="en">Sony</maker>
++ <model>DSLR-A350</model>
++ <model lang="en">Alpha 350</model>
++ <mount>Sony Alpha</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>SONY</maker>
++ <maker lang="en">Sony</maker>
++ <model>DSLR-A380</model>
++ <model lang="en">Alpha 380</model>
++ <mount>Sony Alpha</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>SONY</maker>
++ <maker lang="en">Sony</maker>
++ <model>DSLR-A500</model>
++ <model lang="en">Alpha 500</model>
++ <mount>Sony Alpha</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>SONY</maker>
++ <maker lang="en">Sony</maker>
++ <model>DSLR-A550</model>
++ <model lang="en">Alpha 550</model>
++ <mount>Sony Alpha</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>SONY</maker>
++ <maker lang="en">Sony</maker>
++ <model>DSLR-A700</model>
++ <model lang="en">Alpha 700</model>
++ <mount>Sony Alpha</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>SONY</maker>
++ <maker lang="en">Sony</maker>
++ <model>DSLR-A850</model>
++ <model lang="en">Alpha 850</model>
++ <mount>Sony Alpha</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
++ <camera>
++ <maker>SONY</maker>
++ <maker lang="en">Sony</maker>
++ <model>DSLR-A900</model>
++ <model lang="en">Alpha 900</model>
++ <mount>Sony Alpha</mount>
++ <cropfactor>1.5</cropfactor>
++ </camera>
++
+ </lensdatabase>
More information about the pkg-kde-commits
mailing list