r52047 - in /packages/unstable/gnome-dvb-daemon/debian: changelog control control.in grilo-plugins-dvb-daemon.install patches/ patches/fix-icon-logo.patch patches/series pyversions rules totem-plugins-dvb-daemon.install

bigon at users.alioth.debian.org bigon at users.alioth.debian.org
Wed Feb 22 09:21:37 UTC 2017


Author: bigon
Date: Wed Feb 22 09:21:37 2017
New Revision: 52047

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52047
Log:
* New GIT snapshot
  - Now build grilo plugin, rename totem-plugins-dvb-daemon to
    grilo-plugins-dvb-daemon
* debian/control.in: Bump debhelper compatibility version to 10
* debian/control.in: Bump Standards-Version to 3.9.8 (no further changes)
* Drop debian/patches/gstreamer-mpegts-1.0-vapi.patch, not needed anymore
* Add debian/patches/fix-icon-logo.patch: Fix some cosmetic issues
* debian/control.in: Make gnome-dvb-client depends against dtv-scan-tables
  instead of dvb-apps

Added:
    packages/unstable/gnome-dvb-daemon/debian/grilo-plugins-dvb-daemon.install
      - copied, changed from r52046, packages/unstable/gnome-dvb-daemon/debian/totem-plugins-dvb-daemon.install
    packages/unstable/gnome-dvb-daemon/debian/patches/
    packages/unstable/gnome-dvb-daemon/debian/patches/fix-icon-logo.patch
    packages/unstable/gnome-dvb-daemon/debian/patches/series
Removed:
    packages/unstable/gnome-dvb-daemon/debian/pyversions
    packages/unstable/gnome-dvb-daemon/debian/totem-plugins-dvb-daemon.install
Modified:
    packages/unstable/gnome-dvb-daemon/debian/changelog
    packages/unstable/gnome-dvb-daemon/debian/control
    packages/unstable/gnome-dvb-daemon/debian/control.in
    packages/unstable/gnome-dvb-daemon/debian/rules

Modified: packages/unstable/gnome-dvb-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-dvb-daemon/debian/changelog?rev=52047&op=diff
==============================================================================
--- packages/unstable/gnome-dvb-daemon/debian/changelog	[utf-8] (original)
+++ packages/unstable/gnome-dvb-daemon/debian/changelog	[utf-8] Wed Feb 22 09:21:37 2017
@@ -1,4 +1,4 @@
-gnome-dvb-daemon (1:0.2.90-1) UNRELEASED; urgency=medium
+gnome-dvb-daemon (1:0.2.91~git20170110-1) UNRELEASED; urgency=medium
 
   [ Emilio Pozuelo Monfort ]
   * New upstream release.
@@ -20,14 +20,20 @@
   * debian/rules: switch from dh_python2 to dh_python3
 
   [ Laurent Bigonville ]
+  * New GIT snapshot
+    - Now build grilo plugin, rename totem-plugins-dvb-daemon to
+      grilo-plugins-dvb-daemon
   * debian/control.in: Drop gnome-icon-theme from the dependencies, do not
     force an icon theme and rely on the one installed by the metapackages
   * Switch from cdbs to dh sequences
-  * debian/control: Bump debhelper compatibility version to 10
-  * debian/control: Bump Standards-Version to 3.9.8 (no further changes)
-  * debian/patches/client-python3.patch: Switch the shebang to python3
-
- -- Laurent Bigonville <bigon at debian.org>  Tue, 21 Feb 2017 15:33:03 +0100
+  * debian/control.in: Bump debhelper compatibility version to 10
+  * debian/control.in: Bump Standards-Version to 3.9.8 (no further changes)
+  * Drop debian/patches/gstreamer-mpegts-1.0-vapi.patch, not needed anymore
+  * Add debian/patches/fix-icon-logo.patch: Fix some cosmetic issues
+  * debian/control.in: Make gnome-dvb-client depends against dtv-scan-tables
+    instead of dvb-apps
+
+ -- Laurent Bigonville <bigon at debian.org>  Wed, 22 Feb 2017 10:20:18 +0100
 
 gnome-dvb-daemon (1:0.2.10-1) unstable; urgency=low
 

Modified: packages/unstable/gnome-dvb-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-dvb-daemon/debian/control?rev=52047&op=diff
==============================================================================
--- packages/unstable/gnome-dvb-daemon/debian/control	[utf-8] (original)
+++ packages/unstable/gnome-dvb-daemon/debian/control	[utf-8] Wed Feb 22 09:21:37 2017
@@ -12,11 +12,12 @@
                gnome-pkg-tools,
                gstreamer1.0-tools,
                gstreamer1.0-plugins-bad,
-               autotools-dev,
+               gstreamer1.0-plugins-good,
                intltool (>= 0.40.0),
                pkg-config,
                valac,
                libglib2.0-dev (>= 2.32.0),
+               libgrilo-0.3-dev,
                libgee-0.8-dev (>= 0.8.0),
                libsqlite3-dev (>= 3.4),
                libgudev-1.0-dev,
