[vdr] 06/06: Merge branch 'master' into e-tobi

[Tobias Grimm]

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

tiber-guest pushed a commit to annotated tag debian/2.2.0-2_etobi4
in repository vdr.

commit bb2350d0fb724e0a6d918de918150b84a422113a
Merge: 1108872 b524765
Author: etobi <git at e-tobi.net>
Date:   Sun Sep 20 22:42:01 2015 +0200

    Merge branch 'master' into e-tobi

 debian/README.Debian                               |  9 ++-
 debian/changelog                                   | 10 +++
 debian/dh-addon-vdrplugin/dh_vdrplugin_migrate     | 92 ----------------------
 .../dh-addon-vdrplugin/postinst-vdrplugin-migrate  | 69 ----------------
 debian/dh-addon-vdrplugin/postrm-vdrplugin-migrate | 29 -------
 .../dh-addon-vdrplugin/preinst-vdrplugin-migrate   | 22 ------
 debian/dh-addon-vdrplugin/vdrplugin.pm             |  2 -
 debian/merge-commands.sh                           | 14 ++--
 debian/vdr-dev.install                             |  1 -
 debian/vdr.NEWS                                    | 31 +++++++-
 debian/vdr.dirs                                    |  1 +
 debian/vdr.postinst                                |  9 ++-
 debian/vdr.postrm                                  |  5 ++
 debian/vdr.preinst                                 | 12 +++
 14 files changed, 77 insertions(+), 229 deletions(-)

diff --cc debian/changelog
index b8b0f69,925f9ea..2bdf881
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,11 +1,25 @@@
 -vdr (2.2.0-1) unstable; urgency=medium
++vdr (2.2.0-2~etobi4) unstable; urgency=medium
++
++  * Dropped the autmatic migration of the old config files
++
++ -- Tobias Grimm <etobi at debian.org>  Sun, 20 Sep 2015 22:41:48 +0200
++
 +vdr (2.2.0-2~etobi3) unstable; urgency=medium
 +
 +  * Fixed a bug in plugin preinst, if it is called before VDR is installed
 +
 + -- Tobias Grimm <etobi at debian.org>  Sun, 06 Sep 2015 16:47:01 +0200
 +
 +vdr (2.2.0-2~etobi2) unstable; urgency=medium
 +
 +  * Added systemd support
 +  * Removed ENABLED setting from /etc/default/vdr - the vdr daemon is now
 +    enabled by default and might be disabled manuall via update-rc.d / systemctl
 +
 + -- Tobias Grimm <etobi at debian.org>  Sun, 30 Aug 2015 18:09:04 +0200
 +
 +vdr (2.2.0-2~etobi1) unstable; urgency=medium
  
 -  * New upstream release
 -  * Dropped upgrade code for pre-Squeeze releases
 -  * Default video directory is now /var/lib/video because multiple video
 -    directories are not supported anymore
 -  * When LIRC is set to an empty string, disable LIRC. By default use
 -    /var/run/lirc/lircd
    * Updated copyright
    * Arguments for vdr are now read from /etc/vdr/conf.d/
    * Plugins must provide a config, which may cointain plugin arguments, in
@@@ -24,46 -16,15 +30,50 @@@
     --chartab command line argument
    * Removed dvb-modules reloading code (Closes: #512362)
    * Added bash completion for svdrpesend (taken from yaVDR / Lars Hanisch)
+   * Added systemd support
+   * Removed ENABLED setting from /etc/default/vdr - the vdr daemon is now
+     enabled by default and might be disabled manuall via update-rc.d / systemctl
+   * Removed bashism from merge-commands.conf (Closes: #799483)
  
 - -- Tobias Grimm <etobi at debian.org>  Tue, 15 Sep 2015 23:53:12 +0200
 + -- Tobias Grimm <etobi at debian.org>  Mon, 23 Mar 2015 20:03:33 +0100
  
 -vdr (2.0.6-2) unstable; urgency=medium
 +vdr (2.2.0-1~etobi4) unstable; urgency=medium
  
 +  * Install channels.conf.sat as default channels.conf file
 +  * Dropped the default video directory link
 +
 + -- Tobias Grimm <etobi at debian.org>  Thu, 12 Mar 2015 16:09:09 +0100
 +
 +vdr (2.2.0-1~etobi3) unstable; urgency=medium
 +
 +  * When LIRC is set to an empty string, disable LIRC. By default use
 +    /var/run/lirc/lircd
 +
 + -- Tobias Grimm <etobi at debian.org>  Sun, 01 Mar 2015 19:33:54 +0100
 +
 +vdr (2.2.0-1~etobi2) unstable; urgency=medium
 +
 +  * Dropped upgrade code for pre-Squeeze releases
 +  * Default video directory is now /var/lib/video because multiple video
 +    directories are not supported anymore
 +
 + -- Tobias Grimm <etobi at debian.org>  Sun, 22 Feb 2015 11:42:27 +0100
 +
 +vdr (2.2.0-1~etobi1) unstable; urgency=medium
 +
 +  * New upstream release
 +  * New ABI version 2.2.0
 +
 + -- Tobias Grimm <etobi at debian.org>  Thu, 19 Feb 2015 12:29:13 +0100
 +
 +vdr (2.1.10-1~etobi1) unstable; urgency=medium
 +
 +  * New upstream release
 + -- Tobias Grimm <etobi at debian.org>  Thu, 12 Feb 2015 18:51:55 +0100
 +
 +vdr (2.1.9-1~etobi1) unstable; urgency=medium
 +
 +  * New upstream release
    * Merged from Jessie-version 2.0.3-3: Fixed use of getent in postinst script
      for detecting existing vdr user and group (Closes: #770773)
    * Standards-Version: 3.9.6
diff --cc debian/vdr.NEWS
index ef1772b,6163319..6fd15be
--- a/debian/vdr.NEWS
+++ b/debian/vdr.NEWS
@@@ -1,5 -1,19 +1,19 @@@
 -vdr (2.2.0-1) unstable; urgency=medium
 +vdr (2.2.0-1~etobi2) unstable; urgency=low
  
+   * New VDR configuration file
+ 
+   All command line options are now configured in /etc/vdr/conf.d/00-vdr.conf.
+   The following config options formerly configured in /etc/default/vdr must
+   manually be moved to 00-vdr.conf:
+ 
+   VIDEO_DIR (--video), SVDRP_PORT (--port), USER (--user), LIRC (--lirc),
+   VFAT (--vfat), VDR_CHARSET_OVERRID (--chartab)
+ 
+   See man(1) vdr. You can also run the following command, which will try to
+   migrate these options automatically:
+ 
+   sh /usr/share/vdr/migrate-old-config.sh || true
+ 
    * Now using /etc/vdr/conf.d for loading plugins
  
    VDR plugin packages now install a config file to /etc/vdr/conf.avail/.

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