[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/1.5.3-1-5-g824788a

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit db16fe4e21fe7af1a705145f77ddfd1cdf051149
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Fri Feb 26 01:15:22 2010 +0800

    Drop 01_monodoc-fix-enable.patch, applied upstream
    
    * debian/patches/01_monodoc-fix-enable.patch,
      debian/patches/series:
      + Dropped, applied upstream

diff --git a/debian/changelog b/debian/changelog
index 5947ae1..9461793 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,8 +37,11 @@ banshee (1.5.4-1) UNRELEASED; urgency=low
   * debian/rules:
     + Reorder configure flags to match upstream's ./configure --help listing
     + Add --enable-webkit since it is now enabled by default
+  * debian/patches/01_monodoc-fix-enable.patch,
+    debian/patches/series:
+    + Dropped, applied upstream
 
- -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 25 Feb 2010 12:03:03 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 26 Feb 2010 01:14:54 +0800
 
 banshee (1.5.3-1) unstable; urgency=low
 
diff --git a/debian/patches/01_monodoc-fix-enable.patch b/debian/patches/01_monodoc-fix-enable.patch
deleted file mode 100644
index 3f515ec..0000000
--- a/debian/patches/01_monodoc-fix-enable.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 026fa229f34baa4e339d85fa0368bc4609ea14c3 Mon Sep 17 00:00:00 2001
-From: Chow Loong Jin <hyperair at gmail.com>
-Date: Thu, 28 Jan 2010 17:27:14 +1100
-Subject: [PATCH] [build] Fixed --disable-docs
-
-Signed-off-by: Alexander Kojevnikov <alexander at kojevnikov.com>
----
- build/m4/shamrock/monodoc.m4 |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-Index: banshee/build/m4/shamrock/monodoc.m4
-===================================================================
---- banshee.orig/build/m4/shamrock/monodoc.m4	2010-01-29 00:53:59.376542016 +0800
-+++ banshee/build/m4/shamrock/monodoc.m4	2010-01-29 00:54:05.350284771 +0800
-@@ -1,7 +1,7 @@
- AC_DEFUN([SHAMROCK_CHECK_MONODOC],
- [
- 	AC_ARG_ENABLE(docs, AC_HELP_STRING([--disable-docs], 
--		[Do not build documentation]), enable_docs=no, enable_docs=yes)
-+		[Do not build documentation]), , enable_docs=yes)
- 
- 	if test "x$enable_docs" = "xyes"; then
- 		AC_PATH_PROG(MONODOCER, monodocer, no)
-Index: banshee/configure
-===================================================================
---- banshee.orig/configure	2010-01-29 00:54:27.280526270 +0800
-+++ banshee/configure	2010-01-29 00:55:17.789525862 +0800
-@@ -16349,7 +16349,7 @@
- 
- 	# Check whether --enable-docs was given.
- if test "${enable_docs+set}" = set; then
--  enableval=$enable_docs; enable_docs=no
-+  enableval=$enable_docs
- else
-   enable_docs=yes
- fi
diff --git a/debian/patches/series b/debian/patches/series
index 45b34ac..2497acb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01_monodoc-fix-enable.patch
 99_ltmain_as-needed.patch

-- 
banshee