lp://staging/~gandelman-a/ubuntu/precise/dahdi-linux/merge879743

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/ubuntu/precise/dahdi-linux

Dave Walker (community): Approve on 2011-10-27

Ubuntu branches: Pending requested 2011-10-24

Diff: 58272 lines (+30285/-15281)

129 files modified

.pc/applied-patches (+3/-2)
.pc/chanmute/include/dahdi/dahdi_config.h (+19/-8)
.pc/dahdi_linux_extra/drivers/dahdi/Kbuild (+2/-5)
.pc/no_firmware_download/Makefile (+1/-1)
.pc/notest/Makefile (+222/-0)
.pc/oslec_auto/drivers/dahdi/Kbuild (+2/-5)
.pc/wcb4xxp_bn4s0e/drivers/dahdi/wcb4xxp/base.c (+0/-3047)
.pc/xpp_fix_2fxs6fxo/drivers/dahdi/xpp/card_fxs.c (+1649/-0)
.version (+1/-1)
ChangeLog (+1067/-0)
Makefile (+1/-4)
README (+20/-1)
build_tools/live_dahdi (+11/-2)
dahdi-linux-2.4.1-summary.html (+0/-237)
dahdi-linux-2.4.1-summary.txt (+0/-459)
debian/changelog (+49/-0)
debian/control (+2/-2)
debian/dahdi-linux.dahdi.udev (+0/-2)
debian/dahdi-linux.lintian-overrides (+2/-0)
debian/dahdi-linux.udev (+2/-0)
debian/dkms.conf.in (+10/-2)
debian/patches/dahdi_linux_extra (+6610/-329)
debian/patches/define_spinlock (+0/-234)
debian/patches/notest (+15/-0)
debian/patches/series (+3/-2)
debian/patches/wcb4xxp_bn4s0e (+0/-27)
debian/patches/xpp_fix_2fxs6fxo (+116/-0)
debian/patches/zaphfc_d_channel_fix.patch (+22/-0)
debian/rules (+14/-71)
drivers/dahdi/Kbuild (+10/-12)
drivers/dahdi/Kconfig (+32/-10)
drivers/dahdi/ap400/ap400_drv.c (+13/-14)
drivers/dahdi/dahdi-base.c (+3478/-2749)
drivers/dahdi/dahdi-sysfs.c (+230/-0)
drivers/dahdi/dahdi-version.c (+33/-0)
drivers/dahdi/dahdi.h (+37/-0)
drivers/dahdi/dahdi_dummy.c (+2/-3)
drivers/dahdi/dahdi_dynamic.c (+342/-299)
drivers/dahdi/dahdi_dynamic_eth.c (+24/-25)
drivers/dahdi/dahdi_dynamic_ethmf.c (+25/-26)
drivers/dahdi/dahdi_dynamic_loc.c (+120/-114)
drivers/dahdi/dahdi_echocan_jpah.c (+5/-3)
drivers/dahdi/dahdi_echocan_kb1.c (+5/-3)
drivers/dahdi/dahdi_echocan_mg2.c (+5/-3)
drivers/dahdi/dahdi_echocan_oslec.c (+27/-3)
drivers/dahdi/dahdi_echocan_sec.c (+5/-3)
drivers/dahdi/dahdi_echocan_sec2.c (+5/-3)
drivers/dahdi/dahdi_transcode.c (+2/-9)
drivers/dahdi/digits.h (+0/-47)
drivers/dahdi/firmware/Makefile (+14/-1)
drivers/dahdi/fxo_modes.h (+15/-15)
drivers/dahdi/hpec/dahdi_echocan_hpec.c (+5/-3)
drivers/dahdi/oct612x/include/oct6100api/oct6100_channel_inst.h (+40/-31)
drivers/dahdi/oct612x/include/oct6100api/oct6100_defines.h (+9/-1)
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c (+12/-2)
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c (+8/-0)
drivers/dahdi/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c (+4/-4)
drivers/dahdi/opvxa1200.c (+0/-3026)
drivers/dahdi/opvxa1200/Kbuild (+19/-0)
drivers/dahdi/opvxa1200/Makefile (+8/-0)
drivers/dahdi/opvxa1200/base.c (+3049/-0)
drivers/dahdi/opvxd115/Kbuild (+32/-0)
drivers/dahdi/opvxd115/Makefile (+8/-0)
drivers/dahdi/opvxd115/base.c (+4903/-0)
drivers/dahdi/opvxd115/opvxd115-diag.c (+427/-0)
drivers/dahdi/opvxd115/opvxd115.h (+124/-0)
drivers/dahdi/opvxd115/vpm450m.c (+587/-0)
drivers/dahdi/opvxd115/vpm450m.h (+43/-0)
drivers/dahdi/pciradio.c (+0/-2)
drivers/dahdi/tor2.c (+11/-13)
drivers/dahdi/voicebus/GpakCust.c (+62/-59)
drivers/dahdi/voicebus/GpakCust.h (+13/-19)
drivers/dahdi/voicebus/Kbuild (+1/-1)
drivers/dahdi/voicebus/voicebus.c (+133/-120)
drivers/dahdi/voicebus/voicebus.h (+10/-13)
drivers/dahdi/voicebus/voicebus_net.c (+7/-19)
drivers/dahdi/voicebus/vpmoct.c (+814/-0)
drivers/dahdi/voicebus/vpmoct.h (+110/-0)
drivers/dahdi/vpmadt032_loader/dahdi_vpmadt032_loader.c (+1/-1)
drivers/dahdi/wcb4xxp/base.c (+210/-118)
drivers/dahdi/wcb4xxp/wcb4xxp.h (+0/-2)
drivers/dahdi/wcfxo.c (+1/-3)
drivers/dahdi/wcopenpci.c (+0/-1)
drivers/dahdi/wct1xxp.c (+10/-12)
drivers/dahdi/wct4xxp/Kbuild (+6/-0)
drivers/dahdi/wct4xxp/base.c (+279/-171)
drivers/dahdi/wct4xxp/vpm450m.c (+1/-2)
drivers/dahdi/wctc4xxp/base.c (+119/-105)
drivers/dahdi/wctdm.c (+8/-8)
drivers/dahdi/wctdm24xxp/base.c (+2235/-1506)
drivers/dahdi/wctdm24xxp/wctdm24xxp.h (+122/-100)
drivers/dahdi/wctdm24xxp/xhfc.c (+89/-74)
drivers/dahdi/wctdm24xxp/xhfc.h (+5/-3)
drivers/dahdi/wcte11xp.c (+10/-14)
drivers/dahdi/wcte12xp/GpakHpi.h (+0/-79)
drivers/dahdi/wcte12xp/base.c (+685/-343)
drivers/dahdi/wcte12xp/wcte12xp.h (+8/-5)
drivers/dahdi/xpp/Kbuild (+6/-3)
drivers/dahdi/xpp/card_bri.c (+127/-107)
drivers/dahdi/xpp/card_echo.c (+374/-0)
drivers/dahdi/xpp/card_echo.h (+31/-0)
drivers/dahdi/xpp/card_fxo.c (+56/-58)
drivers/dahdi/xpp/card_fxs.c (+144/-97)
drivers/dahdi/xpp/card_global.c (+7/-128)
drivers/dahdi/xpp/card_global.h (+0/-4)
drivers/dahdi/xpp/card_pri.c (+144/-322)
drivers/dahdi/xpp/firmwares/Makefile (+3/-2)
drivers/dahdi/xpp/init_card_4_30 (+6/-1)
drivers/dahdi/xpp/init_card_5_30 (+3/-0)
drivers/dahdi/xpp/mmapdrv.c (+1/-1)
drivers/dahdi/xpp/xbus-core.c (+60/-274)
drivers/dahdi/xpp/xbus-core.h (+28/-18)
drivers/dahdi/xpp/xbus-pcm.c (+81/-144)
drivers/dahdi/xpp/xbus-pcm.h (+7/-5)
drivers/dahdi/xpp/xbus-sysfs.c (+101/-7)
drivers/dahdi/xpp/xdefs.h (+0/-1)
drivers/dahdi/xpp/xframe_queue.c (+5/-2)
drivers/dahdi/xpp/xpd.h (+35/-36)
drivers/dahdi/xpp/xpp_dahdi.c (+240/-262)
drivers/dahdi/xpp/xpp_dahdi.h (+7/-2)
drivers/dahdi/xpp/xpp_debug (+1/-1)
drivers/dahdi/xpp/xpp_log.h (+0/-52)
drivers/dahdi/xpp/xpp_usb.c (+1/-6)
drivers/dahdi/xpp/xproto.c (+31/-18)
drivers/dahdi/xpp/xproto.h (+37/-17)
drivers/dahdi/zaphfc/base.c (+5/-5)
include/dahdi/dahdi_config.h (+19/-8)
include/dahdi/kernel.h (+202/-50)
include/dahdi/user.h (+23/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #612091: please update zaphfc driver to tip of trunk	Low	Fix Released
Bug #879743: Please merge dahdi-linux 2.5.0.1 (universe) from Debian testing (main)	Undecided	Fix Released

Link a bug report

Related blueprints

22. By Adam Gandelman on 2011-10-22

* Merge from Debian testing (LP: #879743). Remaining changes:
  - debian/dahdi-dkms.install.in : add .version
  - Import modifications by Javier Uruen Val <email address hidden>:
    - 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.

21. By Adam Gandelman on 2011-05-24

debian/patches/define_spinlock: Fix DKMS FTBFS, move test for
DEFINE_SPINLOCK into include/dahdi/kernel.h. Cherry picked from upstream
commit (r9411)

20. By Adam Gandelman on 2011-05-19

* Merge from Debian unstable (Remaining changes):
  - debian/dahdi-dkms.install.in : add .version
  - debian/rules : cleanup dahdi-dkms.install and dkms.conf after build
  - debian/control: Fix typo (right command is m-a a-i dahdi-source)
  - Import modifications by Javier Uruen Val <email address hidden>:
    - 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

19. By Dave Walker on 2011-04-13

* debian/patches/bkl_fix_ioctl: Do not ioctl when unlocked_ioctl is available.
  Previous behaviour was causing a dkms build failure. Patch cherry picked
  from upstream commit (r9142). (LP: #731197)
* debian/patches/drop_semaphores_as_mutexes: Use of semaphores as mutexes
  feature was removed from the kernel, causing dkms build failure. Patch
  cherry picked from upstream commit (r9464), with minor alterations.

18. By Stefan Lesicnik on 2010-11-11

* Merge from Debian testing (Remaining changes):
  - debian/dahdi-dkms.install.in : add .version
  - debian/dkms.conf.in : do not 'make clean' after compile. We have to
    do this because the wanpipe (sangoma) drivers need Module.symvers.
  - debian/rules : cleanup dahdi-dkms.install and dkms.conf after build
  - debian/control: Change Maintainer
  - debian/control: Removed Uploaders field.
  - debian/control: Removed Debian Vcs-Svn entry and replaced with
    ubuntu-voip Vcs-Bzr, to reflect divergence in packages.
  - debian/control: Fix typo (right command is m-a a-i dahdi-source)
  - Import modifications by Javier Uruen Val <email address hidden>:
    - 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
* debian/dkms.conf.in: Add () so make.log captures all output
* debian/dkms.conf.in: Build dahdi_dummy as module to fix dkms build failure

17. By Stefan Lesicnik on 2010-11-11

xpp rules no longer required

16. By Stefan Lesicnik on 2010-11-11

Remove uploaders as per merge
Remove quilt as it builds without and is like that in debian

15. By Stefan Lesicnik on 2010-11-11

Remove patch as no longer required

14. By Stefan Lesicnik on 2010-11-11

Remove 2.6.35-build.patch as it is no longer required

13. By Stefan Lesicnik on 2010-11-11

Fix dkms make.log and dkms failure status 7 by building dahdi_dummy