← Back to branch summary

~vibhavp/ubuntu/raring/dahdi-tools/merge-from-debian

« back to all changes in this revision

Viewing changes to menuselect/menuselect_gtk.c

  • Committer: Vibhav Pant
  • Date: 2012-12-26 17:23:16 UTC
  • mfrom: (2.1.6 sid)
  • Revision ID: vibhavp@gmail.com-20121226172316-o2jojsfcnr0aqrme
* 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 

Show diffs side-by-side

added added

removed removed

Lines of Context:
menuselect/menuselect_gtk.c
268
268
                        char dep_buf[64] = "";
269
269
                        char use_buf[64] = "";
270
270
                        char cnf_buf[64] = "";
271
 
                        struct depend *dep;
272
 
                        struct use *use;
273
 
                        struct conflict *cnf;
 
271
                        struct reference *dep;
 
272
                        struct reference *use;
 
273
                        struct reference *cnf;
274
274
 
275
275
                        AST_LIST_TRAVERSE(&mem->deps, dep, list) {
276
276
                                strncat(dep_buf, dep->displayname, sizeof(dep_buf) - strlen(dep_buf) - 1);