Merge lp://staging/~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-august.merge2 into lp://staging/ubuntu/precise/open-vm-tools
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-august.merge2 |
| Merge into: | lp://staging/ubuntu/precise/open-vm-tools |
| Diff against target: |
15040 lines (+1988/-10490) 85 files modified
ChangeLog (+5/-0) NEWS (+5/-0) autom4te.cache/output.0 (+39/-10) autom4te.cache/output.1 (+39/-10) autom4te.cache/output.2 (+39/-10) autom4te.cache/traces.0 (+156/-153) autom4te.cache/traces.1 (+336/-333) autom4te.cache/traces.2 (+156/-153) configure (+39/-10) configure.ac (+15/-2) debian/README.source (+0/-37) debian/changelog (+85/-57) debian/compat (+1/-1) debian/control (+7/-9) debian/control.modules.in (+3/-7) debian/copyright (+1/-6) debian/open-vm-source.README.Debian (+1/-1) debian/patches/01-kvers.patch (+73/-78) debian/rules (+4/-28) debian/source/format (+1/-1) lib/auth/authPosix.c (+2/-0) lib/file/fileIO.c (+52/-0) lib/file/fileIOPosix.c (+61/-49) lib/hgfsServer/hgfsServer.c (+12/-2) lib/include/backdoor_def.h (+2/-1) lib/include/buildNumber.h (+6/-6) lib/include/fileIO.h (+7/-3) lib/include/guestInfo.h (+0/-10) lib/include/hostinfo.h (+2/-4) lib/include/loglevel_user.h (+4/-0) lib/include/msgfmt.h (+6/-2) lib/include/mutexRankLib.h (+21/-15) lib/include/posix.h (+1/-0) lib/include/unityCommon.h (+2/-1) lib/include/vixCommands.h (+0/-1) lib/include/vm_basic_asm.h (+4/-4) lib/include/vm_product.h (+18/-4) lib/include/vm_version.h (+33/-10) lib/include/vmci_defs.h (+8/-2) lib/misc/hostinfo.c (+59/-30) lib/misc/hostinfoHV.c (+3/-9) lib/misc/hostinfoInt.h (+2/-2) lib/misc/posixDlopen.c (+2/-2) lib/misc/posixPosix.c (+41/-1) lib/procMgr/procMgrPosix.c (+221/-15) lib/wiper/wiperPosix.c (+20/-2) modules/freebsd/vmhgfs/vnopscommon.c (+20/-13) modules/linux/dkms.conf (+1/-1) modules/linux/dkms.sh (+2/-2) modules/linux/shared/compat_netdevice.h (+7/-1) modules/linux/shared/vmci_defs.h (+8/-2) modules/linux/shared/vmci_infrastructure.h (+1/-0) modules/linux/vmblock/Makefile (+1/-1) modules/linux/vmci/Makefile (+1/-1) modules/linux/vmci/common/vmciContext.c (+44/-0) modules/linux/vmci/common/vmciContext.h (+1/-0) modules/linux/vmci/common/vmciEvent.c (+18/-2) modules/linux/vmhgfs/Makefile (+1/-1) modules/linux/vmsync/Makefile (+1/-1) modules/linux/vmxnet/Makefile (+1/-1) modules/linux/vsock/Makefile (+1/-1) modules/linux/vsock/linux/vsockSocketWrapper.h (+3/-0) services/plugins/guestInfo/guestInfoServer.c (+30/-25) services/plugins/unity/Makefile.am (+8/-6) services/plugins/unity/Makefile.in (+55/-49) services/plugins/unity/unityTclo.cpp (+1/-0) services/plugins/unity/unitylib/unity.c (+3/-15) services/plugins/unity/unitylib/unity.h (+8/-18) services/plugins/unity/unitylib/unityPlatform.h (+3/-5) services/plugins/unity/unitylib/unityPlatformX11.cc (+0/-3341) services/plugins/unity/unitylib/unityPlatformX11Settings.cc (+0/-1032) services/plugins/unity/unitylib/unityPlatformX11Window.cc (+0/-3813) services/plugins/unity/unitylib/unityX11.h (+0/-496) services/plugins/unity/unitylib/x11Event.cc (+0/-352) services/plugins/unity/unitylib/x11Util.cc (+0/-77) services/plugins/vix/foundryToolsDaemon.c (+8/-83) services/plugins/vix/vixPlugin.c (+0/-2) services/plugins/vix/vixPluginInt.h (+0/-3) services/plugins/vix/vixTools.c (+141/-51) services/plugins/vix/vixToolsEnvVars.c (+4/-8) services/plugins/vix/vixToolsInt.h (+5/-1) services/vmtoolsd/mainLoop.c (+8/-0) toolbox/l10n/de.vmsg (+5/-3) toolbox/l10n/ja.vmsg (+2/-0) toolbox/l10n/zh_CN.vmsg (+2/-2) |
| To merge this branch: | bzr merge lp://staging/~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-august.merge2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Stefano Rivera | Needs Fixing | ||
|
Review via email:
|
|||
Description of the change
This is the August release of the package.
The packaging includes some changes from the Debian unstable upload (namely the upgrade to quilt 3.0). The main things not merged from Debian include: open-vm-dkms remaining and open-vm-toolbox staying as a transitional package.
I've added numlockx to the suggested packages for open-vm-tools because the numlock doesn't engage after login (I don't know if I'm the only one encountering this). This is a temporary workaround until something better can be put into place.
I've removed the commented out lines from debian/rules, ones that were suppose to be removed before the last merge (but issues prevented it from being removed).
I used bzr import-dsc to add the newest revision. I think I did it right this time, although, I don't know if that .pc directory should be there or not (it's not in the source packaging). If you want me to resubmit it, I would be happy to.
You can consult my working branch for this merge:
https:/
Built packages can be found here:
https:/
Since this wasn't approved in time for the Oneiric, I'm resubmitting it for merging in the Precise branch, since we got 6 month before release.
Unmerged 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.
$ bzr branch lp:ubuntu/open-vm-tools
$ cd open-vm-tools
$ bzr merge-package lp:~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-august.merge2
bzr: ERROR: None 2011.08.21-471295 was not found in <PristineTarSource ...
Please use bzr merge-upstream, when grabbing new upstream versions.
Have you considered working with the Debian maintainer on this package?