diff -u quodlibet-plugins-20070625/debian/control quodlibet-plugins-20070625/debian/control --- quodlibet-plugins-20070625/debian/control +++ quodlibet-plugins-20070625/debian/control @@ -2,7 +2,7 @@ Section: sound Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Christine Spang -Build-Depends: debhelper (>= 4.0), python +Build-Depends: debhelper (>= 4.0), python, dpatch Priority: extra Standards-Version: 3.7.2.2 XS-Python-Version: current diff -u quodlibet-plugins-20070625/debian/changelog quodlibet-plugins-20070625/debian/changelog --- quodlibet-plugins-20070625/debian/changelog +++ quodlibet-plugins-20070625/debian/changelog @@ -1,3 +1,12 @@ +quodlibet-plugins (20070625-1ubuntu2) hardy; urgency=low + + * debian/control, debian/rules: (re)added dpatch + * debian/patches/20_adjust_dbusmmkey.py_new_g-s-d_interface.dpatch, + debian/patches/00list: + adjustments for changed g-s-d dbus interface (LP: #188311) + + -- Kjell Braden Sat, 02 Feb 2008 12:42:52 +0100 + quodlibet-plugins (20070625-1ubuntu1) gutsy; urgency=low * Merge from Debian unstable. Remaining Ubuntu changes: diff -u quodlibet-plugins-20070625/debian/rules quodlibet-plugins-20070625/debian/rules --- quodlibet-plugins-20070625/debian/rules +++ quodlibet-plugins-20070625/debian/rules @@ -2,6 +2,8 @@ # debian/rules for quodlibet-plugins # It's obscenely simple. I feel bad. +include /usr/share/dpatch/dpatch.make + D := debian/quodlibet-plugins U := usr/share/quodlibet/plugins P := $(D)/$(U) @@ -12,7 +14,8 @@ binary: binary-indep -binary-indep: +binary-indep: binary-indep-stamp +binary-indep-stamp: patch-stamp dh_clean -k dh_installdirs $(U) for plugin in $(filter-out $(EXCLUDE), $(wildcard */*.py *.py)); do \ @@ -29,3 +32,4 @@ -clean: +clean: clean1 unpatch +clean1: dh_clean only in patch2: unchanged: --- quodlibet-plugins-20070625.orig/debian/patches/20_adjust_dbusmmkey.py_new_g-s-d_interface.dpatch +++ quodlibet-plugins-20070625/debian/patches/20_adjust_dbusmmkey.py_new_g-s-d_interface.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_adjust_dbusmmkey.py_new_g-s-d_interface.dpatch by Kjell Braden +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: adjust to new org.gnome.SettingsDaemon dbus interface + +@DPATCH@ +diff -urNad quodlibet-plugins-20070625~/events/dbusmmkey.py quodlibet-plugins-20070625/events/dbusmmkey.py +--- quodlibet-plugins-20070625~/events/dbusmmkey.py 2007-06-25 23:19:33.000000000 +0200 ++++ quodlibet-plugins-20070625/events/dbusmmkey.py 2008-02-02 12:26:03.000000000 +0100 +@@ -38,7 +38,7 @@ + if self.bus is None or self.bus_object is None: + self.bus = dbus.Bus(dbus.Bus.TYPE_SESSION) + self.bus_object = self.bus.get_object( +- 'org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon') ++ 'org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon/MediaKeys') + self.bus_object.connect_to_signal( + "MediaPlayerKeyPressed", self.mmkc.action) + self.mmkc.set_enabled(True) only in patch2: unchanged: --- quodlibet-plugins-20070625.orig/debian/patches/00list +++ quodlibet-plugins-20070625/debian/patches/00list @@ -0,0 +1 @@ +20_adjust_dbusmmkey.py_new_g-s-d_interface