[SCM] dmedia/master: * Fix find_port deprecation * Wrap-and-sort * add gir1.2-webkit-1.0 dep

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

The following commit has been merged in the master branch:
commit 77712e57b0d86801b4101725833e17d8efdc7c20
Author: Bilal Akhtar <bilalakhtar at ubuntu.com>
Date:   Wed Feb 9 10:49:10 2011 +0300

    * Fix find_port deprecation
    * Wrap-and-sort
    * add gir1.2-webkit-1.0 dep

diff --git a/debian/control b/debian/control
index 96022fd..8f48f5a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ Section: video
 Priority: optional
 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>
+           Bilal Akhtar <bilalakhtar at ubuntu.com>
 Build-Depends: debhelper (>= 7.0.50~),
- python-support,
- python (>= 2.6),
- libjs-mootools
+               libjs-mootools,
+               python (>= 2.6),
+               python-support
 Standards-Version: 3.9.1
 XS-Python-Version: >= 2.6
 Homepage: http://launchpad.net/dmedia
@@ -17,17 +17,19 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/dmedia.git
 Package: python-dmedia
 Architecture: all
 Section: python
-Depends: ${misc:Depends}, ${python:Depends},
- python-desktopcouch-records,
- totem,
- libimage-exiftool-perl,
- python-genshi,
- python-webkit,
- python-paste,
- python-notify,
- python-xdg,
- libjs-mootools,
- python-gtk2
+Depends: gir1.2-webkit-1.0,
+         libimage-exiftool-perl,
+         libjs-mootools,
+         python-desktopcouch-records,
+         python-genshi,
+         python-gtk2,
+         python-notify,
+         python-paste,
+         python-webkit,
+         python-xdg,
+         totem,
+         ${misc:Depends},
+         ${python:Depends}
 Suggests: python-appindicator
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
@@ -51,7 +53,7 @@ Description: A distributed media library (CLI interface)
  CouchDB. Media files can also be loaded remotely over a network
  connection.
  .
- This package installs the dmedia-cli command, which provides a 
+ This package installs the dmedia-cli command, which provides a
  command-line interface to the DMedia library, and also the
  dmedia-import command, which is used to import files from a
  specified directory into the library.
diff --git a/debian/dmedia.install b/debian/dmedia.install
index 942d663..24ad78e 100644
--- a/debian/dmedia.install
+++ b/debian/dmedia.install
@@ -1,3 +1,3 @@
 /usr/bin/*
-/usr/share/man/*
 /usr/share/applications/*
+/usr/share/man/*
diff --git a/debian/patches/02_fix_couchdb_deprecated_function.patch b/debian/patches/02_fix_couchdb_deprecated_function.patch
new file mode 100644
index 0000000..bb308d4
--- /dev/null
+++ b/debian/patches/02_fix_couchdb_deprecated_function.patch
@@ -0,0 +1,15 @@
+Description: Backport patch to fix find_port function removal
+ This patch has been backported from upstream to fix the
+ removal of the function find_port in desktopcouch python mod.
+Author: Jason Gerard DeRose <jderose at novacut.com>
+Applied-Upstream: http://bazaar.launchpad.net/~dmedia/dmedia/trunk/revision/150
+--- a/dmedia/metastore.py
++++ b/dmedia/metastore.py
+@@ -33,6 +33,7 @@
+ from desktopcouch.records.server import  CouchDatabase
+ from desktopcouch.records.record import  Record
+ from desktopcouch.local_files import DEFAULT_CONTEXT, Context
++from desktopcouch.application.platform import find_port
+ from .util import random_id
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 62bc580..b4f03ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_fix_errors_in_manpage.patch
+02_fix_couchdb_deprecated_function.patch

-- 
dmedia packaging