[SCM] gerbera/master: Merge all gerbera packages into one

jcowgill at users.alioth.debian.org jcowgill at users.alioth.debian.org
Sat Sep 23 17:48:14 UTC 2017 

The following commit has been merged in the master branch:
commit afd698e74d7182b34f6d01c1e346fc0c465129ce
Author: James Cowgill <jcowgill at debian.org>
Date:   Tue Jun 20 09:13:58 2017 +0100

    Merge all gerbera packages into one
    
    There isn't much point in keeping these 3 packages separate. The main
    differences between installing gerbera and gerbera-common are:
    - gerbera ships the desktop files.
    - gerbera-daemon ships the init scripts.
    
    Usually these things would be shipped in the same package as the
    binary, and both can be easily ignored / disabled by the administrator
    if they want to.
    
    Also move www-browser recommends to suggests (while we're moving
    packages about).

diff --git a/debian/control b/debian/control
index 30858e3..6ca3121 100644
--- a/debian/control
+++ b/debian/control
@@ -25,13 +25,16 @@ Homepage: https://gerbera.io/
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/gerbera.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/gerbera.git
 
-Package: gerbera-common
+Package: gerbera
 Architecture: any
 Depends:
+ adduser (>= 3.34),
+ lsb-base (>= 3.2-14),
  libjs-prototype,
  ${misc:Depends},
  ${shlibs:Depends}
-Description: UPnP MediaServer (base package)
+Suggests: firefox-esr | www-browser
+Description: UPnP MediaServer
  MediaTomb is an UPnP MediaServer with a nice web user interface, it allows you
  to stream your digital media through your home network and listen to/watch it
  on a variety of UPnP compatible devices.
@@ -40,45 +43,3 @@ Description: UPnP MediaServer (base package)
  on http://www.upnp.org/. The current implementation focuses on parts that are
  required by the specification, however MediaTomb's functionality is extended to
  cover the optional parts of the spec as well.
- .
- This package contains the binary, the manpage, and everything needed for
- scripting and the web interface.
-
-Package: gerbera-daemon
-Architecture: all
-Depends:
- adduser (>= 3.34),
- lsb-base (>= 3.2-14),
- gerbera-common (>= ${source:Version}),
- ${misc:Depends}
-Description: UPnP MediaServer (daemon package)
- MediaTomb is an UPnP MediaServer with a nice web user interface, it allows you
- to stream your digital media through your home network and listen to/watch it
- on a variety of UPnP compatible devices.
- .
- MediaTomb implements the UPnP MediaServer V 1.0 specification that can be found
- on http://www.upnp.org/. The current implementation focuses on parts that are
- required by the specification, however MediaTomb's functionality is extended to
- cover the optional parts of the spec as well.
- .
- This package contains the files needed to run gerbera as a daemon.
-
-Package: gerbera
-Architecture: all
-Depends:
- iceweasel | firefox | www-browser,
- gerbera-daemon (>= ${source:Version}),
- ${misc:Depends}
-Description: UPnP MediaServer (main package)
- MediaTomb is an UPnP MediaServer with a nice web user interface, it allows you
- to stream your digital media through your home network and listen to/watch it
- on a variety of UPnP compatible devices.
- .
- MediaTomb implements the UPnP MediaServer V 1.0 specification that can be found
- on http://www.upnp.org/. The current implementation focuses on parts that are
- required by the specification, however MediaTomb's functionality is extended to
- cover the optional parts of the spec as well.
- .
- This package contains the desktop file needed to access the web ui using a
- system's default web browser. This package also acts as a virtual package to
- install all other gerbera packages.
diff --git a/debian/gerbera-daemon.dirs b/debian/dirs
similarity index 100%
rename from debian/gerbera-daemon.dirs
rename to debian/dirs
diff --git a/debian/gerbera-common.install b/debian/gerbera-common.install
deleted file mode 100644
index f7177e8..0000000
--- a/debian/gerbera-common.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/share
diff --git a/debian/gerbera-common.links b/debian/gerbera-common.links
deleted file mode 100644
index 04b054f..0000000
--- a/debian/gerbera-common.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/javascript/prototype/prototype.js /usr/share/gerbera/web/js/prototype.js
diff --git a/debian/gerbera-daemon.README.Debian b/debian/gerbera-daemon.README.Debian
deleted file mode 100644
index a3cf3f2..0000000
--- a/debian/gerbera-daemon.README.Debian
+++ /dev/null
@@ -1,41 +0,0 @@
-Disabled User-Interface
---------------------------------------------------------------------------
-For security reasons, the Debian package has disabled the user-interface
-by default, as having the interface enabled, would allow anyone in the
-same network as your mediatomb-daemon to access your filesystem (as user
-'mediatomb') without any authentication.
-Note that the 'mediatomb' user does not have excessive permissions (but
-arguably more than any random person who can connect to your network should
-have).
-For a discussion of this issue, see Debian bugs #580120 & #778669.
-To enable the user-interface, edit /etc/mediatomb/config.xml and change the
-line containing
-    <ui enabled="no" ...
-to
-    <ui enabled="yes" ...
-If you do that, you should make sure to protect your data otherwise (e.g. by
-enabling user accounts, making sure that the daemon only listens on 127.0.0.1
-and so on).
---------------------------------------------------------------------------
-
-
-Upgrading to mediatomb_0.12.0~svn2018-1
---------------------------------------------------------------------------
-If you are upgrading mediatomb-daemon to the Debian package version
-0.12.0~svn2018-1, the sqlite database file /var/lib/mediatomb/sqlite3.db will be
-copied to /var/lib/mediatomb/mediatomb.db. This is taken care of by the
-maintainer scripts. The old sqlite3.db is kept as a backup.
---------------------------------------------------------------------------
-
-Upgrading to mediatomb-0.10.0.dfsg1
---------------------------------------------------------------------------
-If you are upgrading mediatomb-daemon to the Debian package version
-0.10.0.dfsg1, you will need to remove the old init and default scripts that
-were named "mediatomb-daemon" and remove the system startup links for the old
-script. This upgrade will make no attempt to remove the old files. Here's a
-quick command line example of what should be done.
-
-rm /etc/init.d/mediatomb-daemon
-rm /etc/default/mediatomb-daemon
-update-rc.d mediatomb-daemon remove
---------------------------------------------------------------------------
diff --git a/debian/gerbera-daemon.install b/debian/gerbera-daemon.install
deleted file mode 100644
index 894bc81..0000000
--- a/debian/gerbera-daemon.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/config.xml etc/gerbera/
diff --git a/debian/gerbera-daemon.NEWS b/debian/gerbera.NEWS
similarity index 100%
rename from debian/gerbera-daemon.NEWS
rename to debian/gerbera.NEWS
diff --git a/debian/gerbera.README.Debian b/debian/gerbera.README.Debian
index 2895859..a3cf3f2 100644
--- a/debian/gerbera.README.Debian
+++ b/debian/gerbera.README.Debian
@@ -1,5 +1,41 @@
-The package "mediatomb" simply installs the desktop file to access the web ui
-and also acts as a virtual package that will install the main mediatomb packages
-that contain the program, and the mediatomb init scripts.
+Disabled User-Interface
+--------------------------------------------------------------------------
+For security reasons, the Debian package has disabled the user-interface
+by default, as having the interface enabled, would allow anyone in the
+same network as your mediatomb-daemon to access your filesystem (as user
+'mediatomb') without any authentication.
+Note that the 'mediatomb' user does not have excessive permissions (but
+arguably more than any random person who can connect to your network should
+have).
+For a discussion of this issue, see Debian bugs #580120 & #778669.
+To enable the user-interface, edit /etc/mediatomb/config.xml and change the
+line containing
+    <ui enabled="no" ...
+to
+    <ui enabled="yes" ...
+If you do that, you should make sure to protect your data otherwise (e.g. by
+enabling user accounts, making sure that the daemon only listens on 127.0.0.1
+and so on).
+--------------------------------------------------------------------------
 
