[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=f2a247f

The following commit has been merged in the master branch:
commit f2a247fb625bc2b0575ce016b53d20aa853cc3b0
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Jan 2 09:05:37 2015 +0000

    #1012.  Thank you, Thomas, for reporting this a providing the patch.
---
 include/exiv2/http.hpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/include/exiv2/http.hpp b/include/exiv2/http.hpp
index 84cf51a..88c0c33 100644
--- a/include/exiv2/http.hpp
+++ b/include/exiv2/http.hpp
@@ -1,12 +1,10 @@
-#ifndef HTTP_H_
-#define HTTP_H_
+#ifndef HTTP_HPP_
+#define HTTP_HPP_
 
 #include <string>
 #include <map>
 #include <algorithm>
 
-#include <exiv2/exiv2.hpp>
-
 namespace Exiv2 {
     typedef std::map<std::string,std::string> dict_t;
     typedef dict_t::iterator                  dict_i;
@@ -15,5 +13,3 @@ namespace Exiv2 {
 
 }
 #endif
-
-

-- 
exiv2 packaging