Merge lp://qastaging/~noskcaj/ubuntu/saucy/dahdi-tools/2.7.0-1 into lp://qastaging/ubuntu/saucy/dahdi-tools
Proposed by
Jackson Doak
Status: | Needs review | ||||
---|---|---|---|---|---|
Proposed branch: | lp://qastaging/~noskcaj/ubuntu/saucy/dahdi-tools/2.7.0-1 | ||||
Merge into: | lp://qastaging/ubuntu/saucy/dahdi-tools | ||||
Diff against target: |
117081 lines (+73559/-38653) 275 files modified
.gitignore (+36/-0) .pc/applied-patches (+0/-3) .pc/echocan_oslec/xpp/perl_modules/Dahdi/Config/Params.pm (+0/-156) .pc/init_unload_oslec/dahdi.init (+0/-333) .pc/zaptel_perl/xpp/Makefile (+0/-140) .version (+1/-1) ChangeLog (+0/-1460) Makefile (+33/-77) README (+22/-22) UPGRADE.txt (+3/-4) blacklist.sample (+8/-0) build_tools/dahdi_svn_tarball (+1/-1) build_tools/dahdi_sysfs_copy (+142/-0) build_tools/dump_sys_state (+28/-99) build_tools/make_tree (+0/-7) build_tools/menuselect-deps.in (+0/-2) configure (+242/-202) configure.ac (+11/-2) dahdi-tools-2.4.1-summary.html (+0/-82) dahdi-tools-2.4.1-summary.txt (+0/-162) dahdi.init (+11/-6) dahdi.rules (+3/-0) dahdi_cfg.c (+159/-54) dahdi_cfg_device_args (+32/-0) dahdi_maint.c (+33/-15) dahdi_map (+39/-0) dahdi_monitor.c (+8/-6) dahdi_pcap.c (+332/-0) dahdi_scan.c (+31/-0) dahdi_test.c (+28/-15) debian/changelog (+48/-0) debian/clean (+4/-0) debian/compat (+1/-1) debian/control (+3/-4) debian/copyright (+1/-1) debian/dahdi.examples (+1/-0) debian/dahdi.install (+1/-0) debian/dahdi.postrm (+0/-3) debian/dahdi.prerm (+0/-3) debian/dahdi.udev (+3/-0) debian/libtonezone2.0.install (+1/-1) debian/libtonezone2.0.symbols (+11/-0) debian/patches/astribank_allow_ignoreend (+0/-53) debian/patches/bashism (+0/-39) debian/patches/remove_dahdi_speed (+16/-0) debian/patches/series (+1/-0) debian/patches/ztcfg-start_stop (+0/-161) debian/rules (+16/-104) doc/dahdi_cfg.8 (+15/-1) doc/dahdi_maint.8 (+62/-0) doc/dahdi_map.8 (+48/-0) doc/dahdi_monitor.8 (+115/-13) fxotune.c (+64/-15) fxstest.c (+37/-1) handle_device (+50/-0) makeopts.in (+4/-0) menuselect/Makefile (+0/-123) menuselect/README (+0/-179) menuselect/acinclude.m4 (+0/-199) menuselect/aclocal.m4 (+0/-14) menuselect/autoconfig.h.in (+0/-125) menuselect/bootstrap.sh (+0/-41) menuselect/config.guess (+0/-1501) menuselect/config.sub (+0/-1705) menuselect/configure (+0/-6841) menuselect/configure.ac (+0/-88) menuselect/contrib/Makefile-dummy (+0/-17) menuselect/contrib/menuselect-dummy (+0/-730) menuselect/example_menuselect-tree (+0/-487) menuselect/install-sh (+0/-323) menuselect/linkedlists.h (+0/-370) menuselect/make_version (+0/-56) menuselect/makeopts.in (+0/-22) menuselect/menuselect.c (+0/-1779) menuselect/menuselect.h (+0/-165) menuselect/menuselect_curses.c (+0/-893) menuselect/menuselect_gtk.c (+0/-354) menuselect/menuselect_newt.c (+0/-375) menuselect/menuselect_stub.c (+0/-39) menuselect/missing (+0/-360) menuselect/mxml/ANNOUNCEMENT (+0/-5) menuselect/mxml/CHANGES (+0/-213) menuselect/mxml/COPYING (+0/-482) menuselect/mxml/Makefile.in (+0/-342) menuselect/mxml/README (+0/-204) menuselect/mxml/config.h.in (+0/-69) menuselect/mxml/configure (+0/-5702) menuselect/mxml/configure.in (+0/-343) menuselect/mxml/install-sh (+0/-251) menuselect/mxml/mxml-attr.c (+0/-181) menuselect/mxml/mxml-entity.c (+0/-472) menuselect/mxml/mxml-file.c (+0/-2843) menuselect/mxml/mxml-index.c (+0/-649) menuselect/mxml/mxml-node.c (+0/-664) menuselect/mxml/mxml-private.c (+0/-128) menuselect/mxml/mxml-search.c (+0/-199) menuselect/mxml/mxml-set.c (+0/-257) menuselect/mxml/mxml-string.c (+0/-377) menuselect/mxml/mxml.h (+0/-254) menuselect/mxml/mxml.list.in (+0/-115) menuselect/mxml/mxml.pc.in (+0/-10) menuselect/strcompat.c (+0/-243) menuselect/test/build_tools/menuselect-deps (+0/-52) menuselect/test/menuselect-tree (+0/-716) modules.sample (+4/-0) patgen.c (+35/-24) patlooptest.c (+70/-20) pattest.c (+35/-24) pinned-spans.conf (+56/-0) span_assignments (+193/-0) span_types (+160/-0) spantype.conf (+27/-0) system.conf.sample (+10/-3) xpp/Makefile (+47/-14) xpp/README.Astribank (+58/-37) xpp/astribank_allow.8 (+15/-5) xpp/astribank_allow.c (+17/-216) xpp/astribank_hexload.8 (+60/-18) xpp/astribank_hexload.c (+110/-37) xpp/astribank_hook (+62/-13) xpp/astribank_is_starting.c (+1/-1) xpp/astribank_license.c (+340/-0) xpp/astribank_license.h (+29/-0) xpp/astribank_tool.8 (+5/-5) xpp/astribank_tool.c (+21/-8) xpp/astribank_usb.c (+74/-353) xpp/astribank_usb.h (+16/-6) xpp/dahdi_genconf (+8/-8) xpp/dahdi_hardware (+4/-4) xpp/dahdi_registration (+3/-2) xpp/debug.c (+0/-53) xpp/debug.h (+0/-46) xpp/echo_loader.c (+852/-0) xpp/echo_loader.h (+32/-0) xpp/fpga_load.8 (+0/-86) xpp/fpga_load.c (+0/-1052) xpp/hexfile.c (+1/-1) xpp/lsdahdi (+2/-2) xpp/mpp.h (+80/-222) xpp/mpp_funcs.c (+0/-1109) xpp/mpp_funcs.h (+0/-80) xpp/mpptalk.c (+956/-0) xpp/mpptalk.h (+85/-0) xpp/mpptalk_defs.h (+113/-0) xpp/oct612x/Makefile (+38/-0) xpp/oct612x/apilib/bt/octapi_bt0.c (+1217/-0) xpp/oct612x/apilib/bt/octapi_bt0_private.h (+93/-0) xpp/oct612x/apilib/largmath/octapi_largmath.c (+628/-0) xpp/oct612x/apilib/llman/octapi_llman.c (+2787/-0) xpp/oct612x/apilib/llman/octapi_llman_private.h (+206/-0) xpp/oct612x/get_discards (+51/-0) xpp/oct612x/include/apilib/octapi_bt0.h (+75/-0) xpp/oct612x/include/apilib/octapi_largmath.h (+69/-0) xpp/oct612x/include/apilib/octapi_llman.h (+142/-0) xpp/oct612x/include/digium_unused.h (+297/-0) xpp/oct612x/include/oct6100api/oct6100_adpcm_chan_inst.h (+74/-0) xpp/oct612x/include/oct6100api/oct6100_adpcm_chan_pub.h (+90/-0) xpp/oct612x/include/oct6100api/oct6100_api.h (+84/-0) xpp/oct612x/include/oct6100api/oct6100_api_inst.h (+138/-0) xpp/oct612x/include/oct6100api/oct6100_apimi.h (+69/-0) xpp/oct612x/include/oct6100api/oct6100_apiud.h (+312/-0) xpp/oct612x/include/oct6100api/oct6100_channel_inst.h (+374/-0) xpp/oct612x/include/oct6100api/oct6100_channel_pub.h (+547/-0) xpp/oct612x/include/oct6100api/oct6100_chip_open_inst.h (+515/-0) xpp/oct612x/include/oct6100api/oct6100_chip_open_pub.h (+241/-0) xpp/oct612x/include/oct6100api/oct6100_chip_stats_inst.h (+84/-0) xpp/oct612x/include/oct6100api/oct6100_chip_stats_pub.h (+150/-0) xpp/oct612x/include/oct6100api/oct6100_conf_bridge_inst.h (+104/-0) xpp/oct612x/include/oct6100api/oct6100_conf_bridge_pub.h (+169/-0) xpp/oct612x/include/oct6100api/oct6100_debug_inst.h (+124/-0) xpp/oct612x/include/oct6100api/oct6100_debug_pub.h (+76/-0) xpp/oct612x/include/oct6100api/oct6100_defines.h (+679/-0) xpp/oct612x/include/oct6100api/oct6100_errors.h (+838/-0) xpp/oct612x/include/oct6100api/oct6100_events_inst.h (+69/-0) xpp/oct612x/include/oct6100api/oct6100_events_pub.h (+111/-0) xpp/oct612x/include/oct6100api/oct6100_interrupts_inst.h (+134/-0) xpp/oct612x/include/oct6100api/oct6100_interrupts_pub.h (+102/-0) xpp/oct612x/include/oct6100api/oct6100_mixer_inst.h (+86/-0) xpp/oct612x/include/oct6100api/oct6100_mixer_pub.h (+77/-0) xpp/oct612x/include/oct6100api/oct6100_phasing_tsst_inst.h (+68/-0) xpp/oct612x/include/oct6100api/oct6100_phasing_tsst_pub.h (+78/-0) xpp/oct612x/include/oct6100api/oct6100_playout_buf_inst.h (+88/-0) xpp/oct612x/include/oct6100api/oct6100_playout_buf_pub.h (+183/-0) xpp/oct612x/include/oct6100api/oct6100_remote_debug_inst.h (+73/-0) xpp/oct612x/include/oct6100api/oct6100_remote_debug_pub.h (+64/-0) xpp/oct612x/include/oct6100api/oct6100_tlv_inst.h (+72/-0) xpp/oct612x/include/oct6100api/oct6100_tone_detection_inst.h (+46/-0) xpp/oct612x/include/oct6100api/oct6100_tone_detection_pub.h (+74/-0) xpp/oct612x/include/oct6100api/oct6100_tsi_cnct_inst.h (+70/-0) xpp/oct612x/include/oct6100api/oct6100_tsi_cnct_pub.h (+76/-0) xpp/oct612x/include/oct6100api/oct6100_tsst_inst.h (+55/-0) xpp/oct612x/include/octdef.h (+120/-0) xpp/oct612x/include/octmac.h (+98/-0) xpp/oct612x/include/octosdependant.h (+170/-0) xpp/oct612x/include/octrpc/oct6100_rpc_protocol.h (+348/-0) xpp/oct612x/include/octrpc/rpc_protocol.h (+115/-0) xpp/oct612x/include/octtype.h (+159/-0) xpp/oct612x/include/octtypevx.h (+132/-0) xpp/oct612x/include/octtypewin.h (+100/-0) xpp/oct612x/octasic-helper (+39/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_adpcm_chan_priv.h (+131/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.c (+1237/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.c (+13858/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c (+6899/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c (+441/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c (+7664/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.c (+1278/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_events.c (+1379/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.c (+1997/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.c (+831/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.c (+640/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.c (+1586/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.c (+922/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.c (+3337/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_remote_debug.c (+1598/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.c (+2056/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.c (+1088/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.c (+1023/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.c (+572/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_user.c (+508/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.c (+116/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_channel_priv.h (+529/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_chip_open_priv.h (+264/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_chip_stats_priv.h (+55/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_conf_bridge_priv.h (+318/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_debug_priv.h (+58/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_events_priv.h (+82/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_interrupts_priv.h (+158/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_memory_priv.h (+97/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_miscellaneous_priv.h (+277/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_mixer_priv.h (+150/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_phasing_tsst_priv.h (+114/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_playout_buf_priv.h (+201/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_remote_debug_priv.h (+144/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_tlv_priv.h (+515/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_tone_detection_priv.h (+111/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_tsi_cnct_priv.h (+126/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_tsst_priv.h (+89/-0) xpp/oct612x/octdeviceapi/oct6100api/oct6100_version.h (+39/-0) xpp/oct612x/test.c (+46/-0) xpp/perl_modules/Dahdi.pm (+1/-2) xpp/perl_modules/Dahdi/Chans.pm (+2/-2) xpp/perl_modules/Dahdi/Config/Gen.pm (+1/-1) xpp/perl_modules/Dahdi/Config/Gen/Chandahdi.pm (+2/-2) xpp/perl_modules/Dahdi/Config/Gen/Freepbxdb.pm (+116/-0) xpp/perl_modules/Dahdi/Config/Gen/Xpporder.pm (+1/-1) xpp/perl_modules/Dahdi/Config/Params.pm (+2/-2) xpp/perl_modules/Dahdi/Hardware.pm (+1/-1) xpp/perl_modules/Dahdi/Hardware/PCI.pm (+8/-3) xpp/perl_modules/Dahdi/Hardware/USB.pm (+8/-1) xpp/perl_modules/Dahdi/Span.pm (+61/-7) xpp/perl_modules/Dahdi/Utils.pm (+0/-1) xpp/perl_modules/Dahdi/Xpp.pm (+10/-46) xpp/perl_modules/Dahdi/Xpp/Line.pm (+7/-31) xpp/perl_modules/Dahdi/Xpp/Mpp.pm (+1/-1) xpp/perl_modules/Dahdi/Xpp/Xbus.pm (+24/-57) xpp/perl_modules/Dahdi/Xpp/Xpd.pm (+19/-74) xpp/pic_loader.c (+29/-20) xpp/twinstar (+2/-2) xpp/twinstar_hook (+1/-1) xpp/twinstar_setup (+1/-1) xpp/waitfor_xpds (+65/-16) xpp/xpp_blink (+1/-1) xpp/xpp_fxloader (+302/-113) xpp/xpp_sync (+12/-11) xpp/xtalk/debug.c (+73/-0) xpp/xtalk/debug.h (+52/-0) xpp/xtalk/xlist.c (+94/-0) xpp/xtalk/xlist.h (+29/-0) xpp/xtalk/xtalk.c (+497/-0) xpp/xtalk/xtalk.h (+178/-0) xpp/xtalk/xtalk_defs.h (+41/-0) xpp/xtalk/xusb.c (+869/-0) xpp/xtalk/xusb.h (+102/-0) zonedata.c (+49/-1) |
||||
To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/saucy/dahdi-tools/2.7.0-1 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach (community) | Approve | ||
Review via email:
|
Description of the change
Merge from debian unstable.
To post a comment you must log in.
Unmerged revisions
- 10. By Jackson Doak
-
* Merge from debian. Remaining changes:
- debian/control: Added gawk as dependency for dkms build
- debian/control: Package dahdi Depends on dahdi-dkms | dahdi-source
- debian/control: Set ubuntu maintainer
- added debian/dahdi.postinst
- debian/control: Removed Uploaders field.
- added debian/dahdi.postinst
- added --error-handler= init_failed to debian/rules
Thanks. Uploaded.