-The main documentation for mediatomb is under /usr/share/doc/mediatomb-common.
+
+Upgrading to mediatomb_0.12.0~svn2018-1
+--------------------------------------------------------------------------
+If you are upgrading mediatomb-daemon to the Debian package version
+0.12.0~svn2018-1, the sqlite database file /var/lib/mediatomb/sqlite3.db will be
+copied to /var/lib/mediatomb/mediatomb.db. This is taken care of by the
+maintainer scripts. The old sqlite3.db is kept as a backup.
+--------------------------------------------------------------------------
+
+Upgrading to mediatomb-0.10.0.dfsg1
+--------------------------------------------------------------------------
+If you are upgrading mediatomb-daemon to the Debian package version
+0.10.0.dfsg1, you will need to remove the old init and default scripts that
+were named "mediatomb-daemon" and remove the system startup links for the old
+script. This upgrade will make no attempt to remove the old files. Here's a
+quick command line example of what should be done.
+
+rm /etc/init.d/mediatomb-daemon
+rm /etc/default/mediatomb-daemon
+update-rc.d mediatomb-daemon remove
+--------------------------------------------------------------------------
diff --git a/debian/gerbera-common.examples b/debian/gerbera.examples
similarity index 100%
rename from debian/gerbera-common.examples
rename to debian/gerbera.examples
diff --git a/debian/gerbera.install b/debian/gerbera.install
index b31dfc9..5fafe00 100644
--- a/debian/gerbera.install
+++ b/debian/gerbera.install
@@ -1,2 +1,3 @@
 artwork/gerbera.xpm usr/share/pixmaps/
 debian/gerbera.desktop usr/share/applications/
+debian/config.xml etc/gerbera/
diff --git a/debian/gerbera.links b/debian/gerbera.links
index 60bbe2a..444d727 100644
--- a/debian/gerbera.links
+++ b/debian/gerbera.links
@@ -1 +1,2 @@
 /usr/share/gerbera/web/icons/mt-icon120.png usr/share/pixmaps/mediatomb.png
+/usr/share/javascript/prototype/prototype.js /usr/share/gerbera/web/js/prototype.js

-- 
gerbera packaging

More information about the pkg-multimedia-commits mailing list