[Pkg-cli-apps-commits] [SCM] bansheelyricsplugin branch, master, updated. debian/0.8.1-1-5-gbc6014e
Chow Loong Jin
hyperair at gmail.com
Fri Jan 29 02:16:31 UTC 2010
The following commit has been merged in the master branch:
commit 8f0a4e909ebea0b180313bf6df86f98d0a9aa01c
Author: Chow Loong Jin <hyperair at gmail.com>
Date: Fri Jan 29 08:00:41 2010 +0800
Accomodate for moving of ThreadAssist symbol
* debian/patches/01_fix-banshee-1.5.3.patch:
+ Let ThreadAssist symbol be resolved during compile-time via the use
of "using" statements. It was moved from Banshee.Base to Hyena
between Banshee 1.5.2 and 1.5.3
* debian/(control, rules, README.source:
+ Quiltify package
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..8646078
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,57 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To configure quilt to use debian/patches instead of patches, you want
+either to export QUILT_PATCHES=debian/patches in your environment
+or use this snippet in your ~/.quiltrc:
+
+ for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
+ if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
+ export QUILT_PATCHES=debian/patches
+ fi
+ done
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+ quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+ quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches. Then, for every file that will be modified by this patch,
+run:
+
+ quilt add <file>
+
+before editing those files. You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly. After editing the files, run:
+
+ quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+ quilt import -P <patch> /path/to/patch
+ quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches. The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+ quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
diff --git a/debian/changelog b/debian/changelog
index 128357c..abd8f6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+bansheelyricsplugin (0.8.1-2) UNRELEASED; urgency=low
+
+ * debian/patches/01_fix-banshee-1.5.3.patch:
+ + Let ThreadAssist symbol be resolved during compile-time via the use
+ of "using" statements. It was moved from Banshee.Base to Hyena
+ between Banshee 1.5.2 and 1.5.3
+ * debian/(control, rules, README.source:
+ + Quiltify package
+
+ -- Chow Loong Jin <hyperair at ubuntu.com> Fri, 29 Jan 2010 08:03:00 +0800
+
bansheelyricsplugin (0.8.1-1) unstable; urgency=low
[ Chow Loong Jin ]
diff --git a/debian/control b/debian/control
index ff96742..e97d2b3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
Uploaders: Chow Loong Jin <hyperair at ubuntu.com>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 7.0.50),
+ quilt (>= 0.46-7~),
cli-common-dev (>= 0.5.7),
pkg-config (>= 0.9.0),
mono-devel (>= 2.4.2.3),
diff --git a/debian/patches/01_fix-banshee-1.5.3.patch b/debian/patches/01_fix-banshee-1.5.3.patch
new file mode 100644
index 0000000..51fa7e7
--- /dev/null
+++ b/debian/patches/01_fix-banshee-1.5.3.patch
@@ -0,0 +1,31 @@
+Index: BansheeLyricsPlugin/src/Banshee.Lyrics/LyricsManager.cs
+===================================================================
+--- BansheeLyricsPlugin/src/Banshee.Lyrics/LyricsManager.cs (revision 203)
++++ BansheeLyricsPlugin/src/Banshee.Lyrics/LyricsManager.cs (revision 204)
+@@ -106,7 +106,7 @@
+
+ LoadStarted (null, null);
+
+- Banshee.Base.ThreadAssist.SpawnFromMain (delegate {
++ ThreadAssist.SpawnFromMain (delegate {
+ try {
+ if (cache.IsInCache (track)) {
+ lyrics = cache.ReadLyrics (track);
+@@ -128,7 +128,7 @@
+ error = e.Message;
+ }
+
+- Banshee.Base.ThreadAssist.ProxyToMain (delegate {
++ ThreadAssist.ProxyToMain (delegate {
+ LoadFinished (this, new LoadFinishedEventArgs (lyrics, suggestion, error));});
+ });
+ }
+@@ -236,7 +236,7 @@
+ return;
+ }
+
+- Banshee.Base.ThreadAssist.SpawnFromMain (delegate {
++ ThreadAssist.SpawnFromMain (delegate {
+ if (rewrite) {
+ cache.DeleteLyrics (track);
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..74758af
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_fix-banshee-1.5.3.patch
diff --git a/debian/rules b/debian/rules
index 885b0e2..9fc1d81 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
#!/usr/bin/make -f
include /usr/share/cli-common/cli.make
+include /usr/share/quilt/quilt.make
# some vars for get-orig-source
MAKEFILE = $(firstword $(MAKEFILE_LIST))
@@ -30,6 +31,6 @@ get-orig-source:
--rename
%:
- dh $@
+ dh --with=quilt $@
.PHONY: get-orig-source
--
bansheelyricsplugin
More information about the Pkg-cli-apps-commits
mailing list