[SCM] dmedia/master: Merge branch 'master' of ssh://git.debian.org/git/pkg-multimedia/dmedia

[bilalakhtar-guest at users.alioth.debian.org]

Unapply patches after running git-buildpackage, abort on upstream changes.
Apply one-dep-per-line style
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a6eaaaea4298d4e3ff0a69b8ee36720a88947332
X-Git-Newrev: 7d521e10928c0f7c7a88912f16200336e6d4fab4

The following commit has been merged in the master branch:
commit 7d521e10928c0f7c7a88912f16200336e6d4fab4
Merge: d50468c8a9fec532fc80948313d3861296d626fc a6eaaaea4298d4e3ff0a69b8ee36720a88947332
Author: Bilal Akhtar <bilalakhtar at ubuntu.com>
Date:   Mon Feb 7 14:30:49 2011 +0300

    Merge branch 'master' of ssh://git.debian.org/git/pkg-multimedia/dmedia

diff --combined debian/control
index 8d403e3,7523eda..96022fd
--- a/debian/control
+++ b/debian/control
@@@ -4,7 -4,10 +4,10 @@@ Priority: optiona
  Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
  Uploaders: Alessio Treglia <alessio at debian.org>,
   Bilal Akhtar <bilalakhtar at ubuntu.com>
- Build-Depends: debhelper (>= 7.0.50~), python-support, python (>= 2.6), libjs-mootools
+ Build-Depends: debhelper (>= 7.0.50~),
+  python-support,
+  python (>= 2.6),
+  libjs-mootools
  Standards-Version: 3.9.1
  XS-Python-Version: >= 2.6
  Homepage: http://launchpad.net/dmedia
@@@ -23,8 -26,7 +26,8 @@@ Depends: ${misc:Depends}, ${python:Depe
   python-paste,
   python-notify,
   python-xdg,
 - libjs-mootools
 + libjs-mootools,
 + python-gtk2
  Suggests: python-appindicator
  Provides: ${python:Provides}
  XB-Python-Version: ${python:Versions}

-- 
dmedia packaging