Merge lp://staging/~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-merge1 into lp://staging/ubuntu/precise/open-vm-tools
| Status: | Rejected |
|---|---|
| Rejected by: | James Page |
| Proposed branch: | lp://staging/~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-merge1 |
| Merge into: | lp://staging/ubuntu/precise/open-vm-tools |
| Diff against target: |
84320 lines (+20936/-47724) 405 files modified
ChangeLog (+25/-0) Makefile.in (+0/-8) NEWS (+43/-0) autom4te.cache/output.0 (+106/-1046) autom4te.cache/output.1 (+106/-1046) autom4te.cache/output.2 (+106/-1046) autom4te.cache/traces.0 (+487/-503) autom4te.cache/traces.1 (+1014/-1050) autom4te.cache/traces.2 (+487/-503) checkvm/Makefile.in (+0/-8) configure (+123/-1063) configure.ac (+44/-123) debian/README.source (+0/-37) debian/changelog (+75/-0) debian/compat (+1/-1) debian/control (+52/-32) debian/control.modules.in (+0/-26) debian/copyright (+69/-62) debian/local/Makefile (+0/-25) debian/manpages/libguestlib.3 (+1/-3) debian/manpages/libvmtools.3 (+1/-3) debian/manpages/vmblock.9 (+1/-3) debian/manpages/vmci.9 (+1/-3) debian/manpages/vmhgfs.9 (+2/-6) debian/manpages/vmsock.9 (+1/-3) debian/manpages/vmsync.9 (+1/-3) debian/manpages/vmware-checkvm.1 (+1/-3) debian/manpages/vmware-hgfsclient.1 (+1/-3) debian/manpages/vmware-hgfsmounter.8 (+1/-3) debian/manpages/vmware-toolbox-cmd.1 (+3/-3) debian/manpages/vmware-user-suid-wrapper.8 (+1/-3) debian/manpages/vmware-user.1 (+0/-69) debian/manpages/vmware-xferlogs.1 (+1/-3) debian/manpages/vmxnet.9 (+1/-3) debian/open-vm-dkms.dkms (+26/-0) debian/open-vm-source.README.Debian (+0/-18) debian/open-vm-source.links (+0/-1) debian/open-vm-toolbox.lintian-overrides (+2/-0) debian/open-vm-toolbox.manpages (+1/-0) debian/open-vm-tools.init (+4/-0) debian/open-vm-tools.lintian-overrides (+0/-2) debian/open-vm-tools.manpages (+0/-2) debian/open-vm-tools.udev (+7/-0) debian/patches/01-kvers.patch (+64/-70) debian/patches/03-dkms.patch (+18/-0) debian/patches/series (+1/-0) debian/rules (+54/-220) debian/source/format (+1/-1) debian/source/options (+2/-0) docs/Makefile.in (+0/-8) docs/api/Makefile.in (+0/-8) docs/api/services/main.doxy (+1/-0) hgfsclient/Makefile.in (+0/-8) hgfsmounter/Makefile.in (+0/-8) hgfsmounter/hgfsmounter.c (+1/-1) lib/Makefile.am (+1/-7) lib/Makefile.in (+12/-22) lib/appUtil/Makefile.in (+0/-8) lib/auth/Makefile.in (+0/-8) lib/auth/authPosix.c (+19/-2) lib/backdoor/Makefile.in (+0/-8) lib/backdoor/backdoorGcc64.c (+1/-1) lib/dict/Makefile.in (+0/-8) lib/dynxdr/Makefile.in (+0/-8) lib/err/Makefile.in (+0/-8) lib/file/Makefile.in (+0/-8) lib/file/file.c (+72/-5) lib/file/fileIO.c (+521/-15) lib/file/fileIOPosix.c (+100/-83) lib/file/fileInt.h (+8/-10) lib/file/fileLockPosix.c (+93/-44) lib/file/fileLockPrimitive.c (+366/-109) lib/file/filePosix.c (+22/-8) lib/file/fileStandAlone.c (+15/-0) lib/foundryMsg/Makefile.in (+0/-8) lib/foundryMsg/foundryMsg.c (+8/-12) lib/foundryMsg/vixTranslateErrOpenSource.c (+1/-0) lib/glibUtils/Makefile.am (+26/-0) lib/glibUtils/Makefile.in (+581/-0) lib/glibUtils/fileLogger.c (+418/-0) lib/glibUtils/stdLogger.c (+241/-0) lib/glibUtils/sysLogger.c (+209/-0) lib/guestApp/Makefile.in (+0/-8) lib/guestRpc/Makefile.in (+0/-8) lib/hgfs/Makefile.in (+0/-8) lib/hgfs/hgfsUtil.c (+7/-1) lib/hgfsBd/Makefile.in (+0/-8) lib/hgfsHelper/Makefile.in (+0/-8) lib/hgfsServer/Makefile.in (+0/-8) lib/hgfsServer/hgfsServer.c (+530/-102) lib/hgfsServer/hgfsServerInt.h (+83/-21) lib/hgfsServer/hgfsServerLinux.c (+24/-17) lib/hgfsServer/hgfsServerPacketUtil.c (+34/-34) lib/hgfsServer/hgfsServerParameters.c (+50/-13) lib/hgfsServerManagerGuest/Makefile.in (+0/-8) lib/hgfsServerManagerGuest/hgfsChannelGuest.c (+39/-0) lib/hgfsServerManagerGuest/hgfsChannelGuestBd.c (+41/-0) lib/hgfsServerManagerGuest/hgfsChannelGuestInt.h (+2/-0) lib/hgfsServerManagerGuest/hgfsServerManagerGuest.c (+25/-0) lib/hgfsServerPolicyGuest/Makefile.in (+0/-8) lib/image/Makefile.am (+0/-25) lib/image/Makefile.in (+0/-565) lib/image/imageUtilPng.c (+0/-511) lib/impersonate/Makefile.in (+0/-8) lib/include/backdoor_def.h (+14/-2) lib/include/base64.h (+3/-0) lib/include/buildNumber.h (+6/-6) lib/include/cpuid_info.h (+1/-82) lib/include/dndGuest.h (+0/-52) lib/include/file.h (+17/-0) lib/include/fileIO.h (+34/-3) lib/include/fileLock.h (+18/-7) lib/include/glibUtils.h (+85/-0) lib/include/guestInfo.h (+0/-10) lib/include/guest_os.h (+28/-7) lib/include/hashTable.h (+51/-2) lib/include/hgfs.h (+1/-0) lib/include/hgfsProto.h (+1/-1) lib/include/hgfsServer.h (+1/-0) lib/include/hgfsServerManager.h (+1/-0) lib/include/hgfsUtil.h (+2/-0) lib/include/hostinfo.h (+49/-34) lib/include/imageUtil.h (+0/-67) lib/include/imageUtilTypes.h (+0/-84) lib/include/includeCheck.h (+9/-2) lib/include/iovector.h (+2/-2) lib/include/log.h (+27/-27) lib/include/loglevel_defs.h (+0/-2) lib/include/loglevel_user.h (+14/-0) lib/include/memaligned.h (+122/-9) lib/include/msg.h (+1/-0) lib/include/msgList.h (+7/-5) lib/include/msgfmt.h (+6/-2) lib/include/msgid.h (+1/-26) lib/include/msgidDefs.h (+60/-0) lib/include/mutexRankLib.h (+30/-22) lib/include/posix.h (+4/-1) lib/include/preference.h (+2/-1) lib/include/procMgr.h (+17/-10) lib/include/rasterConv.h (+0/-88) lib/include/region.h (+0/-278) lib/include/str.h (+1/-1) lib/include/strutil.h (+1/-0) lib/include/syncDriver.h (+3/-10) lib/include/system.h (+0/-1) lib/include/unityCommon.h (+0/-1039) lib/include/userlock.h (+8/-5) lib/include/util.h (+3/-0) lib/include/vix.h (+1/-0) lib/include/vixCommands.h (+22/-100) lib/include/vm_assert.h (+7/-18) lib/include/vm_atomic.h (+134/-82) lib/include/vm_basic_asm.h (+12/-11) lib/include/vm_basic_defs.h (+8/-0) lib/include/vm_basic_types.h (+3/-3) lib/include/vm_product.h (+29/-9) lib/include/vm_tools_version.h (+9/-2) lib/include/vm_version.h (+46/-19) lib/include/vmci_defs.h (+38/-7) lib/include/vmci_sockets.h (+1/-0) lib/include/vmware/tools/unityevents.h (+0/-44) lib/include/win32util.h (+2/-0) lib/include/x86cpuid.h (+143/-20) lib/lock/Makefile.in (+0/-8) lib/lock/ul.c (+511/-220) lib/lock/ulBarrier.c (+9/-9) lib/lock/ulCondVar.c (+17/-15) lib/lock/ulExcl.c (+25/-15) lib/lock/ulInt.h (+82/-37) lib/lock/ulRW.c (+14/-11) lib/lock/ulRec.c (+181/-40) lib/lock/ulSema.c (+18/-14) lib/message/Makefile.in (+0/-8) lib/misc/Makefile.am (+3/-4) lib/misc/Makefile.in (+14/-27) lib/misc/base64.c (+64/-16) lib/misc/codeset.c (+27/-27) lib/misc/codesetBase.c (+26/-0) lib/misc/codesetOld.h (+0/-32) lib/misc/dynbuf.c (+4/-18) lib/misc/hostinfo.c (+59/-30) lib/misc/hostinfoHV.c (+3/-9) lib/misc/hostinfoInt.h (+2/-2) lib/misc/hostinfoPosix.c (+137/-29) lib/misc/iovector.c (+36/-25) lib/misc/msgList.c (+530/-0) lib/misc/msgfmt.c (+2838/-0) lib/misc/posixDlopen.c (+2/-2) lib/misc/posixPosix.c (+41/-1) lib/misc/random.c (+84/-73) lib/misc/strutil.c (+40/-0) lib/misc/utilMem.c (+84/-0) lib/misc/vthreadBase.c (+9/-6) lib/netUtil/Makefile.in (+0/-8) lib/panic/Makefile.in (+0/-8) lib/panicDefault/Makefile.in (+0/-8) lib/printer/Makefile.in (+0/-8) lib/procMgr/Makefile.in (+0/-8) lib/procMgr/procMgrPosix.c (+580/-125) lib/procMgr/procMgrSolaris.c (+46/-78) lib/raster/Makefile.am (+0/-21) lib/raster/Makefile.in (+0/-564) lib/raster/rasterConv.c (+0/-1509) lib/region/Makefile.am (+0/-21) lib/region/Makefile.in (+0/-564) lib/region/region.c (+0/-3102) lib/rpcChannel/Makefile.in (+0/-8) lib/rpcChannel/rpcChannel.c (+2/-1) lib/rpcIn/Makefile.in (+0/-8) lib/rpcIn/rpcin.c (+9/-0) lib/rpcOut/Makefile.in (+0/-8) lib/rpcVmx/Makefile.in (+0/-8) lib/slashProc/Makefile.in (+0/-8) lib/string/Makefile.am (+7/-3) lib/string/Makefile.in (+9/-13) lib/stubs/Makefile.am (+5/-0) lib/stubs/Makefile.in (+9/-11) lib/stubs/stub-log.c (+18/-4) lib/stubs/stub-msgfmt-fbsd.c (+55/-0) lib/syncDriver/Makefile.am (+7/-0) lib/syncDriver/Makefile.in (+12/-11) lib/syncDriver/nullDriver.c (+86/-0) lib/syncDriver/syncDriverInt.h (+65/-0) lib/syncDriver/syncDriverLinux.c (+239/-0) lib/syncDriver/syncDriverPosix.c (+45/-153) lib/syncDriver/vmSyncDriver.c (+138/-0) lib/system/Makefile.in (+0/-8) lib/unicode/Makefile.in (+0/-8) lib/user/Makefile.in (+0/-8) lib/vmCheck/Makefile.in (+0/-8) lib/vmCheck/vmcheck.c (+0/-20) lib/vmSignal/Makefile.in (+0/-8) lib/wiper/Makefile.in (+0/-8) lib/wiper/wiperPosix.c (+20/-2) lib/xdg/Makefile.am (+2/-0) lib/xdg/Makefile.in (+10/-10) lib/xdg/xdg.c (+16/-7) libguestlib/Makefile.in (+0/-8) libhgfs/Makefile.in (+0/-8) libvmtools/Makefile.am (+1/-3) libvmtools/Makefile.in (+15/-49) libvmtools/fileLogger.c (+0/-479) libvmtools/i18n.c (+1/-1) libvmtools/signalSource.c (+2/-2) libvmtools/stdLogger.c (+0/-147) libvmtools/sysLogger.c (+0/-223) libvmtools/vmtoolsInt.h (+3/-79) libvmtools/vmtoolsLog.c (+215/-303) libvmtools/vmxLogger.c (+22/-39) modules/Makefile.in (+0/-8) 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 (+14/-75) modules/linux/shared/compat_version.h (+16/-0) modules/linux/shared/vmci_call_defs.h (+12/-4) modules/linux/shared/vmci_defs.h (+38/-7) modules/linux/shared/vmci_infrastructure.h (+1/-0) modules/linux/shared/vmci_iocontrols.h (+51/-21) modules/linux/shared/vmci_kernel_if.h (+124/-84) modules/linux/vmblock/Makefile (+2/-2) modules/linux/vmci/Makefile (+3/-3) modules/linux/vmci/Makefile.normal (+3/-2) modules/linux/vmci/common/vmciCommonInt.h (+8/-40) modules/linux/vmci/common/vmciContext.c (+427/-257) modules/linux/vmci/common/vmciContext.h (+13/-14) modules/linux/vmci/common/vmciDatagram.c (+29/-267) modules/linux/vmci/common/vmciDatagram.h (+0/-5) modules/linux/vmci/common/vmciDoorbell.c (+31/-35) modules/linux/vmci/common/vmciEvent.c (+78/-34) modules/linux/vmci/common/vmciHashtable.c (+38/-52) modules/linux/vmci/common/vmciPageChannel.c (+1472/-0) modules/linux/vmci/common/vmciQPair.c (+561/-189) modules/linux/vmci/common/vmciQueuePair.c (+1360/-1011) modules/linux/vmci/common/vmciQueuePair.h (+17/-80) modules/linux/vmci/common/vmciResource.c (+25/-2) modules/linux/vmci/common/vmciResource.h (+1/-1) modules/linux/vmci/common/vmciRoute.c (+16/-15) modules/linux/vmci/linux/driver.c (+258/-268) modules/linux/vmci/linux/vmciKernelIf.c (+580/-110) modules/linux/vmci/linux/vmci_version.h (+4/-4) modules/linux/vmci/shared/vmciQueue.h (+60/-7) modules/linux/vmci/shared/vmci_page_channel.h (+240/-0) modules/linux/vmhgfs/Makefile (+2/-2) modules/linux/vmhgfs/file.c (+6/-0) modules/linux/vmhgfs/filesystem.c (+81/-19) modules/linux/vmhgfs/fsutil.c (+26/-1) modules/linux/vmhgfs/tcp.c (+1/-0) modules/linux/vmsync/Makefile (+2/-2) modules/linux/vmxnet/Makefile (+2/-2) modules/linux/vmxnet/vmxnet.c (+41/-13) modules/linux/vmxnet/vmxnet_version.h (+3/-3) modules/linux/vsock/Makefile (+2/-2) modules/linux/vsock/linux/af_vsock.c (+89/-85) modules/linux/vsock/linux/notify.c (+7/-7) modules/linux/vsock/linux/notify.h (+7/-7) modules/linux/vsock/linux/notifyQState.c (+6/-6) modules/linux/vsock/linux/vsockAddr.c (+7/-2) modules/linux/vsock/linux/vsockSocketWrapper.h (+11/-1) modules/linux/vsock/linux/vsock_version.h (+3/-3) modules/shared/vmblock/block.c (+249/-244) modules/shared/vmxnet/eth_public.h (+24/-1) modules/shared/vmxnet/vmnet_def.h (+1/-0) rpctool/Makefile.in (+0/-8) scripts/Makefile.in (+0/-8) scripts/common/vm-support (+1/-0) scripts/common/vmware-xdg-detect-de (+51/-9) scripts/linux/network (+82/-36) scripts/linux/pam.d/vmtoolsd (+1/-1) services/Makefile.am (+0/-4) services/Makefile.in (+9/-21) services/plugins/Makefile.am (+0/-3) services/plugins/Makefile.in (+2/-11) services/plugins/desktopEvents/Makefile.in (+0/-8) services/plugins/dndcp/Makefile.in (+0/-8) services/plugins/dndcp/copyPasteDnDX11.cpp (+0/-39) services/plugins/dndcp/dnd/dndLinux.c (+19/-3) services/plugins/dndcp/dndUIX11.cpp (+0/-1) services/plugins/dndcp/stringxx/string.cc (+24/-0) services/plugins/dndcp/stringxx/string.hh (+1/-0) services/plugins/guestInfo/Makefile.in (+0/-8) services/plugins/guestInfo/getlib/Makefile.in (+0/-8) services/plugins/guestInfo/getlib/guestInfo.c (+28/-0) services/plugins/guestInfo/guestInfoServer.c (+30/-25) services/plugins/hgfsServer/Makefile.in (+0/-8) services/plugins/powerOps/Makefile.in (+0/-8) services/plugins/resolutionSet/Makefile.in (+0/-8) services/plugins/resolutionSet/resolutionRandR12.c (+0/-2) services/plugins/resolutionSet/resolutionRandR12.h (+1/-2) services/plugins/resolutionSet/resolutionX11.c (+55/-9) services/plugins/timeSync/Makefile.in (+0/-8) services/plugins/unity/Makefile.am (+0/-201) services/plugins/unity/Makefile.in (+0/-1048) services/plugins/unity/ghIntegration/ghIntegration.cpp (+0/-587) services/plugins/unity/ghIntegration/ghIntegration.h (+0/-117) services/plugins/unity/ghIntegration/ghIntegrationInt.h (+0/-137) services/plugins/unity/ghIntegration/ghiX11icon.h (+0/-40) services/plugins/unity/ghIntegration/icon.cc (+0/-464) services/plugins/unity/ghIntegration/platform.cc (+0/-1533) services/plugins/unity/ghIntegration/pseudoAppMgr.cc (+0/-270) services/plugins/unity/ghIntegration/vmware/tools/ghi/pseudoAppMgr.hh (+0/-83) services/plugins/unity/ghiCommonDefines.h (+0/-46) services/plugins/unity/ghiGetBinaryHandlers.x (+0/-133) services/plugins/unity/ghiGetExecInfoHash.x (+0/-69) services/plugins/unity/ghiProtocolHandler.x (+0/-69) services/plugins/unity/ghiSetFocusedWindow.x (+0/-56) services/plugins/unity/ghiSetGuestHandler.x (+0/-103) services/plugins/unity/ghiSetOutlookTempFolder.x (+0/-57) services/plugins/unity/ghiShellAction.x (+0/-89) services/plugins/unity/ghiStartMenu.x (+0/-64) services/plugins/unity/ghiTclo.cpp (+0/-1635) services/plugins/unity/ghiTclo.h (+0/-57) services/plugins/unity/ghiTrayIcon.x (+0/-104) services/plugins/unity/toolsPlugin.cpp (+0/-206) services/plugins/unity/unity.x (+0/-254) services/plugins/unity/unityActive.x (+0/-33) services/plugins/unity/unityPlugin.cpp (+0/-301) services/plugins/unity/unityPlugin.h (+0/-236) services/plugins/unity/unityPluginEntry.cpp (+0/-112) services/plugins/unity/unityPluginPosix.cpp (+0/-276) services/plugins/unity/unityPluginPosix.h (+0/-64) services/plugins/unity/unityTclo.cpp (+0/-2436) services/plugins/unity/unityTclo.h (+0/-71) services/plugins/unity/unityWindowTracker/unityWindowTracker.c (+0/-1814) services/plugins/unity/unityWindowTracker/unityWindowTracker.h (+0/-397) services/plugins/unity/unitylib/unity.c (+0/-1321) services/plugins/unity/unitylib/unity.h (+0/-243) services/plugins/unity/unitylib/unityDebug.h (+0/-41) services/plugins/unity/unitylib/unityInt.h (+0/-59) services/plugins/unity/unitylib/unityPlatform.h (+0/-141) 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/vmware/tools/unity/windowPathFactory.hh (+0/-79) services/plugins/unity/unitylib/windowPathFactory.cc (+0/-531) services/plugins/unity/unitylib/x11Event.cc (+0/-352) services/plugins/unity/unitylib/x11Util.cc (+0/-77) services/plugins/vix/Makefile.in (+0/-8) services/plugins/vix/foundryToolsDaemon.c (+11/-90) services/plugins/vix/vixPlugin.c (+0/-2) services/plugins/vix/vixPluginInt.h (+0/-3) services/plugins/vix/vixTools.c (+416/-201) services/plugins/vix/vixToolsEnvVars.c (+4/-8) services/plugins/vix/vixToolsInt.h (+5/-1) services/plugins/vmbackup/Makefile.in (+0/-8) services/plugins/vmbackup/stateMachine.c (+1/-1) services/vmtoolsd/Makefile.in (+0/-8) services/vmtoolsd/mainLoop.c (+8/-0) tests/Makefile.in (+0/-8) tests/testDebug/Makefile.in (+0/-8) tests/testPlugin/Makefile.in (+0/-8) tests/testVmblock/Makefile.in (+0/-8) tests/vmrpcdbg/Makefile.in (+0/-8) toolbox/Makefile.in (+0/-8) toolbox/l10n/de.vmsg (+5/-3) toolbox/l10n/ja.vmsg (+2/-0) toolbox/l10n/zh_CN.vmsg (+2/-2) toolbox/toolboxcmd-shrink.c (+29/-7) vmblock-fuse/Makefile.in (+0/-8) vmblock-fuse/os.h (+1/-0) vmblockmounter/Makefile.in (+0/-8) vmware-user-suid-wrapper/Makefile.in (+0/-8) vmware-user-suid-wrapper/wrapper-solaris.c (+3/-3) xferlogs/Makefile.in (+0/-8) |
| To merge this branch: | bzr merge lp://staging/~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-merge1 |
| Related bugs: | |
| Related blueprints: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Page | Needs Fixing | ||
|
Review via email:
|
|||
Description of the change
I think I did this merge the right way this time.
I felt it was time to sync with Debian again (since they're doing unstable releases again), so I did. I kept as much as our additions to the packaging as possible.
A few notable things from this branch (I tried to be as accurate as possible in my changelog):
- The October & November merges from Debian are not included
* October because the changes there were added previously (in the 2011.03.
* November because we don't have the procps version they have, isn't in the Precise repos yet. I'll add it when it does.
- I removed the stable numbering from the version (the 2:8.8.0+ part)
* It was to lessen the headache of the sync
- Precise has a newer version of glib (and debian has a older version in unstable). So I had to add a CFLAG so every thing would compile correctly
- In open-vm-tools.init, I added modprobe [-r] vmxnet
* vmxnet wasn't properly loaded
- Also in open-vm-tools.init, I added modprobe [-r] pcnet32, to be run before and after the vmxnet module is loaded
* After reboot, pcnet32 was still being used (even if vmxnet was loaded). If vmxnet were to have a compile failure, we would still have network connectivity (because pcnet32 is reloaded).
If there are any issues with this packaging, we still have time to make necessary fixes before Precise is released. This merge is just so we have kernel modules that compile successfully. I can confirm that everything that needs to work, is working.
I'm planning on doing monthly uploads of open-vm-tools (waiting on Debian, and testing the packaging before I upload it) until the Feature Freeze. I was planning on doing this during the Oneiric cycle, but issues with GCC prevented it.
The urgency for this is high because of the significant amount of bug reports being filed saying the modules aren't building.
My prep branch:
https:/
My blueprint (I though it might be good idea to create one):
https:/
My Virtual Test repo (which has this packaging built, and ready for installation):
https:/
This is the same as the last attempted merge, but this time I did the diff (of the old and new debian folders, sans the changelog) correctly.
| Serge Hallyn (serge-hallyn) wrote | # |
| Nate Muench (Mink) (n-muench) wrote | # |
| Nate Muench (Mink) (n-muench) wrote | # |
Unmerged revisions
- 27. By Nate Muench (Mink)
-
* Sync with Debian unstable. 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.
Hi Nate
Thanks for preparing this MP; I've reviewed and it looks good.
I only have one comment which is about the package version number; I don't think this is technically a merge as you are really re-syncing the package changes and not including the Debian upstream changelog entries inbetween ubuntu changelog entries so I think the use of -1ubuntu1 is a little misleading and inconsistent with early re-syncs of the packaging.
Please could you update to use a 0ubuntu1 package version.
Thanks
James