~ubuntu-branches/ubuntu/quantal/open-vm-tools/quantal-201210021442

« back to all changes in this revision

Viewing changes to lib/stubs/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2011-03-31 14:20:05 UTC
  • mfrom: (1.4.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110331142005-3n9red91p7ogkweo
Tags: 2011.03.28-387002-0ubuntu1
* Merge latest upstream git tag.  This has the unlocked_ioctl change
  needed to fix dkms build failures (LP: #727342)
* Changes in debian/rules:
  - work around a bug in toolbox/Makefile, where install-exec-hook is
    not happening.  This needs to get fixed the right way.
  - don't install 'vmware-user' which seems to no longer exist
  - move /etc/xdg into open-vm-toolbox (which should be done using .install)
* debian/open-vm-tools.init: add 'modprobe [-r] vmblock'. (LP: #332323)
* debian/rules and debian/open-vm-toolbox.lintian-overrides:
  - Make vmware-user-suid-wrapper suid-root (LP: #332323)

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
libStubs_la_SOURCES += stub-warning.c
24
24
libStubs_la_SOURCES += stub-user-msg.c
25
25
libStubs_la_SOURCES += stub-user-panic.c
 
26
libStubs_la_SOURCES += stub-user-util.c
26
27
 
27
28
noinst_LTLIBRARIES += libStubsCS.la
28
29
 
30
31
libStubsCS_la_SOURCES += stub-config.c
31
32
libStubsCS_la_SOURCES += stub-user-msg.c
32
33
libStubsCS_la_SOURCES += stub-user-panic.c
33