[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=2a37de6

The following commit has been merged in the master branch:
commit 2a37de6e05449e0d017a05968dec348248067ea2
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Mar 3 09:23:14 2007 +0000

    Removed deprecated exiv2-config script.
---
 README                 |  3 +-
 config/Makefile        |  2 +-
 config/configure.ac    |  1 -
 config/exiv2-config.in | 93 --------------------------------------------------
 src/Makefile           |  3 --
 5 files changed, 2 insertions(+), 100 deletions(-)

diff --git a/README b/README
index 0150d8d..be9382a 100644
--- a/README
+++ b/README
@@ -87,8 +87,7 @@ Hacking
 
 A pkg-config .pc file is installed together with the library.
 Application developers can use pkg-config(1) to obtain correct compile
-and link time flags for the Exiv2 library. (The exiv2-config script is
-still included in the distribution but should be considered deprecated.)
+and link time flags for the Exiv2 library.
 
 If you downloaded Exiv2 directly from the subversion repository, and
 you want to build it using the GNU configure script, then you need to
diff --git a/config/Makefile b/config/Makefile
index b073117..d47b75c 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 exiv2.pc
+	rm -f config.h ../src/exv_conf.h config.mk exiv2.pc
 
 # This removes almost everything, including the configure script!
 maintainer-clean: distclean
diff --git a/config/configure.ac b/config/configure.ac
index 1cc6714..465e800 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -112,7 +112,6 @@ fi
 # Create output files.
 # ---------------------------------------------------------------------------
 AC_CONFIG_FILES([./config/config.mk])
-AC_CONFIG_FILES([./config/exiv2-config], [chmod +x ./config/exiv2-config])
 AC_CONFIG_FILES([./config/exiv2.pc])
 AC_CONFIG_FILES([./po/Makefile.in])
 AC_OUTPUT
diff --git a/config/exiv2-config.in b/config/exiv2-config.in
deleted file mode 100644
index d619df7..0000000
--- a/config/exiv2-config.in
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /bin/sh
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
-libdir=@libdir@
-
-usage()
-{
-    cat <<EOF
-Exiv2-config provides compile time settings for applications which use
-exiv2. Call this script from the application build commands to get the
-correct parameters to compile and link with exiv2.
-
-Usage: exiv2-config [OPTION]
-
-Known values for OPTION are:
-
-  --prefix=DIR		change exiv2 prefix [default $prefix]
-  --exec-prefix=DIR	change exiv2 exec prefix [default $exec_prefix]
-  --libs		print library linking information
-  --libtool-libs	print linking information for use with libtool
-  --cflags		print pre-processor and compiler flags
-  --help		display this help and exit
-  --version		output version information
-EOF
-
-    exit $1
-}
-
-if test $# -eq 0; then
-    usage 1
-fi
-
-cflags=false
-libs=false
-
-while test $# -gt 0; do
-    case "$1" in
-    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-    *) optarg= ;;
-    esac
-
-    case "$1" in
-    --prefix=*)
-	prefix=$optarg
-	includedir=$prefix/include
-	libdir=$prefix/lib
-	;;
-
-    --prefix)
-	echo $prefix
-	;;
-
-    --exec-prefix=*)
-      exec_prefix=$optarg
-      libdir=$exec_prefix/lib
-      ;;
-
-    --exec-prefix)
-      echo $exec_prefix
-      ;;
-
-    --version)
-	echo @PACKAGE_VERSION@
-	exit 0
-	;;
-
-    --help)
-	usage 0
-	;;
-
-    --cflags)
-       	echo -I$includedir
-       	;;
-
-    --libtool-libs)
-	echo $libdir/libexiv2.la
-        ;;
-
-    --libs)
-       	echo -L$libdir -lexiv2 @LDFLAGS@ @LTLIBINTL@ @LTLIBICONV@ @LIBS@
-       	;;
-
-    *)
-	usage
-	exit 1
-	;;
-    esac
-    shift
-done
-
-exit 0
diff --git a/src/Makefile b/src/Makefile
index 249d2a5..c2b384e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -270,7 +270,6 @@ install-lib: lib install-header
 	$(INSTALL_DIRS) $(DESTDIR)$(libdir)
 	@$(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
 
@@ -291,8 +290,6 @@ uninstall-header:
 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)
 	-rmdir $(DESTDIR)$(libdir)
 

-- 
exiv2 packaging