lp://staging/~n-muench/ubuntu/raring/open-vm-tools/open-vm-tools-december.sid-sync
- Get this branch:
- bzr branch lp://staging/~n-muench/ubuntu/raring/open-vm-tools/open-vm-tools-december.sid-sync
Branch merges
- Luke Yelavich (community): Needs Fixing
-
Diff: 62585 lines (+30921/-30781)55 files modified.pc/0001-kvers.patch/modules/linux/vmblock/Makefile (+171/-0)
.pc/0001-kvers.patch/modules/linux/vmci/Makefile (+171/-0)
.pc/0001-kvers.patch/modules/linux/vmhgfs/Makefile (+171/-0)
.pc/0001-kvers.patch/modules/linux/vmsync/Makefile (+171/-0)
.pc/0001-kvers.patch/modules/linux/vmxnet/Makefile (+171/-0)
.pc/0001-kvers.patch/modules/linux/vsock/Makefile (+171/-0)
.pc/0002-procps.patch/configure (+25491/-0)
.pc/0002-procps.patch/configure.ac (+1234/-0)
.pc/0003-dkms.patch/modules/linux/dkms.conf (+39/-0)
.pc/0004-dkms-vmsync.patch/modules/linux/dkms.conf (+39/-0)
.pc/0005-kernel-38-fixes.patch/modules/linux/shared/compat_mm.h (+107/-0)
.pc/0005-kernel-38-fixes.patch/modules/linux/vmci/linux/driver.c (+2522/-0)
.pc/01-kvers.patch/modules/linux/vmblock/Makefile (+0/-171)
.pc/01-kvers.patch/modules/linux/vmci/Makefile (+0/-171)
.pc/01-kvers.patch/modules/linux/vmhgfs/Makefile (+0/-171)
.pc/01-kvers.patch/modules/linux/vmsync/Makefile (+0/-171)
.pc/01-kvers.patch/modules/linux/vmxnet/Makefile (+0/-171)
.pc/01-kvers.patch/modules/linux/vsock/Makefile (+0/-171)
.pc/02-procps.patch/configure (+0/-25491)
.pc/02-procps.patch/configure.ac (+0/-1234)
.pc/03-dkms.patch/modules/linux/dkms.conf (+0/-39)
.pc/04-dkms-vmsync.patch/modules/linux/dkms.conf (+0/-39)
.pc/05-kernel-38-fixes.patch/modules/linux/shared/compat_mm.h (+0/-107)
.pc/05-kernel-38-fixes.patch/modules/linux/vmci/linux/driver.c (+0/-2522)
.pc/applied-patches (+5/-5)
debian/changelog (+207/-68)
debian/control (+5/-5)
debian/copyright (+1/-1)
debian/manpages/libguestlib.3 (+1/-1)
debian/manpages/libvmtools.3 (+1/-1)
debian/manpages/vmblock.9 (+1/-1)
debian/manpages/vmci.9 (+1/-1)
debian/manpages/vmhgfs.9 (+1/-1)
debian/manpages/vmsock.9 (+1/-1)
debian/manpages/vmware-checkvm.1 (+1/-1)
debian/manpages/vmware-hgfsclient.1 (+1/-1)
debian/manpages/vmware-hgfsmounter.8 (+1/-1)
debian/manpages/vmware-toolbox-cmd.1 (+1/-1)
debian/manpages/vmware-user-suid-wrapper.8 (+1/-1)
debian/manpages/vmware-xferlogs.1 (+1/-1)
debian/manpages/vmxnet.9 (+1/-1)
debian/open-vm-tools.init (+4/-4)
debian/patches/0001-kvers.patch (+75/-0)
debian/patches/0002-procps.patch (+27/-0)
debian/patches/0003-dkms.patch (+18/-0)
debian/patches/0004-dkms-vmsync.patch (+45/-0)
debian/patches/0005-kernel-38-fixes.patch (+55/-0)
debian/patches/01-kvers.patch (+0/-75)
debian/patches/02-procps.patch (+0/-27)
debian/patches/03-dkms.patch (+0/-18)
debian/patches/04-dkms-vmsync.patch (+0/-45)
debian/patches/05-kernel-38-fixes.patch (+0/-55)
debian/patches/series (+5/-5)
debian/rules (+2/-1)
debian/source/options (+1/-1)
Branch information
- Owner:
- Nate Muench (Mink)
- Status:
- Merged
Recent revisions
- 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.
* Removing all references to my old email address.
* Updating to standards version 3.9.4.
* Shortening build-depends on procps again.
* Updating year in copyright file.
* Prefixing patches with 4 digits for consistency.
* Tightening diff headers in patches.
* Adding dpkg-source local-options to abort on upstream changes.
* Dropping dpkg-source compression levels.
* Removing init order to network also on start (Closes: #695845).
* Correcting daemon name in stop section of the initscript (Closes:
#696056).
* Removing init order to network (Closes: #695845).
* Correcting version number (Closes: #695912).
* Don't check for vm on stop in initscript (Closes: #695993).
* Switching to xz compression again for jessie.
* Loading modules through kmod instead of initscript again for jessie.
* Adding sleep during restart in initscript again for jessie.
* Removing old dpkg trigger for update-initramfs again for jessie.
* Updating of GPL boilerplate in copyright file again for jessie.
* Adding bugnumber to previous changelog entries regarding wheezy
unblocks.
* Merging upstream version 9.2.2-893683.
* Adding remote_fs dependency in initscript (Closes: #695845).
* Handling binNMU/nmu/backports version numbers in rules.
* Using suggested start-stop-daemon handling in initscript from Bernd
Zeimetz <email address hidden> (Closes: #686200).
* Adding changelog for 8.8.0+2012.05.21-724730- 1+nmu1 (Closes: #687205).
* Correcting architecture fields in control.
* Keeping vmware-user-suid- wrapper completely in vmware-tools rather
than partially in vmware-toolbox (Closes: #686202).
* Non-maintainer upload to ensure open-vm-tools will
be shipped with Wheezy.
* Ensure upgrades to not fail due to the broken init script
(Closes: #686200)
- Fix open-vm-tools init script to stop vmtoolsd properly.
- Handle upgrades from a version with broken init script.
Try to stop again, just in case. Ignore errors as we don't know
how successful the old buggy script was.
* Remove the duplicate vmware-suid-wrapper from open-vm-toolbox.
The better way would be to ship it in open-vm-toolbox instead of
open-vm-tools, but to avoid moving config files from one package
into another we will keep it this way for Wheezy. Partly addresses
#686202.
* Handle binNMU/nmu/backports/ ... version numbers.
The old way to parse the version string from debian/changelog fails
on binNMU/nmu/security/ ... version numbers. Fixing this.
(Closes: #686582)
* Updating GPL boilerplate in copyright file.
* Calling dh_dkms with version argument (Closes: #677503).
* Updating dkms.conf to make modules build again,
thanks to H.A.J. Koster (Closes: #679886).
* Reverting switch to xz compression to ease wheezy unblock (#683299).
* Reverting to load modules through kmod instead of initscript to ease
wheezy unblock (#683299).
* Reverting added sleep during restart in initscript to ease wheezy
unblock (#683299).
* Reverting removing old dpkg trigger for update-initramfs to ease
wheezy unblock (#683299).
* Reverting update of GPL boilerplate in copyright file to ease wheezy
unblock (#683299). - 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://staging/ubuntu/raring/open-vm-tools