@@ -36,6 +37,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          gstreamer1.0-plugins-base (>= 1.4),
+         gstreamer1.0-plugins-good (>= 1.4),
          gstreamer1.0-plugins-bad (>= 1.4),
 Description: daemon to setup your DVB devices, record and watch TV shows and browse EPG
  GNOME DVB Daemon is a GStreamer based daemon to setup your
@@ -47,10 +49,10 @@
 Architecture: all
 Depends: ${misc:Depends},
          ${python3:Depends},
+         dtv-scan-tables,
          gir1.2-gtk-3.0,
          gir1.2-glib-2.0,
          gnome-dvb-daemon (>= ${source:Version}),
-Recommends: dvb-apps
 Description: client for gnome-dvb-daemon
  GNOME DVB Daemon is a GStreamer based daemon to setup your
  DVB devices, record and/or watch TV shows and browse EPG.
@@ -58,20 +60,14 @@
  This package contains the Python GTK+ client, which speaks
  to the daemon via DBUS.
 
-Package: totem-plugins-dvb-daemon
-Architecture: all
-Depends: ${misc:Depends},
-         ${python3:Depends},
-         gir1.2-glib-2.0,
-         gir1.2-gtk-3.0,
-         gir1.2-peas-1.0,
-         gir1.2-totem-1.0,
+Package: grilo-plugins-dvb-daemon
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
          gnome-dvb-client (= ${source:Version}),
          gnome-dvb-daemon (>= ${source:Version}),
-         totem,
-         totem-plugins
-Description: totem plugin for gnome-dvb-daemon
+Description: grilo plugin for gnome-dvb-daemon
  GNOME DVB Daemon is a GStreamer based daemon to setup your
  DVB devices, record and/or watch TV shows and browse EPG.
  .
- This package contains the Totem plugin.
+ This package contains the Grilo plugin.

Modified: packages/unstable/gnome-dvb-daemon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-dvb-daemon/debian/control.in?rev=52047&op=diff
==============================================================================
--- packages/unstable/gnome-dvb-daemon/debian/control.in	[utf-8] (original)
+++ packages/unstable/gnome-dvb-daemon/debian/control.in	[utf-8] Wed Feb 22 09:21:37 2017
@@ -8,11 +8,12 @@
                gnome-pkg-tools,
                gstreamer1.0-tools,
                gstreamer1.0-plugins-bad,
-               autotools-dev,
+               gstreamer1.0-plugins-good,
                intltool (>= 0.40.0),
                pkg-config,
                valac,
                libglib2.0-dev (>= 2.32.0),
+               libgrilo-0.3-dev,
                libgee-0.8-dev (>= 0.8.0),
                libsqlite3-dev (>= 3.4),
                libgudev-1.0-dev,
@@ -32,6 +33,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          gstreamer1.0-plugins-base (>= 1.4),
+         gstreamer1.0-plugins-good (>= 1.4),
          gstreamer1.0-plugins-bad (>= 1.4),
 Description: daemon to setup your DVB devices, record and watch TV shows and browse EPG
  GNOME DVB Daemon is a GStreamer based daemon to setup your
@@ -43,10 +45,10 @@
 Architecture: all
 Depends: ${misc:Depends},
          ${python3:Depends},
+         dtv-scan-tables,
          gir1.2-gtk-3.0,
          gir1.2-glib-2.0,
          gnome-dvb-daemon (>= ${source:Version}),
-Recommends: dvb-apps
 Description: client for gnome-dvb-daemon
  GNOME DVB Daemon is a GStreamer based daemon to setup your
  DVB devices, record and/or watch TV shows and browse EPG.
@@ -54,20 +56,14 @@
  This package contains the Python GTK+ client, which speaks
  to the daemon via DBUS.
 
-Package: totem-plugins-dvb-daemon
-Architecture: all
-Depends: ${misc:Depends},
-         ${python3:Depends},
-         gir1.2-glib-2.0,
-         gir1.2-gtk-3.0,
-         gir1.2-peas-1.0,
-         gir1.2-totem-1.0,
+Package: grilo-plugins-dvb-daemon
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
          gnome-dvb-client (= ${source:Version}),
          gnome-dvb-daemon (>= ${source:Version}),
-         totem,
-         totem-plugins
-Description: totem plugin for gnome-dvb-daemon
+Description: grilo plugin for gnome-dvb-daemon
  GNOME DVB Daemon is a GStreamer based daemon to setup your
  DVB devices, record and/or watch TV shows and browse EPG.
  .
- This package contains the Totem plugin.
+ This package contains the Grilo plugin.

