Merge lp://qastaging/~dobey/tarmac/simple-setup into lp://qastaging/tarmac

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 2013-10-30 1:35, Rodney Dawes wrote:
> Rodney Dawes has proposed merging lp:~dobey/tarmac/simple-setup
> into lp:tarmac.
>
> Commit message: Remove the custom commands to simplify the setup
> script a bit. Update the information passed to setup().
>
> Requested reviews: Tarmac Developers (tarmac-devs) Related bugs:
> Bug #1245980 in Tarmac: "setup.py clean throws TypeError"
> https://bugs.launchpad.net/tarmac/+bug/1245980 Bug #1246083 in
> Tarmac: "setup.py docs creates html docs with errors/warnings"
> https://bugs.launchpad.net/tarmac/+bug/1246083 Bug #1246084 in
> Tarmac: "Custom setup.py commands use os.system"
> https://bugs.launchpad.net/tarmac/+bug/1246084
>
> For more details, see:
> https://code.launchpad.net/~dobey/tarmac/simple-setup/+merge/193147
>
>
review: approve

One thought:
@@ -97,5 +39,5 @@
     data_files=[('share/man/man1', ['docs/tarmac.1'])],
     long_description='''
         Tarmac is a series of scripts to facilitate the landing of Bazaar
- - branches in Launchpad (http://edge.launchpad.net).''',
- - )
+ branches in Launchpad (http://launchpad.net).''',
+)

Should probably also be "https://launcphad.net"

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.13 (Cygwin)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iEYEARECAAYFAlJwpHkACgkQJdeBCYSNAAOWQgCbBfQTkUpIEYyPzVZR5mM31PDk
wDgAoMZNHvk0Ab1uxkNFmI9APl/cAdxw
=M7pt
-----END PGP SIGNATURE-----