[Pkg-cli-apps-commits] [SCM] banshee branch, experimental, updated. debian/1.7.4-1-8-g3aa0587
Chow Loong Jin
hyperair at ubuntu.com
Sun Sep 5 16:20:24 UTC 2010
The following commit has been merged in the experimental branch:
commit dad5c40852abf542c6723665466b47d457771669
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Sun Sep 5 23:27:22 2010 +0800
Add patches to fix gio# being copied twice
diff --git a/debian/changelog b/debian/changelog
index 2af73ee..adeb5ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,8 +40,13 @@ banshee (1.7.5-1) UNRELEASED; urgency=low
- libgtk-sharp-beans2.0-cil-dev
- libgpod-cil-dev
+ Drop hal, podsleuth and ipod-sharp dependencies
+ * debian/patches:
+ + 0001-Don-t-copy-duplicate-libraries.patch: Don't copy duplicate
+ libraries
+ + 0002-Also-copy-gio-sharp-s-debugging-libraries-if-they-ar.patch:
+ Copy debugging libraries if they exist
- -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 05 Sep 2010 17:26:49 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com> Sun, 05 Sep 2010 23:27:11 +0800
banshee (1.7.4-1) experimental; urgency=low
diff --git a/debian/patches/0001-Don-t-copy-duplicate-libraries.patch b/debian/patches/0001-Don-t-copy-duplicate-libraries.patch
new file mode 100644
index 0000000..4cee2b2
--- /dev/null
+++ b/debian/patches/0001-Don-t-copy-duplicate-libraries.patch
@@ -0,0 +1,50 @@
+From 1ea0f3d0476d5e26fcbbfbf382fbef7352f10115 Mon Sep 17 00:00:00 2001
+From: Iain Lane <laney at ubuntu.com>
+Date: Sun, 5 Sep 2010 13:36:18 +0100
+Subject: [PATCH 1/2] Don't copy duplicate libraries
+
+GIO# and GTK#Beans both supply the same library, gio-sharp.dll. If we
+try to install both of these then automake falls over. Ensure that we
+only try to copy one of each library.
+---
+ build/m4/banshee/gio.m4 | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+Index: banshee/build/m4/banshee/gio.m4
+===================================================================
+--- banshee.orig/build/m4/banshee/gio.m4 2010-09-05 22:09:00.268718415 +0800
++++ banshee/build/m4/banshee/gio.m4 2010-09-05 23:17:01.468813872 +0800
+@@ -16,8 +16,12 @@
+
+ asms="`$PKG_CONFIG --variable=Libraries gio-sharp-2.0` `$PKG_CONFIG --variable=Libraries gtk-sharp-beans-2.0`"
+ for asm in $asms; do
+- GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm"
+- [[ -r "$asm.config" ]] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.config"
++ FILENAME=`basename $asm`
++ if [[ "`echo $SEENBEFORE | grep $FILENAME`" = "" ]]; then
++ GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm"
++ [[ -r "$asm.config" ]] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.config"
++ SEENBEFORE="$SEENBEFORE $FILENAME"
++ fi
+ done
+ AC_SUBST(GIOSHARP_ASSEMBLIES)
+
+Index: banshee/configure
+===================================================================
+--- banshee.orig/configure 2010-09-05 23:18:02.018072091 +0800
++++ banshee/configure 2010-09-05 23:19:53.746735155 +0800
+@@ -16343,8 +16343,12 @@
+
+ asms="`$PKG_CONFIG --variable=Libraries gio-sharp-2.0` `$PKG_CONFIG --variable=Libraries gtk-sharp-beans-2.0`"
+ for asm in $asms; do
+- GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm"
+- [ -r "$asm.config" ] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.config"
++ FILENAME=`basename $asm`
++ if [[ "`echo $SEENBEFORE | grep $FILENAME`" = "" ]]; then
++ GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm"
++ [[ -r "$asm.config" ]] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.config"
++ SEENBEFORE="$SEENBEFORE $FILENAME"
++ fi
+ done
+
+
diff --git a/debian/patches/0002-Also-copy-gio-sharp-s-debugging-libraries-if-they-ar.patch b/debian/patches/0002-Also-copy-gio-sharp-s-debugging-libraries-if-they-ar.patch
new file mode 100644
index 0000000..403012a
--- /dev/null
+++ b/debian/patches/0002-Also-copy-gio-sharp-s-debugging-libraries-if-they-ar.patch
@@ -0,0 +1,37 @@
+From c0e7d9ef2858baeb1677bfa674724451c4c4e407 Mon Sep 17 00:00:00 2001
+From: Iain Lane <laney at ubuntu.com>
+Date: Sun, 5 Sep 2010 13:40:00 +0100
+Subject: [PATCH 2/2] Also copy gio-sharp's debugging libraries if they are present
+
+---
+ build/m4/banshee/gio.m4 | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+Index: banshee/build/m4/banshee/gio.m4
+===================================================================
+--- banshee.orig/build/m4/banshee/gio.m4 2010-09-05 23:22:25.694981499 +0800
++++ banshee/build/m4/banshee/gio.m4 2010-09-05 23:22:25.714981273 +0800
+@@ -19,7 +19,8 @@
+ FILENAME=`basename $asm`
+ if [[ "`echo $SEENBEFORE | grep $FILENAME`" = "" ]]; then
+ GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm"
+- [[ -r "$asm.config" ]] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.config"
++ [[ -r "$asm.mdb" ]] && giosharp_assemblies="$giosharp_assemblies $asm.msb"
++ [[ -r "$asm.config" ]] && giosharp_assemblies="$giosharp_assemblies $asm.config"
+ SEENBEFORE="$SEENBEFORE $FILENAME"
+ fi
+ done
+Index: banshee/configure
+===================================================================
+--- banshee.orig/configure 2010-09-05 23:22:31.634914422 +0800
++++ banshee/configure 2010-09-05 23:23:06.894518512 +0800
+@@ -16346,7 +16346,8 @@
+ FILENAME=`basename $asm`
+ if [[ "`echo $SEENBEFORE | grep $FILENAME`" = "" ]]; then
+ GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm"
+- [[ -r "$asm.config" ]] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.config"
++ [[ -r "$asm.mdb" ]] && giosharp_assemblies="$giosharp_assemblies $asm.msb"
++ [[ -r "$asm.config" ]] && giosharp_assemblies="$giosharp_assemblies $asm.config"
+ SEENBEFORE="$SEENBEFORE $FILENAME"
+ fi
+ done
diff --git a/debian/patches/series b/debian/patches/series
index 2497acb..6d4864d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
+0001-Don-t-copy-duplicate-libraries.patch
+0002-Also-copy-gio-sharp-s-debugging-libraries-if-they-ar.patch
99_ltmain_as-needed.patch
--
banshee
More information about the Pkg-cli-apps-commits
mailing list