Copied: packages/unstable/gnome-dvb-daemon/debian/grilo-plugins-dvb-daemon.install (from r52046, packages/unstable/gnome-dvb-daemon/debian/totem-plugins-dvb-daemon.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-dvb-daemon/debian/grilo-plugins-dvb-daemon.install?rev=52047&op=diff
==============================================================================
--- packages/unstable/gnome-dvb-daemon/debian/totem-plugins-dvb-daemon.install	[utf-8] (original)
+++ packages/unstable/gnome-dvb-daemon/debian/grilo-plugins-dvb-daemon.install	[utf-8] Wed Feb 22 09:21:37 2017
@@ -1,2 +1,2 @@
-usr/lib/totem/plugins/dvb-daemon/*.py
-usr/lib/totem/plugins/dvb-daemon/*.plugin
+usr/lib/*/grilo-0.3/grl-dvb-daemon.xml
+usr/lib/*/grilo-0.3/libgrldvbdaemon.so

Added: packages/unstable/gnome-dvb-daemon/debian/patches/fix-icon-logo.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-dvb-daemon/debian/patches/fix-icon-logo.patch?rev=52047&op=file
==============================================================================
--- packages/unstable/gnome-dvb-daemon/debian/patches/fix-icon-logo.patch	(added)
+++ packages/unstable/gnome-dvb-daemon/debian/patches/fix-icon-logo.patch	[utf-8] Wed Feb 22 09:21:37 2017
@@ -0,0 +1,40 @@
+Description: Fix icon name and add logo and application name in about dialog
+Author: Laurent Bigonville <bigon at debian.org>
+Forwarded: yes
+
+diff --git a/client/gnomedvb/__init__.py b/client/gnomedvb/__init__.py
+index c9a2c83..c840197 100644
+--- a/client/gnomedvb/__init__.py
++++ b/client/gnomedvb/__init__.py
+@@ -32,7 +32,8 @@ _ = t.gettext
+ INFOS = {
+     "authors": ["Sebastian Pölsterl <sebp at k-d-w.org>"],
+     "copyright" : "Copyright © 2008-2014\nSebastian Pölsterl.",
+-    "name" : _("GNOME DVB Daemon"),
++    "logo-icon-name": "gnome-dvb-daemon",
++    "program-name" : _("GNOME DVB Daemon"),
+     "version" : gnomedvb.defs.VERSION,
+     "website" : "https://wiki.gnome.org/Projects/DVBDaemon",
+     "website-label" : _("GNOME DVB Daemon Website"),
+diff --git a/client/gnomedvb/ui/controlcenter/ControlCenterWindow.py b/client/gnomedvb/ui/controlcenter/ControlCenterWindow.py
+index e3baa1f..b68b5d4 100644
+--- a/client/gnomedvb/ui/controlcenter/ControlCenterWindow.py
++++ b/client/gnomedvb/ui/controlcenter/ControlCenterWindow.py
+@@ -224,7 +224,7 @@ class ControlCenterWindow(Gtk.Window):
+         self.timersitem.set_image(timers_image)
+         self.timersitem.set_sensitive(False)
+ 
+-        recordings_image = Gtk.Image.new_from_icon_name("video", Gtk.IconSize.MENU)
++        recordings_image = Gtk.Image.new_from_icon_name("video-x-generic", Gtk.IconSize.MENU)
+         recordings_image.show()
+ 
+         recordings = uimanager.get_widget('/MenuBar/Timers/Recordings')
+@@ -273,7 +273,7 @@ class ControlCenterWindow(Gtk.Window):
+         self.button_display_timers.show()
+         self.toolbar.insert(self.button_display_timers, 0)
+ 
+-        recordings_image = Gtk.Image.new_from_icon_name("video", Gtk.IconSize.MENU)
++        recordings_image = Gtk.Image.new_from_icon_name("video-x-generic", Gtk.IconSize.MENU)
+         recordings_image.show()
+ 
+         button_recordings = Gtk.ToolButton(icon_widget=recordings_image, label=_("Recordings"))

Added: packages/unstable/gnome-dvb-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-dvb-daemon/debian/patches/series?rev=52047&op=file
==============================================================================
--- packages/unstable/gnome-dvb-daemon/debian/patches/series	(added)
+++ packages/unstable/gnome-dvb-daemon/debian/patches/series	[utf-8] Wed Feb 22 09:21:37 2017
@@ -0,0 +1 @@
+fix-icon-logo.patch

Modified: packages/unstable/gnome-dvb-daemon/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-dvb-daemon/debian/rules?rev=52047&op=diff
==============================================================================
--- packages/unstable/gnome-dvb-daemon/debian/rules	[utf-8] (original)
+++ packages/unstable/gnome-dvb-daemon/debian/rules	[utf-8] Wed Feb 22 09:21:37 2017
@@ -6,8 +6,10 @@
 	dh $@ --with gnome,python3
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-totem-plugin --with-totem-plugin-dir=/usr/lib/totem/plugins
+	dh_auto_configure -- --enable-grilo-plugin
 
 override_dh_python3:
 	dh_python3 -p gnome-dvb-client
-	dh_python3 -p totem-plugins-dvb-daemon /usr/lib/totem/plugins/dvb-daemon
+
+override_dh_install:
+	dh_install --list-missing




More information about the pkg-gnome-commits mailing list