Merge lp:~ajmitch/bzr-builddeb/fix_setup into lp:bzr-builddeb

[Andrew Mitchell]

Adds the bzrlib.plugins.builddeb.upstream package in setup.py. A test build of the package shows that the upstream/directory is now included, and the plugin now appears to work.

[lp:~ajmitch/bzr-builddeb/fix_setup]

545. By Andrew Mitchell on 2011-03-14

Add changelog entry for LP: #735147

[Jelmer Vernooij (jelmer)]

review: Approve (code)

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-11 10:19:30 +0000
+++ debian/changelog	2011-03-14 22:14:54 +0000
@@ -1,3 +1,9 @@
+bzr-builddeb (2.7.2) unstable; urgency=low
+
+  * Add upstream/ directory to setup.py. Closes: #618380. LP: #735147
+
+ -- Andrew Mitchell <[e-mail]>  Tue, 15 Mar 2011 11:11:24 +1300
+
 bzr-builddeb (2.7.1) unstable; urgency=low
 
   * Add Ubuntu oneiric and Debian wheezy to the list of supported

=== modified file 'setup.py'
--- setup.py	2009-07-26 15:51:02 +0000
+++ setup.py	2011-03-14 22:14:54 +0000
@@ -37,7 +37,8 @@
           url="http://jameswestby.net/bzr/bzr-builddeb/",
           packages=['bzrlib.plugins.builddeb',
                     'bzrlib.plugins.builddeb.tests',
-                    'bzrlib.plugins.builddeb.tests.blackbox'],
+                    'bzrlib.plugins.builddeb.tests.blackbox',
+                    'bzrlib.plugins.builddeb.upstream'],
           package_dir={'bzrlib.plugins.builddeb': '.'},
           scripts=['bzr-buildpackage'],
           data_files=[('share/man/man1', ['bzr-buildpackage.1'])])