← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/pulseaudio/oneiric

« back to all changes in this revision

Viewing changes to src/modules/module-x11-xsmp.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel T Chen
  • Date: 2007-12-04 00:56:08 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20071204005608-y1xqvcu45g1yxtlu
Tags: 0.9.8-1ubuntu1
"Hail our new PulseAudio overlords (part two)."

* Merge from Debian unstable.
* Ubuntu-specific changes:
  - debian/control:
    + Don't build-depend on libjack0.100.0-dev or build jack module
      packages,
    + Update pulseaudio's Recommends and Suggests to accomodate
      existing promoted main packages,
    + Explicitly mention pasuspender in pulseaudio-utils's long
      description,
    + Add Vcs-Bzr URI,
    + Adhere to DebianMaintainerField;
  - debian/rules: Use multiuser for update-rc.d;
  - debian/patches/series: Retain the exclusion of
    0001-Set-ESD-socket-to-tmp-.esd-socket-to-match-up-with.patch.
* Dropped Ubuntu-specific change (absorbed into Debian source):
  debian/patches/0002-Double-esound-maximum-sample-size.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/module-x11-xsmp.c
1
 
/* $Id: module-x11-xsmp.c 1971 2007-10-28 19:13:50Z lennart $ */
 
1
/* $Id: module-x11-xsmp.c 2043 2007-11-09 18:25:40Z lennart $ */
2
2
 
3
3
/***
4
4
  This file is part of PulseAudio.
45
45
 
46
46
#include "module-x11-xsmp-symdef.h"
47
47
 
48
 
PA_MODULE_AUTHOR("Lennart Poettering")
49
 
PA_MODULE_DESCRIPTION("X11 session management")
50
 
PA_MODULE_VERSION(PACKAGE_VERSION)
 
48
PA_MODULE_AUTHOR("Lennart Poettering");
 
49
PA_MODULE_DESCRIPTION("X11 session management");
 
50
PA_MODULE_VERSION(PACKAGE_VERSION);
 
51
PA_MODULE_LOAD_ONCE(TRUE);
51
52
 
52
53
static int ice_in_use = 0;
53
54