[Pkg-cli-apps-commits] [SCM] banshee branch, experimental, updated. debian/1.7.2-1-4-g1aa7840

Chow Loong Jin hyperair at ubuntu.com
Thu Jul 22 16:50:43 UTC 2010


The following commit has been merged in the experimental branch:
commit 1aa7840a0edcff73f82977df2ebe0113dfb8d9cc
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Thu Jul 22 22:07:19 2010 +0800

    Fix configure failure with --enable-user-docs
    
    * debian/patches:
      + 02_fix-configure.patch: Fix configure failure with --enable-user-docs

diff --git a/debian/changelog b/debian/changelog
index fd15170..e28c252 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,8 @@ banshee (1.7.3-1) UNRELEASED; urgency=low
     + Update list of configure flags:
       - Drop --enable-scrollkeeper
       - Drop --enable-webkit
+  * debian/patches:
+    + 02_fix-configure.patch: Fix configure failure with --enable-user-docs
 
  -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 22 Jul 2010 19:07:31 +0800
 
diff --git a/debian/patches/02_fix-configure.patch b/debian/patches/02_fix-configure.patch
new file mode 100644
index 0000000..735c96f
--- /dev/null
+++ b/debian/patches/02_fix-configure.patch
@@ -0,0 +1,19 @@
+Description: Fix configure when using --enable-user-docs
+Origin: vendor
+Author: Chow Loong Jin <hyperair at ubuntu.com>
+Index: banshee/configure
+===================================================================
+--- banshee.orig/configure	2010-07-22 22:00:46.165964611 +0800
++++ banshee/configure	2010-07-22 22:06:05.926171778 +0800
+@@ -15577,6 +15577,11 @@
+ 
+ 
+ 
++# HACK: set a value for conditionally set AM_CONDITIONAL. This fixes a configure
++# error when running --enable-user-docs, which leads to a codepath where
++# ENABLE_SK is never defined
++ENABLE_SK_TRUE='#'
++ENABLE_SK_FALSE=
+ 
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3ce2587..b85e09a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_fix-icon-transparency.patch
+02_fix-configure.patch
 99_ltmain_as-needed.patch

-- 
banshee



More information about the Pkg-cli-apps-commits mailing list