beagle r4711 - in trunk/beagle: . Util firefox-extension po

[dbera svn gnome org]

Author: dbera
Date: Mon Apr 14 00:20:26 2008
New Revision: 4711
URL: http://svn.gnome.org/viewvc/beagle?rev=4711&view=rev

Log:
* Remove libexif from our dependency. So we also do not need to generate Util.dll.config from the .in file any more.
* Add the new F-Spot files to POTFILE.skip.
* Add a missing file to extra-dist in firefox-extension.


Added:
   trunk/beagle/Util/Util.dll.config
      - copied, changed from r4694, /trunk/beagle/Util/Util.dll.config.in
Removed:
   trunk/beagle/Util/Util.dll.config.in
Modified:
   trunk/beagle/Util/Makefile.am
   trunk/beagle/configure.in
   trunk/beagle/firefox-extension/Makefile.am
   trunk/beagle/po/POTFILES.skip

Modified: trunk/beagle/Util/Makefile.am
==============================================================================
--- trunk/beagle/Util/Makefile.am	(original)
+++ trunk/beagle/Util/Makefile.am	Mon Apr 14 00:20:26 2008
@@ -267,8 +267,8 @@
 	$(UTIL_CSFILES)		\
 	$(UI_UTIL_CSFILES)	\
 	$(COND_CS_FILES)	\
-	UiUtil.dll.config	\
-	Util.dll.config.in	\
+	$(UI_UTIL_TARGET_CONFIG)\
+	$(UTIL_TARGET_CONFIG)	\
 	inotify-test
 
 CLEANFILES =			\

Copied: trunk/beagle/Util/Util.dll.config (from r4694, /trunk/beagle/Util/Util.dll.config.in)
==============================================================================
--- /trunk/beagle/Util/Util.dll.config.in	(original)
+++ trunk/beagle/Util/Util.dll.config	Mon Apr 14 00:20:26 2008
@@ -1,3 +1,2 @@
 <configuration>
-	<dllmap dll="libexif.dll" target="libexif so  EXIF_SOVERSION@"/>
 </configuration>

Modified: trunk/beagle/configure.in
==============================================================================
--- trunk/beagle/configure.in	(original)
+++ trunk/beagle/configure.in	Mon Apr 14 00:20:26 2008
@@ -402,22 +402,6 @@
 
 dnl ----------------------------------------------
 
-dnl libexif: Needed to index jpeg metadata
-
-LIBEXIF_API_CHANGE=0.6.0
-LIBEXIF_REQUIRED_MIN=0.5.7
-LIBEXIF_REQUIRED_MAX=0.7.0
-
-PKG_CHECK_MODULES(LIBEXIF, libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX)
-PKG_CHECK_MODULES(LIBEXIF_API_CHECK, libexif >= $LIBEXIF_API_CHANGE, have_old_libexif=no, have_old_libexif=yes)
-
-if test "x$have_old_libexif" = "xyes"; then
-	EXIF_SOVERSION=9
-else
-	PKG_CHECK_MODULES(LIBEXIF_VERSION_CHECK, libexif >= 0.6.12, EXIF_SOVERSION=12, EXIF_SOVERSION=10)
-fi
-AC_SUBST(EXIF_SOVERSION)
-
 PKG_CHECK_MODULES(BEAGLED,
 [
 	shared-mime-info
@@ -648,7 +632,6 @@
 AC_OUTPUT([
 Makefile
 Util/Makefile
-Util/Util.dll.config
 glue/Makefile
 BeagleClient/Makefile
 beagled/Makefile

Modified: trunk/beagle/firefox-extension/Makefile.am
==============================================================================
--- trunk/beagle/firefox-extension/Makefile.am	(original)
+++ trunk/beagle/firefox-extension/Makefile.am	Mon Apr 14 00:20:26 2008
@@ -63,7 +63,8 @@
 
 
 EXTRA_DIST =			\
-	$(XPI_FILES)
+	$(XPI_FILES)		\
+	$(INSTALL_RDF_IN)
 
 CLEANFILES =			\
 	$(PROJECT).xpi		\

Modified: trunk/beagle/po/POTFILES.skip
==============================================================================
--- trunk/beagle/po/POTFILES.skip	(original)
+++ trunk/beagle/po/POTFILES.skip	Mon Apr 14 00:20:26 2008
@@ -3,6 +3,6 @@
 search/beagle-search.desktop.in
 tools/beagle-settings.desktop.in
 Util/DigikamTags.cs
-Util/F-Spot/Exif.cs
-Util/F-Spot/IptcFile.cs
+Util/F-Spot/Imaging/Exif.cs
+Util/F-Spot/Imaging/IptcFile.cs
 Util/F-Spot/MetadataStore.cs