[Pkg-cli-apps-commits] [SCM] tangerine branch, master, updated. debian/0.3.2.2-7-4-g96e9113

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 10dc0fbec961d45d3624a7e7e9706c76b5e1c0c8
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Mon Jul 4 00:42:13 2011 +0800

    Drop banshee-pcfile-rename patch (applied upstream)

diff --git a/debian/patches/banshee-pcfile-rename b/debian/patches/banshee-pcfile-rename
deleted file mode 100644
index 0541a20..0000000
--- a/debian/patches/banshee-pcfile-rename
+++ /dev/null
@@ -1,83 +0,0 @@
-Description: Rename banshee-1 to banshee in build system
-Author: Iain Lane <laney at ubuntu.com>
-Forwarded: no
-
-Index: tangerine.git/configure.ac
-===================================================================
---- tangerine.git.orig/configure.ac	2011-04-12 17:19:52.917206700 +0100
-+++ tangerine.git/configure.ac	2011-04-12 17:19:52.947205526 +0100
-@@ -225,7 +225,7 @@
- 	enable_banshee=auto)
- 
- if test "x$enable_banshee" != "xno"; then
--        PKG_CHECK_MODULES([BANSHEE_INDEXER], [banshee-1-collection-indexer >= 1.4.2], HAVE_BANSHEE=yes, HAVE_BANSHEE=no)
-+        PKG_CHECK_MODULES([BANSHEE_INDEXER], [banshee-collection-indexer >= 1.4.2], HAVE_BANSHEE=yes, HAVE_BANSHEE=no)
- 
-         if test "x$enable_banshee" = "xyes" -a "x$HAVE_BANSHEE" = "xno"; then
-                 AC_MSG_ERROR([Banshee support explicitly requested, but dependencies not met])
-@@ -272,7 +272,7 @@
- AM_CONDITIONAL(HAVE_MUINE, test "x$have_muine" = "xyes")
- 
- dnl We need to copy Banshee.CollectionIndexer.dll; it's not in the GAC
--BANSHEE_INDEXER_DLL=$(dirname $($PKG_CONFIG --variable=Libraries banshee-1-collection-indexer))
-+BANSHEE_INDEXER_DLL=$(dirname $($PKG_CONFIG --variable=Libraries banshee-collection-indexer))
- AC_SUBST([BANSHEE_INDEXER_DLL])
- 
- AC_CONFIG_FILES([
-Index: tangerine.git/configure
-===================================================================
---- tangerine.git.orig/configure	2011-04-12 17:20:05.746704679 +0100
-+++ tangerine.git/configure	2011-04-12 17:20:28.815801977 +0100
-@@ -14308,12 +14308,12 @@
-         pkg_cv_BANSHEE_INDEXER_CFLAGS="$BANSHEE_INDEXER_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"banshee-1-collection-indexer >= 1.4.2\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "banshee-1-collection-indexer >= 1.4.2") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"banshee-collection-indexer >= 1.4.2\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "banshee-collection-indexer >= 1.4.2") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_BANSHEE_INDEXER_CFLAGS=`$PKG_CONFIG --cflags "banshee-1-collection-indexer >= 1.4.2" 2>/dev/null`
-+  pkg_cv_BANSHEE_INDEXER_CFLAGS=`$PKG_CONFIG --cflags "banshee-collection-indexer >= 1.4.2" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -14326,12 +14326,12 @@
-         pkg_cv_BANSHEE_INDEXER_LIBS="$BANSHEE_INDEXER_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"banshee-1-collection-indexer >= 1.4.2\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "banshee-1-collection-indexer >= 1.4.2") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"banshee-collection-indexer >= 1.4.2\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "banshee-collection-indexer >= 1.4.2") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_BANSHEE_INDEXER_LIBS=`$PKG_CONFIG --libs "banshee-1-collection-indexer >= 1.4.2" 2>/dev/null`
-+  pkg_cv_BANSHEE_INDEXER_LIBS=`$PKG_CONFIG --libs "banshee-collection-indexer >= 1.4.2" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -14350,9 +14350,9 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        BANSHEE_INDEXER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "banshee-1-collection-indexer >= 1.4.2"`
-+	        BANSHEE_INDEXER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "banshee-collection-indexer >= 1.4.2"`
-         else
--	        BANSHEE_INDEXER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "banshee-1-collection-indexer >= 1.4.2"`
-+	        BANSHEE_INDEXER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "banshee-collection-indexer >= 1.4.2"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$BANSHEE_INDEXER_PKG_ERRORS" >&5
-@@ -14521,7 +14521,7 @@
- fi
- 
- 
--BANSHEE_INDEXER_DLL=$(dirname $($PKG_CONFIG --variable=Libraries banshee-1-collection-indexer))
-+BANSHEE_INDEXER_DLL=$(dirname $($PKG_CONFIG --variable=Libraries banshee-collection-indexer))
- 
- 
- ac_config_files="$ac_config_files daap-sharp/daap-sharp.pc daap-sharp/Makefile data/Makefile data/icons/Makefile libtangglue/Makefile Makefile m4/Makefile plugins/File/Makefile plugins/Beagle/Makefile plugins/Session/Makefile plugins/Banshee/Makefile plugins/LSongs/Makefile plugins/Rhythmbox/Makefile plugins/Amarok/Makefile plugins/Muine/Makefile plugins/Muine/src/MuineDatabase.cs po/Makefile.in Tangerine/Makefile Tangerine/tangerine.pc Tangerine.Daemon/Makefile Tangerine.Daemon/tangerine TangerinePrefPane/Makefile TangerineProperties/Makefile TangerineProperties/tangerine-properties"
diff --git a/debian/patches/series b/debian/patches/series
index c146168..c5f125e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 kfreebsd_use_assemblyrefs_in_configure.ac.patch
 CVE-2010-3381-insecure-library-loading
-banshee-pcfile-rename

-- 
tangerine