Merge lp:~jml/pkgme-devportal/binary-to-devportal into lp:pkgme-devportal

[Jonathan Lange]

Rename pkgme-binary to pkgme-devportal

Renames pkgme-binary to pkgme-devportal. Doesn't update LP API app name or config file location. They can be managed in separate deploys.

[James Westby (james-w)]

review: Approve

=== modified file 'LICENSE'
--- LICENSE	2011-08-23 17:21:54 +0000
+++ LICENSE	2012-04-26 12:19:33 +0000
@@ -1,6 +1,6 @@
 Launchpad is Copyright 2011 Canonical Ltd.
 
-Canonical Ltd ("Canonical") distributes the pkgme-binary source code
+Canonical Ltd ("Canonical") distributes the pkgme-devportal source code
 under the GNU Affero General Public License, version 3 ("AGPLv3").
 The full text of this licence is given below.
 
 
=== modified file 'devportalbinary/database.py'
--- devportalbinary/database.py	2012-04-02 17:30:14 +0000
+++ devportalbinary/database.py	2012-04-26 12:19:33 +0000
@@ -40,6 +40,8 @@
 from .utils import download_file
 
 
+# XXX: Historic name of this package.  Update to 'pkgme-devportal' and
+# re-authorize.
 APPLICATION_NAME = 'pkgme-binary'
 SERVICE_ROOT = uris.LPNET_SERVICE_ROOT
 
@@ -307,6 +309,10 @@
     SQLITE = 'sqlite'
     POSTGRES = 'postgres'
 
+    # XXX: 'pkgme-binary' is the historic name of this package.  Change this
+    # to look first in ~/.config/pkgme-devportal/conf and then fall back to
+    # this one.  Once production systems are updated to the new config, remove
+    # the fallback.
     CONF_FILE = '~/.config/pkgme-binary/conf'
 
     def __init__(self, store):
 
=== modified file 'setup.py'
--- setup.py	2012-03-22 11:51:44 +0000
+++ setup.py	2012-04-26 12:19:33 +0000
@@ -14,7 +14,7 @@
 __version__ = get_version('devportalbinary/__init__.py')
 
 setup(
-    name='pkgme-binary',
+    name='pkgme-devportal',
     version=__version__,
     packages=find_packages(),
     include_package_data=True,
@@ -22,8 +22,8 @@
     maintainer_email='[e-mail]',
     description=description('README'),
     license='AGPLv3',
-    url='http://launchpad.net/pkgme-binary',
-    download_url='https://launchpad.net/pkgme-binary/+download',
+    url='http://launchpad.net/pkgme-devportal',
+    download_url='https://launchpad.net/pkgme-devportal/+download',
     test_suite='devportalbinary.tests',
     install_requires = [
         'bzr',