lp:~ubuntu-branches/ubuntu/raring/open-vm-tools/raring-201303270241
- Get this branch:
- bzr branch lp:~ubuntu-branches/ubuntu/raring/open-vm-tools/raring-201303270241
Branch merges
- Ubuntu branches: Pending requested
-
Diff: 30748 lines (+24/-30489)24 files modified.pc/0001-kvers.patch/modules/linux/vmblock/Makefile (+0/-171)
.pc/0001-kvers.patch/modules/linux/vmci/Makefile (+0/-171)
.pc/0001-kvers.patch/modules/linux/vmhgfs/Makefile (+0/-171)
.pc/0001-kvers.patch/modules/linux/vmsync/Makefile (+0/-171)
.pc/0001-kvers.patch/modules/linux/vmxnet/Makefile (+0/-171)
.pc/0001-kvers.patch/modules/linux/vsock/Makefile (+0/-171)
.pc/0002-procps.patch/configure (+0/-25491)
.pc/0002-procps.patch/configure.ac (+0/-1234)
.pc/0003-dkms.patch/modules/linux/dkms.conf (+0/-39)
.pc/0004-dkms-vmsync.patch/modules/linux/dkms.conf (+0/-39)
.pc/0005-kernel-38-fixes.patch/modules/linux/shared/compat_mm.h (+0/-107)
.pc/0005-kernel-38-fixes.patch/modules/linux/vmci/linux/driver.c (+0/-2522)
.pc/applied-patches (+0/-5)
configure (+1/-1)
configure.ac (+1/-1)
modules/linux/dkms.conf (+12/-7)
modules/linux/shared/compat_mm.h (+1/-11)
modules/linux/vmblock/Makefile (+1/-1)
modules/linux/vmci/Makefile (+1/-1)
modules/linux/vmci/linux/driver.c (+3/-0)
modules/linux/vmhgfs/Makefile (+1/-1)
modules/linux/vmsync/Makefile (+1/-1)
modules/linux/vmxnet/Makefile (+1/-1)
modules/linux/vsock/Makefile (+1/-1)
Branch information
- Owner:
- Ubuntu branches
- Status:
- Development
Recent revisions
- 35. By Luke Yelavich
-
Merge branch lp:~n-muench/ubuntu/raring/open-vm-tools/open-vm-tools-december.sid-sync
- 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 - 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 - 28. By Adam Conrad
-
* Build-depend on the new libprocps0-dev instead of libproc-dev.
* Change the way we export -Wno-deprecated-declarations to make
the package no longer FTBFS with the latest dpkg/debhelper.
* Snag the 02-procps.patch patch from Debian for the proc rename. - 27. By Nate Muench (Mink)
-
* Merge latest upstream git tag. Fixes building on Precise
(LP: #898289, LP: #905612)* Items merged from Debian unstable:
- debian/control:
+ open-vm-tools recommends open-vm-dkms. (LP: #598933)
+ open-vm-tools now suggests open-vm-toolbox. (LP: #604998)
(From 2011.08.21-471295-1 release)
- Updating maintainer and uploaders fields.
- Removing vcs fields.
- Removing references to Daniel'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.
(From 2011.09.23-491607-1 release)
- Marking binary architecture-dependend packages as linux and kfreebsd
only.
- Removing liburiparser-dev from build-depends as upstream dropped
unity support.
- Building with libproc-dev on amd64 again.
- Dropping disabling of dnet support.
(From 2011.09.23-491607-2 release)
- Adding doxygen to build-depends for api documentation.
- Adding libcunit1-dev to build-depends for test suites.
- Minimizing rules file.
- Adding open-vm-tools-dev package, containing only the api
documentation for now.
(From 2011.09.23-491607-3 release)
- Sorting overrides in rules alphabetically.
- Compacting copyright file.
- Adding udev rule to set timeout for vmware scsi devices
(From 2011.12.20-562307-1 release)
- Adding patch to correct typo in upstreams dkms configuration* Remaining Changes:
- Remove Stable part of version numbering.
- debian folder:
+ Re-added open-vm-dkms.postinst & open-vm-dkms.prerm.
* Allows dkms modules to compile upon installation.
- debian/control:
+ Re-add open-vm-source and make into a transitional package
for open-vm-toolbox.
+ Return dependancies that were moved to open-vm-tools back to
open-vm-toolbox.
- debian/rules and debian/open-vm- toolbox. lintian- overrides:
+ Make vmware-user-suid- wrapper suid-root
- debian/rules:
+ Added CFLAGS field with -Wno-deprecated-declarations
* Will suppress issues with glib 2.31 or later.
+ Add line to copy vmware-xdg-detect- de into place.
+ Install vmware-user.desktop through toolbox package.
- debian/open-vm- tools.init:
+ Re-add 'modprobe [-r] vmblock'.
+ Add 'modprobe [-r] vmxnet'.
* Incase it's not loaded during boot.
+ Remove and re-add pcnet32 module
* Will be done before (remove) and after (readd) vmxnet module
is added.
* If vmxnet doesn't exist (aka modules fail to build), pcnet32 can be
still used for network connectivity.
* Workaround until a better fix can be done.
- Re-add gnome-session to debian/local/xautostar t.conf
- Manpages removed (from debian/manpages):
+ vmmemctl.9
+ vmxnet3.9
+ Remove references to manpages that have been removed.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/raring/open-vm-tools