~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-sync1a

« back to all changes in this revision

Viewing changes to services/plugins/resolutionSet/resolutionRandR12.c

  • Committer: Bazaar Package Importer
  • Author(s): Nate Muench
  • Date: 2011-07-22 16:41:03 UTC
  • mfrom: (1.4.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20110722164103-xci04yu18mjvhr1j
Tags: 2011.07.19-450511-0ubuntu1
* Merge latest upstream git tag. Fixes Building on Oneiric
  (LP: #776103, LP: #807903)

* The Toolbox (GUI) has been removed.
* Changes in debian folder:
  - Contents of open-vm-toolbox.lintian-overrides have been moved to
    open-vm-tools.lintian-overrides.
  - The contents of open-vm-toolbox.manpages (excluding the first line,
    which relates to the Toolbox) have been moved to open-vm-tools.manpages.
* Changes in debian/control:
  - Convert open-vm-toolbox into a transitional package.
  - All dependencies for toolbox have been moved to open-vm-tools package.
  - Changed architecture for open-vm-toolbox package to all.
  - Added Replaces and Breaks fields to open-vm-tools.
* Changes in debian/rules:
  - Commented out references to the Toolbox (GUI), that no longer exist
    in the package itself.
  - Remaining references changed from open-vm-toolbox to open-vm-tools.
  - Added -Wno-unused-but-set-variable to CFLAGS to suppress remaining
    issues with GCC 4.6.0 or later.
* Files removed in debian/manpages:
  - vmmemctl.9 (Component no longer in package)
  - vmware-toolbox.1 (Component removed in this release)
  - vmxnet3.9 (vmxnet3 is now included in kernel itself)

Show diffs side-by-side

added added

removed removed

Lines of Context:
62
62
 
63
63
#ifndef NO_MULTIMON
64
64
 
 
65
#include "resolutionInt.h"
 
66
 
65
67
#include <stdio.h>
66
68
#include <stdlib.h>
67
69
#include <string.h>
68
 
 
69
 
#include "resolutionInt.h"
70
 
#include "resolutionRandR12.h"
71
 
#include <X11/extensions/Xrandr.h>
72
70
#include <X11/X.h>
73
71
#include <X11/Xmd.h>
74
72
#include <X11/extensions/panoramiXproto.h>
75
 
 
76
 
#include <X11/Xlib.h>
77
 
#undef Bool
78
 
 
79
 
#include "vmware.h"
80
 
#include "resolution.h"
81
 
#include "debug.h"
82
 
 
 
73
#include <X11/extensions/Xrandr.h>
 
74
 
 
75
#include "resolutionRandR12.h"
83
76
#include "str.h"
84
77
#include "strutil.h"
85
78
#include "util.h"