[vdr] branch e-tobi updated (538e25d -> c37cdff)

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a change to branch e-tobi
in repository vdr.

      from  538e25d   Release
      adds  b8ed752   Make sure conf.d gets created in plugin preinst, if vdr is not yet installed
      adds  30919df   Merge branch 'master' into e-tobi
      adds  1108872   Fixed a bug in plugin preinst, if it is called before VDR is installed
      adds  31106f3   Updated README.Debian
      adds  5d3cfb2   Updated vdr.NEWS
      adds  0b26fe5   Do not try to migrate the config on new installation
      adds  d33ee7b   Remove obsolete /etc/vdr/order.conf
      adds  5d26d1b   Dropped the automatic migration of the old vdr and plugin config settings and added a note to NEWS.
      adds  534d067   explictitly added /etc/vdr/plugins to dirs
      adds  b524765   Removed bashism from merge-commands.conf (Closes: #799483)
      adds  bb2350d   Merge branch 'master' into e-tobi
       new  b9f4ddd   Release
       new  a1ba55d   Use debhelper addon for dvb(sd|hd)device plugins
       new  17ef883   Update changelog for 2.2.0-2 release
       new  c37cdff   Merge branch 'master' into e-tobi

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/README.Debian                               |  9 ++-
 debian/changelog                                   | 22 ++++++
 debian/dh-addon-vdrplugin/dh_vdrplugin_migrate     | 92 ----------------------
 .../dh-addon-vdrplugin/postinst-vdrplugin-migrate  | 69 ----------------
 debian/dh-addon-vdrplugin/postrm-vdrplugin-migrate | 29 -------
 debian/dh-addon-vdrplugin/preinst-vdrplugin-enable |  1 +
 .../dh-addon-vdrplugin/preinst-vdrplugin-migrate   | 22 ------
 debian/dh-addon-vdrplugin/vdrplugin.pm             |  2 -
 debian/merge-commands.sh                           | 14 ++--
 debian/rules                                       |  4 +
 debian/vdr-dev.install                             |  1 -
 debian/vdr-plugin-dvbhddevice.postinst             | 11 ---
 debian/vdr-plugin-dvbsddevice.postinst             | 11 ---
 debian/vdr.NEWS                                    | 31 +++++++-
 debian/vdr.dirs                                    |  1 +
 debian/vdr.postinst                                |  9 ++-
 debian/vdr.postrm                                  |  5 ++
 debian/vdr.preinst                                 | 12 +++
 18 files changed, 94 insertions(+), 251 deletions(-)
 delete mode 100755 debian/dh-addon-vdrplugin/dh_vdrplugin_migrate
 delete mode 100644 debian/dh-addon-vdrplugin/postinst-vdrplugin-migrate
 delete mode 100644 debian/dh-addon-vdrplugin/postrm-vdrplugin-migrate
 delete mode 100644 debian/dh-addon-vdrplugin/preinst-vdrplugin-migrate
 delete mode 100644 debian/vdr-plugin-dvbhddevice.postinst
 delete mode 100644 debian/vdr-plugin-dvbsddevice.postinst
 create mode 100644 debian/vdr.preinst

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr.git