Created by Nate Muench (Mink) and last modified
Get this branch:
bzr branch lp:~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-august.merge2
Only Nate Muench (Mink) can upload to this branch. If you are Nate Muench (Mink) please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Nate Muench (Mink)

Recent revisions

26. By Nate Muench (Mink)

* Merge latest upstream git tag.
* Changes in debian/rules:
  - Removed "-Wno-unused-but-set-variable" from CFLAGS.
    + No longer needed, package now builds successfully without it.
  - Actually remove commented out lines regarding open-vm-toolbox.
* Changes in debian/control:
  - open-vm-tools recommends open-vm-dkms (LP: #598933)
  - Added NumLockX as a suggested package for open-vm-tools.
    + Temporary workaround until a proper fix is found.
* Partial merge from Debian unstable. Details below:
  - Updating maintainer and uploaders fields.
  - Removing vcs fields.
  - Removing references to Daniel Baumann's old email address.
  - Updating years in copyright file.
  - Updating to standards version 3.9.2.
  - Updating to debhelper version 8.
  - Switching to source format 3.0 (quilt).
  - Removing manual chrpath setting.
  - Removing exclusion from plugins from debhelper shlibs.
  - Rediffing kvers.patch.

25. By Nate Muench (Mink)

* 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
  - 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)

24. By Christian Titze

Updated /debian/manpages/vmhgfs.9: Typo fixed and further information
was added (LP: #572335)

23. By Evan Broder

Revert debian/rules change in 2011.03.28-387002-0ubuntu2 and instead
remove debian/open-vm-toolbox.links, which was shadowing the original
/etc/xdg/autostart/vmware-user.desktop file.

22. By Serge Hallyn

debian/rules: copy the vmware-user.desktop into place. (LP: #772837)

21. By Serge Hallyn

* 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)

20. By Nate Muench (Mink)

* Merge from Debian testing (LP: #632101), remaining changes:
  - Recommend open-vm-toolbox in open-vm-tools.
  - Rediffing vsock.patch.

19. By Stefano Rivera

Add 03-vmxnet.patch and 04-vsock.patch.
Fixes building on Maverick kernels (LP: #598542)

18. By Evan Broder <evan@mingo>

* Merge from debian testing, remaining changes:
    - Recommend open-vm-toolbox in open-vm-tools.
* Dropping la files.
* Updating rules for pvscsi removal (Closes: #581160).
* Merging upstream version 2010.04.25-253928.
* Updating packaging for upstreams pvscsi module removal.
* Removing remote_fs from initscript again (Closes: #577163).
* Updating lintian overrides for open-vm-tools.
* Updating date and version in manpage headers.
* Adding manpage for vmxnet3.
* Adding manpage for vmci.
* Fixing spelling typo in vmsync manpage.
* Adding manpage for vmsock.
* Update formating of newly added manpages.
* Adding vmware-toolbox-cmd manpage.
* Adding guestlib manpage.
* Adding libvmtools manpage.
* Renaming guestlib manpage to libguestlib.
* Including vmware-toolbox-cmd manpage in open-vm-tools package.
* Updating initscript start/stop declarations (Closes: #576843,
* Adding misc depends.
* Running open-vm-dkms postinst script with set -e.
* Adding remote_fs to init depends.
* Avoid including license files in open-vm-dkms.
* Marking makefiles in open-vm-dkms executable to please lintian.
* Adding make to open-vm-dkms depends.
* Also stopping in runlevel 1.
* Addding dkms support based on the work of Evan Broder
  <email address hidden> on the ubuntu package (Closes: #516251).
* Simplyfing initramfs triggers (Closes: #516355).
* Merging upstream version 2010.03.20-243334.
* Moving local Makefile to subdirectory.
* Adding build-depends to libfuse-dev.

17. By Evan Broder

* Merge from Debian testing (LP: #543888), remaining changes:
  - Recommend open-vm-toolbox in open-vm-tools.
  - Add support for dkms.
* Fixes building on Lucid kernels (LP: #498677).
* Updating to standards 3.8.4.
* Merging upstream version 2010.02.23-236320.
* Updating year in copyright file.
* Merging upstream version 2010.01.19-226760.
* Correcting plugins handling (Closes: #564069).
* Updating packaging for upstreams vmxnet3 module removal.
* Updating packaging for upstreams test plugin removal.
* Adding explicit debian source version 1.0 until switch to 3.0.
* Merging upstream version 2009.12.16-217847.
* Rediffing kvers.patch.
* Rediffing procps.patch.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.