File lens_database_pending_update.diff of Package lensfun
diff -Nurpd lensfun-r173/data/db/mil-samsung.xml lensfun-r173-samsung/data/db/mil-samsung.xml
--- lensfun-r173/data/db/mil-samsung.xml 2012-08-21 22:02:06.722590783 +0200
+++ lensfun-r173-samsung/data/db/mil-samsung.xml 2012-08-21 22:17:00.347022018 +0200
@@ -40,6 +40,15 @@ http://en.wikipedia.org/wiki/Mirrorless_
<camera>
<maker>SAMSUNG</maker>
<maker lang="en">Samsung</maker>
+ <model>NX1000</model>
+ <model lang="en">NX1000</model>
+ <mount>Samsung NX</mount>
+ <cropfactor>1.54</cropfactor>
+ </camera>
+
+ <camera>
+ <maker>SAMSUNG</maker>
+ <maker lang="en">Samsung</maker>
<model>NX20</model>
<model lang="en">NX20</model>
<mount>Samsung NX</mount>
@@ -54,6 +63,15 @@ http://en.wikipedia.org/wiki/Mirrorless_
<mount>Samsung NX</mount>
<cropfactor>1.54</cropfactor>
</camera>
+
+ <camera>
+ <maker>SAMSUNG</maker>
+ <maker lang="en">Samsung</maker>
+ <model>NX210</model>
+ <model lang="en">NX210</model>
+ <mount>Samsung NX</mount>
+ <cropfactor>1.54</cropfactor>
+ </camera>
<lens>
<maker>Samsung</maker>
diff -Nurpd lensfun-r173/data/db/mil-canon.xml lensfun-r173-canon/data/db/mil-canon.xml
--- lensfun-r173/data/db/mil-canon.xml 1970-01-01 01:00:00.000000000 +0100
+++ lensfun-r173-canon/data/db/mil-canon.xml 2012-08-22 18:07:17.535855055 +0200
@@ -0,0 +1,19 @@
+<lensdatabase>
+
+ <mount>
+ <name>Canon EF-M</name>
+ <compat>Canon EF-S</compat>
+ <compat>Canon EF</compat>
+ <compat>M42</compat>
+ <compat>Generic</compat>
+ </mount>
+
+ <camera>
+ <maker>Canon</maker>
+ <model>Canon EOS M</model>
+ <model lang="en">EOS M</model>
+ <mount>Canon EF-M</mount>
+ <cropfactor>1.6</cropfactor>
+ </camera>
+
+</lensdatabase>
diff -Nurpd lensfun-r173/data/db/slr-canon.xml lensfun-r173-canon/data/db/slr-canon.xml
--- lensfun-r173/data/db/slr-canon.xml 2012-08-22 18:05:02.931857844 +0200
+++ lensfun-r173-canon/data/db/slr-canon.xml 2012-08-22 18:29:40.427827230 +0200
@@ -112,121 +112,120 @@
<camera>
<maker>Canon</maker>
- <model>Canon EOS DIGITAL REBEL XT</model>
- <model lang="en">EOS Digital Rebel XT</model>
+ <model>Canon EOS 1000D</model>
+ <model lang="en">EOS 1000D</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
<camera>
<maker>Canon</maker>
- <model>Canon EOS DIGITAL REBEL XTi</model>
- <model lang="en">EOS Digital Rebel XTi</model>
+ <model>Canon EOS DIGITAL REBEL XS</model>
+ <model lang="en">EOS Digital Rebel XS</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
<camera>
<maker>Canon</maker>
- <model>Canon EOS DIGITAL REBEL XS</model>
- <model lang="en">EOS Digital Rebel XS</model>
+ <model>Canon EOS Kiss Digital F</model>
+ <model lang="en">EOS Kiss Digital F</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
<camera>
<maker>Canon</maker>
- <model>Canon EOS DIGITAL REBEL XSi</model>
- <model lang="en">EOS Digital Rebel XSi</model>
+ <model>Canon EOS 1100D</model>
+ <model lang="en">EOS 1100D</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
<camera>
<maker>Canon</maker>
- <model>Canon EOS DIGITAL REBEL XTi</model>
- <model lang="en">EOS Digital Rebel XTi</model>
+ <model>Canon EOS REBEL T3</model>
+ <model lang="en">EOS Rebel T3</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
<camera>
<maker>Canon</maker>
- <model>Canon EOS DIGITAL REBEL XS</model>
- <model lang="en">EOS Digital Rebel XS</model>
+ <model>Canon EOS Kiss X50</model>
+ <model lang="en">EOS Kiss X50</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
<camera>
<maker>Canon</maker>
- <model>Canon EOS DIGITAL REBEL T3</model>
- <model lang="en">EOS Digital Rebel T3</model>
+ <model>Canon EOS 300D DIGITAL</model>
+ <model lang="en">EOS 300D</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
<camera>
<maker>Canon</maker>
- <model>Canon EOS DIGITAL REBEL XSi</model>
- <model lang="en">EOS Digital Rebel XSi</model>
+ <model>Canon EOS DIGITAL REBEL</model>
+ <model lang="en">EOS Digital REBEL</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
<camera>
<maker>Canon</maker>
- <model>Canon EOS DIGITAL REBEL</model>
- <model lang="en">EOS Digital Rebel</model>
+ <model>Canon EOS Kiss Digital</model>
+ <model lang="en">EOS Kiss Digital</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
<camera>
<maker>Canon</maker>
- <model>Canon EOS REBEL T1i</model>
- <model lang="en">EOS REBEL T1i</model>
+ <model>Canon EOS 350D DIGITAL</model>
+ <model lang="en">EOS 350D</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
<camera>
<maker>Canon</maker>
- <model>Canon EOS REBEL T1i</model>
- <model lang="en">EOS REBEL T1i</model>
+ <model>Canon EOS DIGITAL REBEL XT</model>
+ <model lang="en">EOS Digital Rebel XT</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
<camera>
<maker>Canon</maker>
- <model>Canon EOS 350D DIGITAL</model>
- <model lang="en">EOS 350D</model>
+ <model>Canon EOS Kiss Digital N</model>
+ <model lang="en">EOS Kiss Digital N</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
<camera>
<maker>Canon</maker>
- <model>Canon EOS 350D</model>
- <model lang="en">EOS 350D</model>
- <variant>*</variant>
+ <model>Canon EOS 400D DIGITAL</model>
+ <model lang="en">EOS 400D</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
<camera>
<maker>Canon</maker>
- <model>Canon EOS 300D DIGITAL</model>
- <model lang="en">EOS 300D</model>
+ <model>Canon EOS DIGITAL REBEL XTi</model>
+ <model lang="en">EOS Digital Rebel XTi</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
<camera>
<maker>Canon</maker>
- <model>Canon EOS 400D DIGITAL</model>
- <model lang="en">EOS 400D</model>
+ <model>Canon EOS Kiss Digital X</model>
+ <model lang="en">EOS Kiss Digital X</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
@@ -241,6 +240,22 @@
<camera>
<maker>Canon</maker>
+ <model>Canon EOS DIGITAL REBEL XSi</model>
+ <model lang="en">EOS Digital Rebel XSi</model>
+ <mount>Canon EF-S</mount>
+ <cropfactor>1.6</cropfactor>
+ </camera>
+
+ <camera>
+ <maker>Canon</maker>
+ <model>Canon EOS Kiss Digital X2</model>
+ <model lang="en">EOS Kiss Digital X2</model>
+ <mount>Canon EF-S</mount>
+ <cropfactor>1.6</cropfactor>
+ </camera>
+
+ <camera>
+ <maker>Canon</maker>
<model>Canon EOS 500D</model>
<model lang="en">EOS 500D</model>
<mount>Canon EF-S</mount>
@@ -249,6 +264,22 @@
<camera>
<maker>Canon</maker>
+ <model>Canon EOS REBEL T1i</model>
+ <model lang="en">EOS Rebel T1i</model>
+ <mount>Canon EF-S</mount>
+ <cropfactor>1.6</cropfactor>
+ </camera>
+
+ <camera>
+ <maker>Canon</maker>
+ <model>Canon EOS Kiss X3</model>
+ <model lang="en">EOS Kiss X3</model>
+ <mount>Canon EF-S</mount>
+ <cropfactor>1.6</cropfactor>
+ </camera>
+
+ <camera>
+ <maker>Canon</maker>
<model>Canon EOS 550D</model>
<model lang="en">EOS 550D</model>
<mount>Canon EF-S</mount>
@@ -257,56 +288,64 @@
<camera>
<maker>Canon</maker>
- <model>Canon EOS 600D</model>
- <model lang="en">EOS 600D</model>
+ <model>Canon EOS REBEL T2i</model>
+ <model lang="en">EOS Rebel T2i</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
<camera>
<maker>Canon</maker>
- <model>Canon EOS 1000D</model>
- <model lang="en">EOS 1000D</model>
+ <model>Canon EOS Kiss X4</model>
+ <model lang="en">EOS Kiss X4</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
<camera>
<maker>Canon</maker>
- <model>Canon EOS 1100D</model>
- <model lang="en">EOS 1100D</model>
+ <model>Canon EOS 600D</model>
+ <model lang="en">EOS 600D</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
<camera>
<maker>Canon</maker>
- <model>Canon EOS Kiss Digital N</model>
- <model lang="en">EOS Kiss Digital N</model>
+ <model>Canon EOS REBEL T3i</model>
+ <model lang="en">EOS Rebel T3i</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
<camera>
<maker>Canon</maker>
- <model>Canon EOS Kiss Digital F</model>
- <model lang="en">EOS Kiss Digital F</model>
+ <model>Canon EOS Kiss X5</model>
+ <model lang="en">EOS Kiss X5</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
<camera>
<maker>Canon</maker>
- <model>Canon EOS Kiss Digital X50</model>
- <model lang="en">EOS Kiss Digital X50</model>
+ <model>Canon EOS 650D</model>
+ <model lang="en">EOS 650D</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
<camera>
<maker>Canon</maker>
- <model>Canon EOS Kiss Digital</model>
- <model lang="en">EOS Kiss Digital</model>
+ <model>Canon EOS REBEL T4i</model>
+ <model lang="en">EOS Rebel T4i</model>
+ <mount>Canon EF-S</mount>
+ <cropfactor>1.6</cropfactor>
+ </camera>
+
+ <camera>
+ <maker>Canon</maker>
+ <model>Canon EOS Kiss X6i</model>
+ <model lang="en">EOS Kiss X6i</model>
<mount>Canon EF-S</mount>
<cropfactor>1.6</cropfactor>
</camera>
@@ -1069,7 +1108,7 @@
<lens>
<maker>Canon</maker>
- <model>Canon EF 35mm f/2.0</model>
+ <model>Canon EF 35mm f/2</model>
<mount>Canon EF</mount>
<cropfactor>1.0</cropfactor>
<calibration>
