Branches for Wily

Author: Artur Rona
Revision Date: 2015-01-27 10:52:03 UTC

* Merge from Debian unstable. Remaining changes:
  - debian/capi.conf:
    + Fix typo for fcdsl2 firmware.
  - debian/capiutils.maintscript:
    + Handle migrating the blacklist file from
      /etc/modprobe.d/blacklist-capiutils.conf to the path used
      in Debian, /etc/modprobe.d/capiutils.conf.
  - debian/control:
    + Switch Build-Depends libreadline5-dev to libreadline-gplv2-dev
      since this package appears to be GPLv2.
  - debian/event.d-ttyI0, debian/event.d-ttyI1,
    debian/isdnutils-base.examples, debian/isdnvboxserver.examples:
    + Add examples scripts, which need to be installed in /etc/*.
    + The two upstart scripts need to be edited.
    + Further improvements and documentation welcome.
  - debian/ipppd.maintscript:
    + Handle rename of /etc/ppp/ip-down.d/99-ipppd and
      /etc/ppp/ip-up.d/00-ipppd to /etc/ppp/ip-down.d/ipppd
      and /etc/ppp/ip-up.d/ipppd.
  - debian/isdnutils-base.cron.d:
    + Drop, it isn't a cronjob example at all
      but an inittab example gone astray.
  - debian/isdnvboxserver.postinst:
    + Remove dependencies on /etc/inittab.
    + Disable the installation code to modify /etc/inittab.
  - debian/patches/capifax*.patch:
    + Apply patches that were preserved in the 3.0 (quilt)
      migration, but were inadvertently not applied.
  - debian/patches/no-imake.patch:
    + Don't build xisdnload/xmonisdn using xmkmf/imake. This patch
      was dropped in Debian without explanation. It still applies
      and seems to still be a good idea for eventual upstreaming,
      since imake is quite obsolete.
* Drop following changes:
  - debian/isdnutils-base.maintscript:
    + Debian removes already that script instead of renaming,
      see Debian Bug 696829.