[Pkg-cli-apps-commits] r4884 - in /packages/muine/trunk/debian: changelog compat control patches/ patches/00list patches/correct-glade-signals.dpatch patches/metadata-crash.dpatch rules
laney-guest at users.alioth.debian.org
laney-guest at users.alioth.debian.org
Thu Apr 30 20:12:07 UTC 2009
Author: laney-guest
Date: Thu Apr 30 20:12:07 2009
New Revision: 4884
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4884
Log:
* debian/control:
+ Unpipe gnome# build-deps as Ubuntu has fixed this in Karmic
+ Remove dependency on gstreamer0.10-gnomevfs as it is obsolete now that
playbin handles the opening of files.
+ Version debhelper and cli-common-dev build-deps for DH7 integration
+ Add dpatch build-dep for below patches
* debian/rules:
+ Update packaging to DH7 and add dpatch for below patches
+ Rewrite get-orig-source to conform with policy using Mirco Bauer's
snippet.
* debian/patches/correct-glade-signals.dpatch: Add. Backport patch from
upstream to correctly connect signal handlers so "Play Song" and "Play
Artist" buttons work properly (Closes: #524181, LP: #366620).
* debian/patches/metadata-crash.dpatch: Add. Backport patch from upstream
BTS/ubuntu to workaround crash when track metadata is edited externally.
Added:
packages/muine/trunk/debian/patches/
packages/muine/trunk/debian/patches/00list
packages/muine/trunk/debian/patches/correct-glade-signals.dpatch (with props)
packages/muine/trunk/debian/patches/metadata-crash.dpatch (with props)
Modified:
packages/muine/trunk/debian/changelog
packages/muine/trunk/debian/compat
packages/muine/trunk/debian/control
packages/muine/trunk/debian/rules
Modified: packages/muine/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/changelog?rev=4884&op=diff
==============================================================================
--- packages/muine/trunk/debian/changelog (original)
+++ packages/muine/trunk/debian/changelog Thu Apr 30 20:12:07 2009
@@ -1,3 +1,23 @@
+muine (0.8.10-4) UNRELEASED; urgency=low
+
+ * debian/control:
+ + Unpipe gnome# build-deps as Ubuntu has fixed this in Karmic
+ + Remove dependency on gstreamer0.10-gnomevfs as it is obsolete now that
+ playbin handles the opening of files.
+ + Version debhelper and cli-common-dev build-deps for DH7 integration
+ + Add dpatch build-dep for below patches
+ * debian/rules:
+ + Update packaging to DH7 and add dpatch for below patches
+ + Rewrite get-orig-source to conform with policy using Mirco Bauer's
+ snippet.
+ * debian/patches/correct-glade-signals.dpatch: Add. Backport patch from
+ upstream to correctly connect signal handlers so "Play Song" and "Play
+ Artist" buttons work properly (Closes: #524181, LP: #366620).
+ * debian/patches/metadata-crash.dpatch: Add. Backport patch from upstream
+ BTS/ubuntu to workaround crash when track metadata is edited externally.
+
+ -- Iain Lane <laney at ubuntu.com> Thu, 30 Apr 2009 20:54:02 +0100
+
muine (0.8.10-3) unstable; urgency=low
* debian/control:
Modified: packages/muine/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/compat?rev=4884&op=diff
==============================================================================
--- packages/muine/trunk/debian/compat (original)
+++ packages/muine/trunk/debian/compat Thu Apr 30 20:12:07 2009
@@ -1,1 +1,1 @@
-5
+7
Modified: packages/muine/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/control?rev=4884&op=diff
==============================================================================
--- packages/muine/trunk/debian/control (original)
+++ packages/muine/trunk/debian/control Thu Apr 30 20:12:07 2009
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
Uploaders: Tim Retout <tim at retout.co.uk>, Iain Lane <laney at ubuntu.com>
-Build-Depends: debhelper (>= 5),
+Build-Depends: debhelper (>= 7),
mono-devel (>= 2.0),
libgtk2.0-dev (>= 2.6.0),
libgdbm-dev (>= 1.8.0),
@@ -22,15 +22,16 @@
libgtk2.0-cil (>= 1.9.2),
libgnome2.24-cil,
libglade2.0-cil (>= 1.9.2),
- libgconf2.0-cil (>= 1.9.2) | libgconf2.24-cil,
+ libgconf2.0-cil (>= 1.9.2),
libndesk-dbus1.0-cil (>= 0.4),
libndesk-dbus-glib1.0-cil (>= 0.3),
gnome-icon-theme (>= 2.8.0),
- cli-common-dev (>= 0.5.4),
+ cli-common-dev (>= 0.5.7),
monodoc-base (>= 1.1.10),
libmono-cairo2.0-cil (>= 1.1.13),
libnotify-dev,
- libmusicbrainz4-dev
+ libmusicbrainz4-dev,
+ dpatch
Standards-Version: 3.8.1
Homepage: http://muine-player.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/muine/trunk/
@@ -39,7 +40,6 @@
Package: muine
Architecture: any
Depends: ${shlibs:Depends},
- gstreamer0.10-gnomevfs (>= 0.10.0),
${misc:Depends},
${cli:Depends},
gstreamer0.10-plugins-base,
Added: packages/muine/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/patches/00list?rev=4884&op=file
==============================================================================
--- packages/muine/trunk/debian/patches/00list (added)
+++ packages/muine/trunk/debian/patches/00list Thu Apr 30 20:12:07 2009
@@ -1,0 +1,2 @@
+correct-glade-signals
+metadata-crash
Added: packages/muine/trunk/debian/patches/correct-glade-signals.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/patches/correct-glade-signals.dpatch?rev=4884&op=file
==============================================================================
--- packages/muine/trunk/debian/patches/correct-glade-signals.dpatch (added)
+++ packages/muine/trunk/debian/patches/correct-glade-signals.dpatch Thu Apr 30 20:12:07 2009
@@ -1,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## correct-glade-signals.dpatch by Iain Lane <laney at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix non-working play album/play song buttons (connect events correctly)
+## DP: http://bugzilla.gnome.org/show_bug.cgi?id=560077
+## DP: http://git.gnome.org/cgit/muine/commit/?id=ed0e81a673fbe09fa18622ff437c36075d33984d
+
+ at DPATCH@
+diff -urNad muine-0.8.10~/data/glade/AddWindow.glade muine-0.8.10/data/glade/AddWindow.glade
+--- muine-0.8.10~/data/glade/AddWindow.glade 2008-09-28 16:28:35.000000000 +0100
++++ muine-0.8.10/data/glade/AddWindow.glade 2009-04-30 20:53:48.000000000 +0100
+@@ -19,8 +19,6 @@
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="has_separator">False</property>
+- <signal name="response" handler="OnWindowResponse" last_modification_time="Tue, 04 Jan 2005 17:48:15 GMT"/>
+- <signal name="delete_event" handler="OnWindowDeleteEvent" last_modification_time="Tue, 04 Jan 2005 17:48:11 GMT"/>
+
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="dialog-vbox1">
+diff -urNad muine-0.8.10~/src/AddWindow.cs muine-0.8.10/src/AddWindow.cs
+--- muine-0.8.10~/src/AddWindow.cs 2008-09-28 16:28:34.000000000 +0100
++++ muine-0.8.10/src/AddWindow.cs 2009-04-30 20:53:48.000000000 +0100
+@@ -23,7 +23,7 @@
+
+ namespace Muine
+ {
+- public abstract class AddWindow : Gtk.Window
++ public abstract class AddWindow : Gtk.Dialog
+ {
+ #region Enums
+ #region Enums.ResponseType
+@@ -116,6 +116,9 @@
+ this.entry_container.Add (this.entry);
+
+ // List
++ this.Response += OnWindowResponse;
++ this.DeleteEvent += OnWindowDeleteEvent;
++
+ this.list.RowActivated += OnRowActivated;
+ this.list.Selection.Changed += OnSelectionChanged;
+ scrolledwindow.Add (this.list);
Propchange: packages/muine/trunk/debian/patches/correct-glade-signals.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/muine/trunk/debian/patches/metadata-crash.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/patches/metadata-crash.dpatch?rev=4884&op=file
==============================================================================
--- packages/muine/trunk/debian/patches/metadata-crash.dpatch (added)
+++ packages/muine/trunk/debian/patches/metadata-crash.dpatch Thu Apr 30 20:12:07 2009
@@ -1,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## metadata-crash.dpatch by Iain Lane <laney at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix crash when editing tracks externally (possibly some kind of race)
+## DP: http://bugzilla.gnome.org/show_bug.cgi?id=338738
+
+ at DPATCH@
+diff -urNad muine-0.8.10~/src/Metadata.cs muine-0.8.10/src/Metadata.cs
+--- muine-0.8.10~/src/Metadata.cs 2008-09-28 16:28:34.000000000 +0100
++++ muine-0.8.10/src/Metadata.cs 2009-04-30 20:51:10.000000000 +0100
+@@ -50,7 +50,7 @@
+
+ if (error_ptr != IntPtr.Zero) {
+ string error = GLib.Marshaller.PtrToStringGFree (error_ptr);
+- throw new Exception (String.Format (string_error_load, error));
++ throw new MetadataException (String.Format (string_error_load, error));
+ }
+ }
+
+@@ -262,4 +262,9 @@
+ get { return metadata_get_peak (raw); }
+ }
+ }
++
++ public class MetadataException: Exception
++ {
++ public MetadataException(string message) {}
++ }
+ }
+diff -urNad muine-0.8.10~/src/Metadata.cs.orig muine-0.8.10/src/Metadata.cs.orig
+diff -urNad muine-0.8.10~/src/SongDatabase.cs muine-0.8.10/src/SongDatabase.cs
+--- muine-0.8.10~/src/SongDatabase.cs 2008-09-28 16:28:34.000000000 +0100
++++ muine-0.8.10/src/SongDatabase.cs 2009-04-30 20:51:10.000000000 +0100
+@@ -134,6 +134,8 @@
+
+ } catch (InvalidOperationException) {
+ return;
++ } catch (MetadataException e) {
++ return;
+ }
+ }
+
+diff -urNad muine-0.8.10~/src/SongDatabase.cs.orig muine-0.8.10/src/SongDatabase.cs.orig
Propchange: packages/muine/trunk/debian/patches/metadata-crash.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/muine/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/muine/trunk/debian/rules?rev=4884&op=diff
==============================================================================
--- packages/muine/trunk/debian/rules (original)
+++ packages/muine/trunk/debian/rules Thu Apr 30 20:12:07 2009
@@ -1,42 +1,24 @@
#!/usr/bin/make -f
# -*- makefile -*-
-export MONO_SHARED_DIR=$(CURDIR)
-
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+include /usr/share/cli-common/cli.make
+include /usr/share/dpatch/dpatch.make
CURVER = $(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | cut -d"-" -f1 )
-config.status: configure
- dh_testdir
- MCS=/usr/bin/csc CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc \
- --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
- --enable-gstreamer=0.10
+MAKEFILE = $(firstword $(MAKEFILE_LIST))
+DEBIAN_DIR = $(dir $(MAKEFILE))
+SOURCE_DIR = $(DEBIAN_DIR)/..
- mkdir -p $(MONO_SHARED_DIR)/.wapi
+DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Version | cut -d" " -f2)
+DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Source | cut -d" " -f2)
+VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
-build: build-stamp
-build-stamp: config.status
- dh_testdir
- $(MAKE)
- touch build-stamp
+override_dh_auto_configure:
+ dh_auto_configure -- MCS=/usr/bin/csc --enable-gstreamer=0.10
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- [ ! -f Makefile ] || $(MAKE) distclean
-
+override_dh_auto_clean:
+ [ ! -f MAkefile ] || $(MAKE) distclean
rm -f ./libtool src/AmazonSearchService.cs
rm -rf $(MONO_SHARED_DIR)/.wapi
rm -f debian/muine.substvars.new
@@ -44,61 +26,19 @@
dh_clean
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+build: patch-stamp
+clean: unpatch
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_install -i --list-missing
- dh_installchangelogs -i ChangeLog
- dh_installdocs -i
- dh_link
- dh_strip -i
- dh_clistrip -i
- dh_compress -i
- dh_fixperms -i
- dh_clifixperms -i
- dh_installdeb -i
- dh_shlibdeps -i
- dh_clideps -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_install -a --list-missing
- dh_installchangelogs -a ChangeLog
- dh_installdocs -a
- dh_installmenu -a
- dh_installman -a
- dh_desktop -a
- dh_gconf
- dh_strip -a
- dh_clistrip -a
- dh_compress -a
- dh_fixperms -a
- dh_clifixperms -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_clideps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-
-binary: binary-indep binary-arch
+%:
+ dh $@
get-orig-source:
- [ -d ../tarballs ] || mkdir ../tarballs
uscan \
+ --package $(DEB_SOURCE_NAME) \
+ --watchfile $(DEBIAN_DIR)/watch \
+ --upstream-version $(VERSION) \
+ --download-version $(VERSION) \
+ --destdir . \
--force-download \
- --download-version $(CURVER) \
--rename \
- --destdir ../tarballs
-
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
+ --repack
More information about the Pkg-cli-apps-commits
mailing list