[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=b1cbf1d

The following commit has been merged in the master branch:
commit b1cbf1d227791e3690ed757ea6060aaa6ce44a70
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sat Jan 25 06:51:56 2014 +0000

    Use the file fmountlens4t.h for updates to Robert Rottmerhusen's fmountlens list to get the fixed Tokina lens names fixed in r3228 (fix for issue #944).
---
 website/bin/exiv2-nikon-lensupdate.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/website/bin/exiv2-nikon-lensupdate.sh b/website/bin/exiv2-nikon-lensupdate.sh
index 041c878..2c1e15f 100755
--- a/website/bin/exiv2-nikon-lensupdate.sh
+++ b/website/bin/exiv2-nikon-lensupdate.sh
@@ -1,8 +1,8 @@
 #! /bin/sh
 
-wget http://www.rottmerhusen.com/objektives/lensid/files/c-header/fmountlens4.h
+wget http://www.rottmerhusen.com/objektives/lensid/files/c-header/fmountlens4t.h
 
-grep 'List of AF F-Mount lenses - Version .*' fmountlens4.h > /tmp/newversion
+grep 'List of AF F-Mount lenses - Version .*' fmountlens4t.h > /tmp/newversion
 grep 'List of AF F-Mount lenses - Version .*' nikonmn.cpp > /tmp/oldversion
 diff /tmp/oldversion /tmp/newversion
 if [ $? -eq 0 ] ; then
@@ -15,7 +15,7 @@ cat nikonmn.cpp | awk '
     if (!s) {
         s = 1
         print
-        system("cat fmountlens4.h")
+        system("cat fmountlens4t.h")
     }
     else {
         s = 0
@@ -31,4 +31,4 @@ sed 's/struct {unsigned char lid,stps,focs,focl,aps,apl,lfw/static const struct
 ver=`cat /tmp/newversion | awk '{print $9}'`
 echo
 echo "Updated Nikon Lens lookup table to v$ver of Robert Rottmerhusen's fmountlens list."
-rm -f fmountlens4.h /tmp/newversion /tmp/oldversion new-nikonmn.cpp
+rm -f fmountlens4t.h /tmp/newversion /tmp/oldversion new-nikonmn.cpp

-- 
exiv2 packaging