-
Committer:
Adam Gandelman
-
Date:
2011-10-22 01:54:59 UTC
-
mfrom:
(3.1.7 sid)
-
Revision ID:
adamg@canonical.com-20111022015459-kx0rzv8gpef9gcmb
* Merge from Debian testing (LP: #879743). Remaining changes:
- debian/dahdi-dkms.install.in : add .version
- Import modifications by Javier Uruen Val <javi@warp.es>:
- debian/system.conf
- debian/modules
- DKMS support:
- debian/control: Added Depends to dahdi-linux (dahdi-dkms | dahdi-source)
- debian/control: Add dkms package
- debian/dahdi-dkms.install
- debian/dahdi-dkms.postinst
- debian/dahdi-dkms.prerm
- debian/dahdi-linux.install
- debian/rules: add code to automatically configure dkms.conf
- debian/dkms.conf.in
* Dropped changes:
- debian/control: Fix typo (right command is m-a a-i dahdi-source)
- debian/patches/define_spinlock: Fixed upstream
* debian/rules: Debian moved to dh, re-add code to automatically configure
dkms.conf
* debian/dkms.conf.in: update to reflect dahdi-linux-extra patch update
(opvxa1200's new location (subdir) and to include ap400 and opvxd115)
* debian/patches/zaphfc_d_channel_fix.patch: Correct typo in zaphfc module
until fix gets synced into dahdi-linux-extra patch in Debian (LP: #612091)
* New upstream release (Closes: #639702).
- Patch wcb4xxp_bn4s0e removed: merged upstream.
- Patch define_spinlock removed: merged upstream.
- Patch dahdi-linux-extra updated.
* Updated dahdi-linux-extra:
- "Upstream" is now a complete git mirror.
- Actually include ap400 in the list of modules to build.
- Updated OpenVox drivers: opvxa1200 is a subdirectory
- Updated OpenVox drivers: opvxd115 added (digital cards).
* Patch define_spinlock: include a (slightly big) build fix from upstream.
* Standards version 3.9.2 (no change needed).
* Switch to dh.
* Patch notest: Remove a bogus upstream 'test' target.
* Lintian override for an odd interpteter a dummy kernel module init script.
* Dahdi udev rules are now named 'dahdi-linux.conf'.
* Patch xpp_fix_2fxs6fxo: bugfix for Xorcom 2FXX6FXO module code.