lp://staging/ubuntu/saucy-proposed/open-vm-tools

Created by Ubuntu Package Importer and last modified
Get this branch:
bzr branch lp://staging/ubuntu/saucy-proposed/open-vm-tools
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Ubuntu branches
Review team:
Ubuntu Development Team
Status:
Mature

Recent revisions

38. By Nate Muench (Mink)

* Merging upstream version 2013.09.16-1328054.

* debian/rules:
  - Add Wno-unused-variable to CFLAGS.
  - Create the /mnt/hgfs directory during install
    + When folders are shared from the host machine, they are automatically
      mounted at /mnt/hgfs.

* debian/patches:
  - Removed 0005-linux-310-fix.patch, 0006-linux-311-fix.patch,
    and 0007-dkms-supress-error.patch
    + No longer needed.
  - Add 0005-dkms-vmci-remove.patch
    + Fixes "Invalid argument" when loading vmhgfs module. (LP: #1236265)
  - Add 0006-vmblock-fixes.patch & 0007-linux-311-vmhgfs-fix.patch
    + Fixes remaining problems with the vmblock and vmhgfs modules.

37. By Nate Muench (Mink)

* FFe LP: #1231148
* Ubuntu-specific Changes
  - debian/rules: Removed Wno-error=unused-local-typedefs from CLFAGS.
    + We now enforce building with GCC 4.7.

  - debian/patches: Add 0005-linux-310-fix.patch & 0006-linux-311-fix.patch
    + Fixes building against Saucy Kernels. (LP: #1194940, LP: #1208011)

  - debian/patches: Add 0007-dkms-supress-error.patch
    + Don't build modules that are broken, so modules that do build
      are available to be loaded.
    + Will be removed after next upstream release.

* Items merged from Debian experimental:
  (From 2:9.2.2-893683-7 release)
  - Removing purely cosmetical 'sleep 1' leftover in initscript.

  (From 2:9.2.3-1031360-2 release)
  - Renaming debian-specific open-vm-toolbox package to open-vm-tools-
    desktop for consistency with upstream.
  - Revamping package descriptions.
  - Renaming open-vm-dkms to open-vm-tools-dkms for consistent package
    namespace.

  (From 2:9.2.3-1031360-3 release)
  - Adding initial systemd service file from fedora.

  (From 2:9.2.3-1031360-4 release)
  - Dropping kfreebsd from architecture list, it has never built and
    nobody seems willing to make it work (neither upstream, porters, nor
    users).

  (From 2:9.2.3-1031360-6 release)
  - Correcting syntax of file entries in copyright.
  - Adding section override for open-vm-tools-dkms.
  - Enforcing build with gcc 4.7 for the time being.

36. By Nate Muench (Mink)

* Merging upstream version 2013.04.16-1098359.
  - Fixes building on Saucy kernels (LP: #1175295).

* Stop DKMS from building vmci & vsock modules
  - Modules are now in the kernel.

* debian/patches:
  - Removing procps.patch, not needed anymore.
  - Removed 0005-kernel-38-fixes.patch
    + No longer needed.
  - Renumbering patches.

* debian/rules:
  - Added Wno-error=unused-local-typedefs to CLFAGS
    + Suppresses build errors with GCC 4.8.

* Items merged from Debian:
  (From 2:9.2.2-893683-8 release)
  - Adding patch from Mathias Krause <email address hidden> to fix
    kernel stack memory leack in vsock module [CVE-2013-3237]

35. By Nate Muench (Mink)

* Ubuntu-specific Changes
  - debian/rules: Added LIBS field with -lpthread.
    + Fixes package compile failure for Raring and future Ubuntu Releases.

* Items merged from Debian unstable:
  (From 2:9.2.2-893683-1 release)
  - Adding remote_fs dependency in initscript.
  - Correcting architecture fields in control.

  (From 2:9.2.2-893683-2 release)
  - Removing init order to network.

  (From 2:9.2.2-893683-4 release)
  - Removing init order to network also on start.

  (From 2:9.2.2-893683-5 release)
  - Updating to standards version 3.9.4.
  - Updating year in copyright file.
  - Prefixing patches with 4 digits for consistency.
  - Tightening diff headers in patches.
  - Dropping dpkg-source compression levels.

  (From 2:9.2.2-893683-6 release)
  - Remove all references to Daniel's old email address.

34. By Nate Muench (Mink)

* debian/patches: Rename 05-vmhgfs.patch to 05-kernel-38-fixes.patch.
  - Since it contains fixes to more than 1 file.
  - Add vmci fixes recommended from upstream
    + Will be added in next release (whenever that is).

33. By Nate Muench (Mink)

* Merging upstream version 2012.12.26-958366.

* Added 04-dkms-vmsync.patch: An additional to 03-dkms.patch
  - Deletes lines involving vmsync, adjust other numbers.
  - Module compile still fails if we don't add this patch.
  - This keeps the 03-dkms.patch unmodified.

* Added 05-vmhgfs.patch:
  - Fixes vmxnet compile issues with 3.8 kernel (LP: #1100096)

* Stop dkms from building vmblock module.
  - vmblock-fuse takes care of this now.
    + Modules still build, but this gets rid of the vmblock-related
      warning message

32. By Nate Muench (Mink)

Merging upstream version 2012.10.14-874563.

31. By Nate Muench (Mink)

Merging upstream version 2012.10.14-874563.

30. By Nate Muench (Mink)

* debian/open-vm-tools.init: Add if statement to check for vmxnet module,
  and if found, remove pcnet32 module.
* debian/control: Remove open-vm-source package.
  - Only needed to add back open-vm-toolbox for Oneiric->Precise upgrade.

* Items merged from Debian unstable:
  - Switching to xz compression.
  - Adding sleep during restart in initscript.
  - Removing old dpkg trigger for update-initramfs.
  - Updating GPL boilerplate in copyright file.

29. By Nate Muench (Mink)

* Merging upstream version 2012.05.21-724730.
  - Fixes building against the current Quantal kernel. (LP: #1000344)
  - Fixes Quantal installation issues. (LP: #1019031)

* Sync with Debian
  - Updating to debhelper version 9.
  - Updating to standards version 3.9.3.
  - Updating copyright file machine-readable format version 1.0.
  - Building without multiarch paths for now

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp://staging/ubuntu/trusty/open-vm-tools
This branch contains Public information 
Everyone can see this information.

Subscribers