Merge lp:~christitze/ubuntu/oneiric/open-vm-tools/fix-for-572335 into lp:ubuntu/oneiric/open-vm-tools

[Christian Titze]

My first bug fix. I don't know if I made everything correct but I gave my best.
I fixed the typo described in #572335 and added the proposed information about the mount point /mnt/hgfs to the manpage.

[Evan Broder (broder)]

This patch looks great. My only complaint for future reference is that you left "natty" in the changelog (on the first line). That should be changed to "oneiric".

Unfortunately, things are not quite as simple as I had hoped. There are a handful of bugs in the automatic bzr package import process that result in some branches being out of date (about 400 or so at current count). open-vm-tools was hit by one of those bugs (bug #494481), and as a result the open-vm-tools branches haven't been updated since last September or so.

Though it's really unfortunate that you have to know to check this, in the future you can check http://package-import.ubuntu.com/status/ for a list of imports that have failed.

I'm going to work on getting the branches back up to date, but in the mean time, it may be more productive to give up on trying to create a merge proposal and instead preparing the patch as a traditional debdiff. https://wiki.ubuntu.com/PackagingGuide/Recipes/Debdiff#Creating_A_Debdiff has a general walkthrough of the process.

review: Needs Fixing

[Christian Titze (christitze)]

Thanks for your help but I get an error when trying to build the package:
"christian@Parallels:~/open-vm-tools/oneiric$ debuild -S -us -uc
This package has a Debian revision number but there does not seem to be
an appropriate original tar file or .orig directory in the parent directory;
(expected one of open-vm-tools_2010.06.16-268169.orig.tar.gz, open-vm-tools_2010.06.16-268169.orig.tar.bz2,
open-vm-tools_2010.06.16-268169.orig.tar.lzma, open-vm-tools_2010.06.16-268169.orig.tar.xz or oneiric.orig)
continue anyway? (y/n)"

If I enter "y" it won't work. How do I get any of those "original tar files or .orig directories" onto my machine?

Also how do I upload the fixed changelog? debcommit gives me the following error:
"debcommit: unable to determine commit message using bzr", thus I can't do a bzr push

Sorry for all these newbie questions, I'm sure you could do it in a few seconds but as I stated before this is the first time I'm fixing a bug :-(

[Evan Broder (broder)]

I'm glad I can help out! We always want more contributors, and there's
no reason this bug needs to be urgently fixed, so we can afford to
take some time to let you get it right.

It looks like you're still trying to use the bzr checkout of the
open-vm-tools package, but because our bzr branch is broken, we need
to totally bzr and the branch aside for this and retrieve the source
package the "traditional" way.

Although you've been using bzr branches, a source package actually
consists of a metadata file (a .dsc file) and a handful of others (in
this case, the .orig.tar.gz, which is the source as upstream released
it, and .diff.gz, which represents any changes we need to make).

I recommend using "pull-lp-source" from the ubuntu-dev-tools package,
which will automatically get the latest version. That will fetch all
of the files involved, and then "unpack" the source package - i.e.
give you a directory you can work in.

Once you've gotten a new copy of the source and made your
modification, then debuild -S should work, and you will have two
different .dsc files that you can run debdiff against. Save the output
of debdiff, as described in step 8 of the link I sent before, and
instead of trying to bzr push the result, attach the debdiff to the
*bug*.

If you need more help, the best thing to do might be to ask on IRC
(https://help.ubuntu.com/community/InternetRelayChat) in #ubuntu-motu
- I'm usually around as "broder", though anybody should be able to
help.

[Christian Titze (christitze)]

Yay! I finally got it. It was really easy with your help. Thank you very much! The guys over at #ubuntu-moku told me that I needed to install the devscripts package and I finally could build the package and do a debdiff. I'll attach the debdiff to the bug.

Unmerged revisions

21. By Christian Titze on 2011-06-26

Updated /debian/manpages/vmhgfs.9: Typo fixed and further information was added (LP: #572335)

20. By Stefano Rivera on 2010-09-25

* Merge from Debian testing (LP: #632101), remaining changes:
  - Recommend open-vm-toolbox in open-vm-tools.
  - Rediffing vsock.patch.
* Updating local Makefile to inject symvers files to fix vmhgfs and
  vsock modules, thanks to Joe Gooch <email address hidden> (Closes:
  #579721).
* Updating standards version to 3.9.1.
* Removing vmmemctl fom initscript (Closes: #588356).
* Merging upstream version 2010.06.16-268169.
* Updating standards version to 3.9.0.
* Updating README.source.
* Rediffing kvers.patch.
* Dropping procps.patch, not required anymore.
* Updating packaging for upstreams vmmemctl module removal.

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-25 00:08:40 +0000
+++ debian/changelog	2011-07-06 17:57:43 +0000
@@ -1,3 +1,9 @@
+open-vm-tools (2010.06.16-268169-3ubuntu2) natty; urgency=low
+
+  * Updated /debian/manpages/vmhgfs.9: Typo fixed and further information was added (LP: #572335)
+
+ -- Christian Titze <[e-mail]>  Sun, 26 Jun 2011 14:18:09 +0200
+
 open-vm-tools (2010.06.16-268169-3ubuntu1) maverick; urgency=low
 
   * Merge from Debian testing (LP: #632101), remaining changes:

=== modified file 'debian/manpages/vmhgfs.9'
--- debian/manpages/vmhgfs.9	2010-04-29 22:01:51 +0000
+++ debian/manpages/vmhgfs.9	2011-07-06 17:57:43 +0000
@@ -17,9 +17,11 @@
 .PP
 Or by adding this line to /etc/fstab:
 .PP
-	host:/   /mnt/hgfs   vmhgfs  defaults  0 0
-.PP
-The net effect is that all Shared Folders appear and disappear at /mnt/hgfs as they're added or removed.
+	.host:/   /mnt/hgfs   vmhgfs  defaults  0 0
+.PP
+The net effect is that all Shared Folders appear and disappear at /mnt/hgfs as they're added or removed. Note that if you haven't previously installed the VMware Guest Tools provided by VMware, you must create the mount point /mnt/hgfs manually via:
+.PP
+	sudo mkdir /mnt/hgfs
 
 .SH OPTIONS
 vmhgfs has no options.