[SCM] dmedia/master: debian/*.install: Make appropriate changes for split up of separate DMedia components into individual binary packages.

bilalakhtar-guest at users.alioth.debian.org bilalakhtar-guest at users.alioth.debian.org
Sun May 15 08:10:36 UTC 2011 

The following commit has been merged in the master branch:
commit 65a8331167e7005ae2bc5f3a9fb277bede1c9702
Author: Bilal Akhtar <bilalakhtar at ubuntu.com>
Date:   Sun May 15 13:40:12 2011 +0530

    debian/*.install: Make appropriate changes for split up of separate DMedia components into individual binary packages.

diff --git a/.gitignore b/.gitignore
index 224e7f0..535727b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 .pc/
+build/
+dmedia/__init__.pyc
diff --git a/debian/changelog b/debian/changelog
index 09dfb7e..5b24a71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,14 @@
-dmedia (0.5.0~repack-1) experimental; urgency=low
+dmedia (0.6.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).
+  * debian/*.install: Make appropriate changes for split up of separate
+    DMedia components into individual binary packages.
 
- -- Bilal Akhtar <bilalakhtar at ubuntu.com>  Tue, 12 Apr 2011 10:50:53 +0300
+ -- Bilal Akhtar <bilalakhtar at ubuntu.com>  Sun, 15 May 2011 13:38:48 +0530
 
 dmedia (0.3.0~repack-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index ad505e9..92306ce 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,6 @@ Depends: libimage-exiftool-perl,
          ${misc:Depends},
          ${python:Depends}
 Recommends: dmedia-service
-Suggests: python-appindicator
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: A distributed media library (Python modules)
@@ -39,7 +38,7 @@ Description: A distributed media library (Python modules)
 
 Package: dmedia
 Architecture: all
-Depends: dmedia-importer, dmedia-service
+Depends: dmedia-gtk, 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
@@ -69,11 +68,12 @@ Description: A distributed media library (DBus service)
 
 Package: dmedia-importer
 Architecture: all
-Depends: dmedia-gtk,
+Depends: dmedia-service (= ${source:Version}),
          gir1.2-notify-0.7,
          python-dmedia (= ${source:Version}),
          ${misc:Depends},
          ${python:Depends}
+Recommends: dmedia-gtk
 Suggests: gir1.2-appindicator-0.1
 Description: A distributed media library (Media Importer)
  DMedia is a simple distributed media library which greatly
@@ -82,14 +82,16 @@ Description: A distributed media library (Media Importer)
  CouchDB. Media files can also be loaded remotely over a network
  connection.
  .
- This package installs the following command-line tools to
+ This package contains the following command-line tools to
  facilitate media file importing into the DMedia library:
   * dmedia-cli
   * dmedia-import
 
 Package: dmedia-gtk
 Architecture: all
-Depends: dmedia-service (= ${source:Version}),
+Depends: dmedia-importer (= ${source:Version}),
+         dmedia-service (= ${source:Version}),
+         dmedia-webui (= ${source:Version}),
          gir1.2-gtk-2.0,
          gir1.2-webkit-1.0,
          python-dmedia (= ${source:Version}),
@@ -103,5 +105,26 @@ Description: A distributed media library (GTK+ interface)
  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.
+ This package contains dmedia-gtk, a GTK+ graphical interface
+ to the DMedia library. It uses HTML5 web elements found in
+ dmedia-webui to display data to the user.
+
+Package: dmedia-webui
+Architecture: all
+Depends: dmedia-importer (= ${source:Version}),
+         dmedia-service (= ${source:Version}),
+         python-dmedia (= ${source:Version}),
+         python-genshi,
+         ${misc:Depends},
+         ${python:Depends}
+Recommends: dmedia-gtk
+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 contains an HTML5 + JavaScript front-end to DMedia.
+ It can be used stand-alone in a browser or using the DMedia GTK
+ browser included in package dmedia-gtk.
diff --git a/debian/dmedia-gtk.install b/debian/dmedia-gtk.install
new file mode 100644
index 0000000..7f0b4e3
--- /dev/null
+++ b/debian/dmedia-gtk.install
@@ -0,0 +1,3 @@
+/usr/bin/dmedia-gtk
+/usr/lib/python2.*/*-packages/dmedia/gtkui/*
+/usr/lib/dmedia/dummy-client
diff --git a/debian/dmedia-gtk.manpages b/debian/dmedia-gtk.manpages
new file mode 100644
index 0000000..145d497
--- /dev/null
+++ b/debian/dmedia-gtk.manpages
@@ -0,0 +1 @@
+debian/dmedia-gtk.1
diff --git a/debian/dmedia-importer.install b/debian/dmedia-importer.install
new file mode 100644
index 0000000..325391c
--- /dev/null
+++ b/debian/dmedia-importer.install
@@ -0,0 +1,8 @@
+/usr/share/dbus-1/services/org.freedesktop.DMediaImporter.service
+/usr/share/applications/*
+/usr/share/icons/*
+/usr/share/pixmaps/*
+/usr/share/man/man1/dmedia-cli.1
+/usr/bin/dmedia-cli
+/usr/bin/dmedia-import
+/usr/lib/dmedia/dmedia-importer-service
diff --git a/debian/dmedia-importer.manpages b/debian/dmedia-importer.manpages
new file mode 100644
index 0000000..8ac8623
--- /dev/null
+++ b/debian/dmedia-importer.manpages
@@ -0,0 +1 @@
+debian/dmedia-import.1
diff --git a/debian/dmedia-service.install b/debian/dmedia-service.install
new file mode 100644
index 0000000..25814cf
--- /dev/null
+++ b/debian/dmedia-service.install
@@ -0,0 +1,3 @@
+/usr/share/dbus-1/services/org.freedesktop.DMedia.service
+/usr/lib/python2.*/*-packages/dmedia/service/*
+/usr/lib/dmedia/dmedia-service
diff --git a/debian/dmedia-webui.install b/debian/dmedia-webui.install
new file mode 100644
index 0000000..e69de29
diff --git a/debian/dmedia.install b/debian/dmedia.install
index 24ad78e..e69de29 100644
--- a/debian/dmedia.install
+++ b/debian/dmedia.install
@@ -1,3 +0,0 @@
-/usr/bin/*
-/usr/share/applications/*
-/usr/share/man/*
diff --git a/debian/dmedia.manpages b/debian/dmedia.manpages
deleted file mode 100644
index 69c157f..0000000
--- a/debian/dmedia.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/dmedia-import.1
-debian/dmedia-gtk.1
diff --git a/debian/patches/01_fix_errors_in_manpage.patch b/debian/patches/01_fix_errors_in_manpage.patch
index 8a85aed..ff5c477 100644
--- a/debian/patches/01_fix_errors_in_manpage.patch
+++ b/debian/patches/01_fix_errors_in_manpage.patch
@@ -2,8 +2,8 @@ Description: Patch to fix errors in manpage
  This patch fixes a couple of errors that were in the dmedia-cli.1
  manpage. These errors were reported by Lintian.
 Author: Bilal Akhtar <bilalakhtar at ubuntu.com>
---- a/data/dmedia-cli.1
-+++ b/data/dmedia-cli.1
+--- a/share/dmedia-cli.1
++++ b/share/dmedia-cli.1
 @@ -18,19 +18,19 @@
  dmedia is simple distributed media library. Media files are given a globally unique ID based on their content-hash. Meta-data is stored in CouchDB. Meta-data for a large number of media files can be available locally (meta-data is small).  Actual media files can be loaded on-demand from peers or cloud when not available locally (media files are big).  Goals are to make synchronization super easy, and to lay groundwork for a distributed content creation workflow.
  
diff --git a/debian/patches/02_fix_couchdb_deprecated_function.patch b/debian/patches/02_fix_couchdb_deprecated_function.patch
deleted file mode 100644
index 6a017f5..0000000
--- a/debian/patches/02_fix_couchdb_deprecated_function.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
- 
- 
-@@ -206,7 +207,7 @@
-         return (user, password)
- 
-     def get_port(self):
--        return desktopcouch.find_port()
-+        return desktopcouch.application.platform.find_port()
- 
-     def get_uri(self):
-         return 'http://localhost:%s' % self.get_port()
diff --git a/debian/python-dmedia.install b/debian/python-dmedia.install
index 04dc3ef..9e63174 100644
--- a/debian/python-dmedia.install
+++ b/debian/python-dmedia.install
@@ -1,4 +1,2 @@
-/usr/lib/*
-/usr/share/dbus-1/*
-/usr/share/icons/*
-/usr/share/pixmaps/*
+/usr/lib/python2.*/*-packages/*.egg-info
+/usr/lib/python2.*/*-packages/dmedia/*.py*

-- 
dmedia packaging

More information about the pkg-multimedia-commits mailing list