[SCM] dmedia/master: - Split up separate upstream components into separate Debian packages. (LP: #748016) - Bump Standards-Version to 3.9.2 (no changes needed). Will modify .install files in next commit

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

The following commit has been merged in the master branch:
commit 18a5f5dc39b5e8ccbd1a21e3f747bed7d3939624
Author: Bilal Akhtar <bilalakhtar at ubuntu.com>
Date:   Tue Apr 12 10:54:20 2011 +0300

      - Split up separate upstream components into separate Debian packages.
        (LP: #748016)
      - Bump Standards-Version to 3.9.2 (no changes needed).
    Will modify .install files in next commit

diff --git a/debian/changelog b/debian/changelog
index e70141e..09dfb7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,15 @@
-dmedia (0.5.0~repack-1) unstable; urgency=low
+dmedia (0.5.0~repack-1) experimental; urgency=low
 
   * New upstream release.
   * debian/control:
     - Fix the problem of uninstallable gir1.2-* deps, as well as don't
       completely depend on python-desktopcouch-records, its a virtual package
       in Debian and standalone in Ubuntu.
+    - Split up separate upstream components into separate Debian packages.
+      (LP: #748016)
+    - Bump Standards-Version to 3.9.2 (no changes needed).
 
- -- Bilal Akhtar <bilalakhtar at ubuntu.com>  Mon, 11 Apr 2011 10:00:59 +0300
+ -- Bilal Akhtar <bilalakhtar at ubuntu.com>  Tue, 12 Apr 2011 10:50:53 +0300
 
 dmedia (0.3.0~repack-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 1ac9c29..ad505e9 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7.0.50~),
                libjs-mootools,
                python (>= 2.6),
                python-support
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 XS-Python-Version: >= 2.6
 Homepage: http://launchpad.net/dmedia
 Vcs-Git: git://git.debian.org/pkg-multimedia/dmedia.git
@@ -16,19 +16,13 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/dmedia.git
 Package: python-dmedia
 Architecture: all
 Section: python
-Depends: gir1.2-webkit-1.0,
-         libimage-exiftool-perl,
+Depends: libimage-exiftool-perl,
          libjs-mootools,
-         python-desktopcouch-records | desktopcouch,
-         python-genshi,
-         python-gtk2,
-         python-notify,
-         python-paste,
-         python-webkit,
+         python-couchdb,
          python-xdg,
-         totem,
          ${misc:Depends},
          ${python:Depends}
+Recommends: dmedia-service
 Suggests: python-appindicator
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
@@ -39,20 +33,75 @@ Description: A distributed media library (Python modules)
  CouchDB. Media files can also be loaded remotely over a network
  connection.
  .
- This package contains the DMedia service and the Python modules
- to connect to the service.
+ This package contains Python modules to connect to the DMedia
+ service. These modules can also be used to connect to other
+ services which implement a DMedia-like API.
 
 Package: dmedia
 Architecture: all
-Depends: python-dmedia (= ${source:Version}), ${misc:Depends}, ${python:Depends}
-Description: A distributed media library (CLI interface)
+Depends: dmedia-importer, dmedia-service
+Description: Dummy transitional package to the DBus service and importer
+ This is a dummy transitional package ensuring safe upgrades
+ from the old dmedia package to the new split service and
+ importer packages.
+ .
+ This package is safe to remove once its dependencies are
+ satisfied.
+
+Package: dmedia-service
+Architecture: all
+Depends: desktopcouch,
+         python-dbus,
+         python-dmedia (= ${source:Version}),
+         ${misc:Depends},
+         ${python:Depends}
+Recommends: dmedia-importer
+Description: A distributed media library (DBus service)
  DMedia is a simple distributed media library which greatly
  facilitates playing of media files and storing their metadata
  for quick access. It stores the metadata of the media files in
  CouchDB. Media files can also be loaded remotely over a network
  connection.
  .
- This package installs the following command-line tools:
+ This package contains a DBus service which manages media file
+ metadata. Other applications can connect to this service
+ using the Python modules provided in package python-dmedia.
+
+Package: dmedia-importer
+Architecture: all
+Depends: dmedia-gtk,
+         gir1.2-notify-0.7,
+         python-dmedia (= ${source:Version}),
+         ${misc:Depends},
+         ${python:Depends}
+Suggests: gir1.2-appindicator-0.1
+Description: A distributed media library (Media Importer)
+ DMedia is a simple distributed media library which greatly
+ facilitates playing of media files and storing their metadata
+ for quick access. It stores the metadata of the media files in
+ CouchDB. Media files can also be loaded remotely over a network
+ connection.
+ .
+ This package installs the following command-line tools to
+ facilitate media file importing into the DMedia library:
   * dmedia-cli
   * dmedia-import
-  * dmedia-gtk
+
+Package: dmedia-gtk
+Architecture: all
+Depends: dmedia-service (= ${source:Version}),
+         gir1.2-gtk-2.0,
+         gir1.2-webkit-1.0,
+         python-dmedia (= ${source:Version}),
+         python-gobject,
+         ${misc:Depends},
+         ${python:Depends}
+Description: A distributed media library (GTK+ interface)
+ DMedia is a simple distributed media library which greatly
+ facilitates playing of media files and storing their metadata
+ for quick access. It stores the metadata of the media files in
+ CouchDB. Media files can also be loaded remotely over a network
+ connection.
+ .
+ This package installs dmedia-gtk, a GTK+ graphical interface
+ to the DMedia library.
diff --git a/debian/python-dmedia.install b/debian/python-dmedia.install
index 75d1b1e..04dc3ef 100644
--- a/debian/python-dmedia.install
+++ b/debian/python-dmedia.install
@@ -1,3 +1,4 @@
 /usr/lib/*
 /usr/share/dbus-1/*
+/usr/share/icons/*
 /usr/share/pixmaps/*

-- 
dmedia packaging