[Pkg-cli-apps-commits] [SCM] tangerine branch, master, updated. debian/0.3.4-1-7-g27ca095

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 072e39a22706aef498cbcc210a855c4b5372f99e
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Wed Jan 18 12:55:42 2012 +0800

    Update db4o patch to upstream version

diff --git a/debian/patches/port_file_plugin_to_db4o_8.0.patch b/debian/patches/port_file_plugin_to_db4o_8.0.patch
index d09eebb..d2c5173 100644
--- a/debian/patches/port_file_plugin_to_db4o_8.0.patch
+++ b/debian/patches/port_file_plugin_to_db4o_8.0.patch
@@ -1,22 +1,70 @@
+From: Chow Loong Jin <hyperair at debian.org>
+Description: Detect and port to DB4O 8.0
+Origin: https://bazaar.launchpad.net/~tangerine-developers/tangerine/trunk/diff/45
+Applied-Upstream: yes
+Index: tangerine/configure.ac
+===================================================================
+--- tangerine.orig/configure.ac	2012-01-09 02:52:25.496615680 +0800
++++ tangerine/configure.ac	2012-01-18 12:51:48.873943532 +0800
+@@ -142,8 +142,15 @@
+         file_beagle=$enableval,
+         enable_file=auto)
+ 
+-if test "x$enable_file" != "xno"; then 
+-        PKG_CHECK_MODULES([DB4O], [db4o], HAVE_DB4O=yes, HAVE_DB4O=no)
++if test "x$enable_file" != "xno"; then
++        PKG_CHECK_MODULES([DB4O], [db4o >= 8.0], [HAVE_DB4O_8=yes], [HAVE_DB4O_8=no])
++        AM_CONDITIONAL([HAVE_DB4O_8], [test "$HAVE_DB4O_8" = "yes"])
++
++        if test "$HAVE_DB4O_8" = "yes"; then
++				HAVE_DB4O=yes
++        else
++				PKG_CHECK_MODULES([DB4O], [db4o], HAVE_DB4O=yes, HAVE_DB4O=no)
++        fi
+ 
+         if test "x$enable_file" = "xyes" -a "x$HAVE_DB4O" = "xno"; then
+ 				AC_MSG_ERROR([File support explicitly requested, but dependencies not met])
+Index: tangerine/plugins/File/Makefile.am
+===================================================================
+--- tangerine.orig/plugins/File/Makefile.am	2010-06-21 16:21:19.000000000 +0800
++++ tangerine/plugins/File/Makefile.am	2012-01-18 12:51:48.907277043 +0800
+@@ -1,6 +1,11 @@
+ # Simple component buildsystem
+ if HAVE_DB4O
+ include $(top_srcdir)/build.plugins.rules.mk
++
++if HAVE_DB4O_8
++MCS_FLAGS += -d:HAVE_DB4O_8
++endif
++
+ else
+ EXTRA_DIST = $(FILES)
+ endif
 Index: tangerine/plugins/File/src/FilePlugin.cs
 ===================================================================
---- tangerine.orig/plugins/File/src/FilePlugin.cs	2011-08-20 21:09:30.000000000 +0100
-+++ tangerine/plugins/File/src/FilePlugin.cs	2011-08-20 21:19:46.000000000 +0100
-@@ -127,7 +127,7 @@
+--- tangerine.orig/plugins/File/src/FilePlugin.cs	2012-01-09 02:52:25.536615906 +0800
++++ tangerine/plugins/File/src/FilePlugin.cs	2012-01-18 12:51:48.920610450 +0800
+@@ -127,7 +127,11 @@
                  odb = Db4oFactory.OpenFile (Path.Combine (Daemon.ConfigDirectory, "tracks.db"));
              }
  
--            IObjectSet result = odb.Get (typeof (Track));
++#if HAVE_DB4O_8
 +            IObjectSet result = odb.QueryByExample (typeof (Track));
++#else
+             IObjectSet result = odb.Get (typeof (Track));
++#endif
              log.DebugFormat ("{0} songs in database", result.Count);
              
              foreach (Track song in result) {
-@@ -261,7 +261,7 @@
+@@ -261,7 +265,11 @@
                  if (UpdateTrack (track, file)) {
                      db.AddTrack (track);   
                      trackHash[file] = track;
--                    odb.Set (track);
++#if HAVE_DB4O_8
 +                    odb.Store (track);
++#else
+                     odb.Set (track);
++#endif
                  }
              } catch {
              }

-- 
tangerine