[vdr] 01/02: Merge branch 'master' into e-tobi
Tobias Grimm
tiber-guest at moszumanska.debian.org
Sun Oct 18 09:35:55 UTC 2015
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to annotated tag debian/2.2.0-4_etobi1
in repository vdr.
commit bca8374247a8eb1f1d4d7096b20695b0b85cfaa3
Merge: c37cdff 3ecf81a
Author: Tobias Grimm <etobi at debian.org>
Date: Sun Oct 18 11:30:50 2015 +0200
Merge branch 'master' into e-tobi
debian/.vdr-patches | 1 +
debian/changelog | 10 ++++++++++
debian/control | 5 ++++-
debian/dh-addon-vdrplugin/dh_vdrplugin_enable | 2 +-
debian/patches/series | 1 +
debian/patches/systemd.patch | 19 +++++++++++++++++++
debian/patchinfo | 5 +++++
debian/rules | 5 +----
debian/vdr.NEWS | 2 +-
9 files changed, 43 insertions(+), 7 deletions(-)
diff --cc debian/.vdr-patches
index 7a16ff0,924e974..0b0727d
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@@ -2,9 -2,3 +2,10 @@@
06_default_svdrp_port_0.patch:98fc8d7a9f450374de5e5690ad4c98c7
12_osdbase-maxitems.patch:c5bf663d8e89d441eb9c040403e19228
99_ncursesw-include.patch:98a6f4705b312dc9de9775e867e95d54
++systemd.patch:263b8db8a6cb952fe9157dbf4c76aaa5
+opt-27_ttxtsubs.patch:a1aeece65cc723e38b65fbfb8d10edf3
+opt-37-x_menuorg.patch:5af45321309b1e723d89e5c6dc1c947f
+opt-41-x_timer-info.patch:571ca43774dbd768cd9d90552fd1442d
+opt-42-x_MainMenuHooks.patch:7ccacd9d4d79efbb2b9341c3d8e366a9
+opt-45_yaepg.patch:f867903d4be9339198bdb22e823b679e
+opt-50_graphtft.patch:7de63c9d4e2a8de754297ae40b367e01
diff --cc debian/changelog
index dd523b5,4f769c2..4203156
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,24 +1,14 @@@
-vdr (2.2.0-5) UNRELEASED; urgency=medium
-
-
- -- Tobias Grimm <etobi at debian.org> Sat, 17 Oct 2015 11:18:04 +0200
-
-vdr (2.2.0-4) unstable; urgency=medium
++vdr (2.2.0-4~etobi1) UNRELEASED; urgency=medium
+
+ * Fixed installation of auto generated plugin config to happen before
+ dh_fixperms
-
- -- Tobias Grimm <etobi at debian.org> Tue, 06 Oct 2015 23:25:03 +0200
-
-vdr (2.2.0-3) unstable; urgency=medium
-
+ * Build-depend on libsystemd-dev
+ * Force sorting of files in dh_vdrplugin_enable to get a reproducible build
+ * Mark the plugin packages as enhancements to the vdr package
+
- -- Tobias Grimm <etobi at debian.org> Mon, 05 Oct 2015 21:36:30 +0200
++ -- Tobias Grimm <etobi at debian.org> Sat, 26 Sep 2015 22:51:50 +0200
+
-vdr (2.2.0-2) unstable; urgency=medium
+vdr (2.2.0-3~etobi5) unstable; urgency=medium
* Use debhelper addon for dvb(sd|hd)device plugins
diff --cc debian/patches/series
index cfc095b,95e714e..ee12f60
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -3,27 -3,4 +3,28 @@@
12_osdbase-maxitems.patch
99_ncursesw-include.patch
+ systemd.patch
+
+# Patch needed for the ttxtsubs plugin.
+opt-27_ttxtsubs.patch
+
+# Speed up zapping channels.
+# opt-29_syncearly.patch
+
+# Patch that shows if there is a valid setup value left or right with < and >.
+# opt-35_setup-show-valid.patch
+
+# Patch needed for the menuorg plugin.
+opt-37-x_menuorg.patch
+
+# Patch to show an info, if it is possible to record an event in the timer-info.
+opt-41-x_timer-info.patch
+
+# Patch to allow plugins to replace the VDR mainmenus
+opt-42-x_MainMenuHooks.patch
+
+# Patch needed for the yaepg plugin.
+opt-45_yaepg.patch
+
+# Patch required for the GraphTFT plugin
+opt-50_graphtft.patch
diff --cc debian/patchinfo
index c453690,1e7ae1e..20c5f3c
--- a/debian/patchinfo
+++ b/debian/patchinfo
@@@ -23,38 -23,3 +23,43 @@@ Patches applied to vanilla vdr source
Use ncursesw header file
++systemd.patch
++ Tobias Grimm <etobi at debian.org>
++
++ Use libsystemd instead of transitional libsystemd-daemon
++
+opt-27_ttxtsubs.patch
+ Tobias Grimm <vdr at e-tobi.net>
+
+ This patch is needed for the ttxtsubs plugin.
+
+opt-37-x_menuorg.patch
+ Tobias Grimm <tg at e-tobi.net>
+
+ This patch is required by the MenuOrg plugin. It adds a service interface,
+ that can be implemented by plugins to reorganize VDR's main menu entries
+ with the ability to create custom sub menus. This is version 0.4.s of the
+ patch
+
+opt-41-x_timer-info.patch
+ Andreas Brugger <brougs78 at gmx.net>, Thomas G�nther <tom at toms-cafe.de>
+
+ Shows info, if it is possible to record an event in the timer-info of vdr -
+ see README.timer-info for details.
+
+opt-42-x_MainMenuHooks.patch
+ Frank Schmirler <vdrdev at schmirler.de>
+
+ This patch allows plugins to replace the VDR mainmenus "Schedule",
+ "Channels", "Timers" and "Recordings" by a different implementation.
+
+opt-45_yaepg.patch
+ bball950 at yahoo.com
+
+ This patch is needed for the yaepg plugin.
+
+opt-50_graphtft.patch
+ Jörg Wendel (Horchi)
+
+ Patch required for the GraphTFT plugin.
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr.git
More information about the pkg-vdr-dvb-changes
mailing list