Merge lp:~gz/bzr-grep/make_setup_actually_do_something into lp:bzr-grep

[Martin Packman]

Fix the `if __name__ == "__main__":` statement in setup.py so it actually does something, and change the paths to point to the right place for a bzr plugin install.

Haven't done a NEWS entry as this is pretty trivial, and just the other two branches from me will probably be conflict enough. :)

[Parth Malwankar (parthm)]

Looks good to me.

review: Approve

=== modified file 'setup.py'
--- setup.py	2010-05-23 05:10:32 +0000
+++ setup.py	2010-06-07 20:39:23 +0000
@@ -7,7 +7,7 @@
 
 bzr_commands = ['grep']
 
-if __name__ == 'main':
+if __name__ == '__main__':
     setup(name="bzr grep",
           version="0.3",
           description="Print lines matching pattern for specified "
@@ -16,5 +16,5 @@
           author_email="[e-mail]",
           license = "GNU GPL v2",
           url="https://launchpad.net/bzr-grep",
-          packages=['grep'],
-          package_dir={'grep': '.'})
+          packages=['bzrlib.plugins.grep'],
+          package_dir={'bzrlib.plugins.grep': '.'})