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

The following commit has been merged in the master branch:
commit d578504e0c0bc73489954c93b9c37f1f5acdf5d2
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon May 1 16:35:19 2006 +0000

    Added pkg-config metadata file exiv2.pc, removed <prefix>/include/exiv2 path from exiv2-config output. The exiv2-config script is now deprecated, use pkg-config instead. Fixes bug #458.
---
 config/Makefile        |  2 +-
 config/configure.ac    |  1 +
 config/exiv2-config.in |  2 +-
 config/exiv2.pc.in     | 11 +++++++++++
 src/Makefile           |  4 ++++
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/config/Makefile b/config/Makefile
index c4b9bb7..b073117 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -26,7 +26,7 @@ mostlyclean clean:
 	rm -f *~ *.bak *#
 
 distclean: clean
-	rm -f config.h ../src/exv_conf.h config.mk exiv2-config
+	rm -f config.h ../src/exv_conf.h config.mk exiv2-config exiv2.pc
 
 # This removes almost everything, including the configure script!
 maintainer-clean: distclean
diff --git a/config/configure.ac b/config/configure.ac
index 2142dad..c68d097 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -60,4 +60,5 @@ AC_SUBST(DEP_TRACKING,$DEP_TRACKING)
 
 AC_CONFIG_FILES([./config/config.mk])
 AC_CONFIG_FILES([./config/exiv2-config], [chmod +x ./config/exiv2-config])
+AC_CONFIG_FILES([./config/exiv2.pc])
 AC_OUTPUT
diff --git a/config/exiv2-config.in b/config/exiv2-config.in
index 4122655..aca4831 100644
--- a/config/exiv2-config.in
+++ b/config/exiv2-config.in
@@ -71,7 +71,7 @@ while test $# -gt 0; do
 	;;
 
     --cflags)
-       	echo -I$includedir -I$includedir/exiv2
+       	echo -I$includedir
        	;;
 
     --libtool-libs)
diff --git a/config/exiv2.pc.in b/config/exiv2.pc.in
new file mode 100644
index 0000000..16c388d
--- /dev/null
+++ b/config/exiv2.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: exiv2
+Description: Exif and IPTC metadata library and tools
+Version: @PACKAGE_VERSION@
+URL: http://www.exiv2.org
+Libs: -L${libdir} -lexiv2
+Cflags: -I${includedir}
diff --git a/src/Makefile b/src/Makefile
index 3aadbe7..61f479c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -270,6 +270,8 @@ install-lib: lib install-header
 	@$(LIBTOOL) --mode=install $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)
 	$(INSTALL_DIRS) $(DESTDIR)$(bindir)
 	$(INSTALL_PROGRAM) $(top_srcdir)/config/exiv2-config $(DESTDIR)$(bindir)/exiv2-config
+	$(INSTALL_DIRS) $(DESTDIR)$(libdir)/pkgconfig
+	$(INSTALL_DATA) $(top_srcdir)/config/exiv2.pc $(DESTDIR)$(libdir)/pkgconfig/exiv2.pc
 
 install: $(EXIV2BIN) install-lib
 	$(INSTALL_DIRS) $(DESTDIR)$(bindir)
@@ -286,6 +288,8 @@ uninstall-header:
 	-rmdir $(DESTDIR)$(incdir)
 
 uninstall-lib: uninstall-header
+	$(RM) $(DESTDIR)$(libdir)/pkgconfig/exiv2.pc
+	-rmdir $(DESTDIR)$(libdir)/pkgconfig
 	$(RM) $(DESTDIR)$(bindir)/exiv2-config
 	-rmdir $(DESTDIR)$(bindir)
 	@$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(LIBRARY)

-- 
exiv2 packaging