[Pkg-cli-apps-commits] [SCM] tangerine branch, master, updated. debian/0.3.2.2-5-3-g066f843

[Iain Lane]

The following commit has been merged in the master branch:
commit 7c12c27b5c9f71c6ddc7606319e9023efe656c44
Author: Iain Lane <laney at ubuntu.com>
Date:   Sun Oct 24 16:55:39 2010 +0100

    Remove duplicate patch entry from series
    
    Also refresh patch to apply cleanly

diff --git a/debian/patches/kfreebsd_use_assemblyrefs_in_configure.ac.patch b/debian/patches/kfreebsd_use_assemblyrefs_in_configure.ac.patch
index a75412e..e5f586e 100644
--- a/debian/patches/kfreebsd_use_assemblyrefs_in_configure.ac.patch
+++ b/debian/patches/kfreebsd_use_assemblyrefs_in_configure.ac.patch
@@ -1,8 +1,8 @@
-Index: tangerine-0.3.2.2/configure.ac
+Index: tangerine.git/configure.ac
 ===================================================================
---- tangerine-0.3.2.2.orig/configure.ac	2009-08-15 21:56:05.000000000 +0100
-+++ tangerine-0.3.2.2/configure.ac	2010-05-04 13:09:48.000000000 +0100
-@@ -117,6 +117,30 @@
+--- tangerine.git.orig/configure.ac	2010-10-24 16:55:23.438870031 +0100
++++ tangerine.git/configure.ac	2010-10-24 16:55:31.419486112 +0100
+@@ -117,6 +117,54 @@
          build_session_plugin="yes"
          platform="LINUX"
          ;;
@@ -30,17 +30,6 @@ Index: tangerine-0.3.2.2/configure.ac
 +        build_session_plugin="yes"
 +        platform="LINUX"
 +        ;;
-     *-*-darwin*)
-         have_inotify="no"
-         build_gui="no"
-Index: tangerine-0.3.2.2/configure.ac
-===================================================================
---- tangerine-0.3.2.2.orig/configure.ac	2009-08-15 21:56:05.000000000 +0100
-+++ tangerine-0.3.2.2/configure.ac	2010-05-04 13:09:48.000000000 +0100
-@@ -117,6 +117,30 @@
-         build_session_plugin="yes"
-         platform="LINUX"
-         ;;
 +    *-*-kfreebsd*)
 +        PKG_CHECK_MODULES(GLIB_SHARP_20, glib-sharp-2.0)
 +        AC_SUBST(GLIB_SHARP_20_LIBS)
diff --git a/debian/patches/series b/debian/patches/series
index ef170a4..2b3fcc9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 kfreebsd_use_assemblyrefs_in_configure.ac.patch
-kfreebsd_use_assemblyrefs_in_configure.ac.patch

-- 
tangerine