lp:~vibhavp/ubuntu/raring/dahdi-tools/merge-from-debian
- Get this branch:
- bzr branch lp:~vibhavp/ubuntu/raring/dahdi-tools/merge-from-debian
Branch merges
- Charlie_Smotherman (community): Needs Fixing
- Ubuntu branches: Pending requested
-
Diff: 84301 lines (+73212/-6649)183 files modified.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-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 (+198/-0)
Makefile (+6/-0)
README (+19/-17)
UPGRADE.txt (+3/-4)
configure.ac (+1/-1)
dahdi-tools-2.4.1-summary.html (+0/-82)
dahdi-tools-2.4.1-summary.txt (+0/-162)
dahdi.init (+2/-6)
dahdi_cfg.c (+32/-26)
dahdi_maint.c (+27/-9)
debian/changelog (+37/-0)
debian/compat (+1/-1)
debian/control (+3/-3)
debian/copyright (+1/-1)
debian/dahdi.install (+1/-0)
debian/dahdi.postrm (+0/-3)
debian/dahdi.prerm (+0/-3)
debian/libtonezone2.0.install (+1/-1)
debian/libtonezone2.0.symbols (+11/-0)
debian/patches/remove_dahdi_speed (+17/-0)
debian/patches/series (+1/-0)
debian/rules (+13/-19)
menuselect/aclocal.m4 (+2/-2)
menuselect/autoconfig.h.in (+6/-0)
menuselect/configure (+2420/-3439)
menuselect/configure.ac (+1/-0)
menuselect/linkedlists.h (+4/-2)
menuselect/menuselect.c (+58/-48)
menuselect/menuselect.h (+10/-30)
menuselect/menuselect_curses.c (+78/-54)
menuselect/menuselect_gtk.c (+3/-3)
menuselect/menuselect_newt.c (+46/-11)
patgen.c (+35/-24)
patlooptest.c (+70/-20)
pattest.c (+35/-24)
system.conf.sample (+10/-3)
xpp/Makefile (+47/-9)
xpp/README.Astribank (+43/-22)
xpp/astribank_allow.8 (+5/-5)
xpp/astribank_allow.c (+5/-4)
xpp/astribank_hexload.8 (+49/-11)
xpp/astribank_hexload.c (+95/-28)
xpp/astribank_hook (+35/-13)
xpp/astribank_is_starting.c (+1/-1)
xpp/astribank_tool.8 (+5/-5)
xpp/astribank_tool.c (+7/-5)
xpp/astribank_usb.c (+72/-353)
xpp/astribank_usb.h (+4/-6)
xpp/dahdi_genconf (+3/-3)
xpp/dahdi_registration (+3/-2)
xpp/debug.c (+0/-53)
xpp/debug.h (+0/-46)
xpp/echo_loader.c (+784/-0)
xpp/echo_loader.h (+32/-0)
xpp/mpp.h (+76/-221)
xpp/mpp_funcs.c (+0/-1109)
xpp/mpp_funcs.h (+0/-80)
xpp/mpptalk.c (+915/-0)
xpp/mpptalk.h (+84/-0)
xpp/mpptalk_defs.h (+111/-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 (+116/-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 (+13933/-0)
xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c (+6917/-0)
xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.c (+441/-0)
xpp/oct612x/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.c (+7683/-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 (+2012/-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 (+575/-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 (+279/-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/Chans.pm (+1/-1)
xpp/perl_modules/Dahdi/Config/Params.pm (+1/-1)
xpp/perl_modules/Dahdi/Hardware/PCI.pm (+1/-1)
xpp/perl_modules/Dahdi/Hardware/USB.pm (+1/-1)
xpp/perl_modules/Dahdi/Span.pm (+23/-4)
xpp/perl_modules/Dahdi/Xpp.pm (+2/-2)
xpp/perl_modules/Dahdi/Xpp/Xpd.pm (+9/-1)
xpp/pic_loader.c (+29/-20)
xpp/waitfor_xpds (+3/-2)
xpp/xpp_fxloader (+46/-8)
xpp/xtalk/debug.c (+72/-0)
xpp/xtalk/debug.h (+49/-0)
xpp/xtalk/xlist.c (+93/-0)
xpp/xtalk/xlist.h (+29/-0)
xpp/xtalk/xtalk.c (+497/-0)
xpp/xtalk/xtalk.h (+172/-0)
xpp/xtalk/xtalk_defs.h (+40/-0)
xpp/xtalk/xusb.c (+726/-0)
xpp/xtalk/xusb.h (+98/-0)
zonedata.c (+49/-1)
Branch information
- Owner:
- Vibhav Pant
- Status:
- Development
Recent revisions
- 9. By Vibhav Pant
-
* Merge from Debian unstable. Remaining changes:
- Bug Fix: If linux-headers are not installed, don't block, and print
information for the user.
- added debian/dahdi.postinst
- added --error-handler= init_failed to debian/rules
- debian/control: Added gawk as dependency for dkms build (LP: #493304)
- Changes from Debian:
- 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: Package dahdi Depends on dahdi-dkms | dahdi-source - 8. By Martin Pitt
-
No-change rebuild against current pkgbinarymangler to fix broken
md5sums. (see LP #875466) - 7. By Stefan Lesicnik
-
* Merge from Debian. Remaining changes:
- Bug Fix: If linux-headers are not installed, don't block, and print
information for the user.
- added debian/dahdi.postinst
- added --error-handler= init_failed to debian/rules
- Changes from Debian:
- 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: Package dahdi Depends on dahdi-dkms | dahdi-source
* debian/control: Added gawk as dependency for dkms build (LP: #493304)
* New upstream release (Closes: #581076, #582094).
* Patches hardware_rescan, perl_fix_noserial, perl_fix_transportdir,
astribank_allow_ignoreend , init_unload_modules and wcb4xxp_extra_trunk
dropped: merged upstream.
* dahdi-linux 2.3.0 is required (extra config options for dahdi_cfg).
* Convert to dpkg v.3 format.
* Standards version: 3.9.1.0 (No change needed. - 6. By Stefan Lesicnik
-
* Merge from Debian testing. Remaining changes:
- Bug Fix: If linux-headers are not installed, don't block, and print
information for the user.
- added debian/dahdi.postinst
- added --error-handler= init_failed to debian/rules
- Changes from Debian:
- 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: Package dahdi Depends on dahdi-dkms | dahdi-source
* New minor upstream release.
* Patch wcb4xxp_extra_trunk: recognize some extra HFC-[248]S PCI IDs.
* DEP3 heaaders for all patches in use.
* Refreshed some patches.
* Standards version 3.8.4 (no change needed).
* Use a @debian.org adderss.
* New upstream release (Closes: #536257, #564381).
* Patch 'bashism' dropped: merged upstream.
* Patch xpp_no_extra_at dropped: merged upstream.
* Add an example genconf_parameters.
* Compat level 7.
* Bump standars version to 3.8.3.0 (no change needed)
* Udev rules are now in dahdi-linux.
* Patches perl_fix_noserial, perl_fix_transportdir: Fixes for some
minor perl issues.
* Add the missing ${misc:Depends}, as per lintian.
* Patch astribank_allow_ignoreend : an extra missing patch from upstream.
* Patches init_unload_modules and init_unload_oslec: also unload OSLEC
when unloading all modules.
* Added bristuff 0.3.0-PRE1 for Asterisk 1.2.0 support.
* fix Makefile_deps_kern. dpatch
* remove .rej from Makefile.uname.dpatch
* do install genzaptelconf man page
* update genzaptelconf and its man page
* echocan_env.dpatch: allow changing the echo canceller at zaptel-modules
build time
* Makefile_kbuild. dpatch: use kbuild for 2.6 modules build. used for:
* Makefile_xpp.dpatch: (not applied by default)
a small patch to enable the build of:
* xpp.dpatch: drivers for Xorcom Asteribank
* Build and package libtonezone.so
* New upstream release
* Remove Makefile_deps_kern. dpatch as it doesnt apply upstream
* New Upstream Release - 5. By Jean-Michel Dault
-
* Bug Fix: If linux-headers are not installed, don't block, and print
information for the user. (LP: #429510, LP: #474350)
- added debian/dahdi.postinst
- added --error-handler= init_failed to debian/rules - 4. By Jean-Michel Dault
-
* Merge from Debian pkg-voip.
* Changes from Debian:
- 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: Package dahdi Depends on dahdi-dkms | dahdi-source* From Debian pkg-voip:
[ Tzafrir Cohen ]
* New upstream release (Closes: #536257, #564381).
* Patch 'bashism' dropped: merged upstream.
* Patch xpp_no_extra_at dropped: merged upstream.
* Add an example genconf_parameters.
* Compat level 7.
* Bump standars version to 3.8.3.0 (no change needed)
* Udev rules are now in dahdi-linux.
* Patches perl_fix_noserial, perl_fix_transportdir: Fixes for some
minor perl issues.
* Add the missing ${misc:Depends}, as per lintian.
* Patch astribank_allow_ignoreend : an extra missing patch from upstream.
* Patches init_unload_modules and init_unload_oslec: also unload OSLEC
when unloading all modules. - 3. By Jean-Michel Dault
-
* Merge from debian pkg-voip (2.2.0 final)
* Change maintainer and standards version
* Since the init script needs /dev/dahdi, require either dahdi-dkms or
dahdi-source.* Debian changes
[ Tzafrir Cohen ]
* New upstream release.
* Patch bashism: fixes bashism in waitfor_xpds (Closes: #535865).
* Patch hardware_rescan: backport Dahdi::Hardware- >rescan( )
* Patch no_extra_at: backport of a per/xpp fix. - 2. By Mark Purcell
-
[ Tzafrir Cohen ]
* New upstream release candidate.[ Mark Purcell ]
* Cleanup debian/watch to point to upstream dahdi-tools ;-)
* Update Standards version -> 3.8.1
* Fix binary-control- field-duplicate s-source
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/raring/dahdi-tools