Merge lp:~mterry/unity-scope-gdrive/rename into lp:unity-scope-gdrive

[Michael Terry]

Rename source and binary packages to unity-scope-gdrive

Now that upstream has renamed from unity-scope-gdocs to unity-scope-gdrive, the packaging should follow suit.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:29
http://s-jenkins:8080/job/unity-scope-gdrive-ci/6/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-scope-gdrive-ci/./build=pbuilder,distribution=raring,flavor=amd64/6/console
    SUCCESS: http://s-jenkins:8080/job/unity-scope-gdrive-ci/./build=pbuilder,distribution=raring,flavor=i386/6/console

review: Approve (continuous-integration)

[Alberto Mardegan (mardy)]

Looks good, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-lens-gdocs-mbs-autolanding/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-gdocs-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-gdocs-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/2/console

review: Needs Fixing (continuous-integration)

[Martin Mrazik (mrazik)]

Fixed the jenkins part and re-approving.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-scope-gdrive-mbs-autolanding/5/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-gdrive-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-gdrive-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/5/console

review: Needs Fixing (continuous-integration)

[Martin Mrazik (mrazik)]

This is now a real failure (changelog conflict) :-/

[Michael Terry (mterry)]

Re-approving since it was just a tiny changelog conflict fixed by merging from trunk.

[Michael Terry (mterry)]

Nope, can't approve since I'm not in ~online-accounts. Can someone else do that?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:30
http://s-jenkins:8080/job/unity-scope-gdrive-ci/8/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-scope-gdrive-ci/./build=pbuilder,distribution=raring,flavor=amd64/8/console
    SUCCESS: http://s-jenkins:8080/job/unity-scope-gdrive-ci/./build=pbuilder,distribution=raring,flavor=i386/8/console

review: Approve (continuous-integration)

[Didier Roche (didrocks)]

done sir :)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins:8080/job/unity-scope-gdrive-autolanding/1/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-scope-gdrive-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/1/console
    FAILURE: http://s-jenkins:8080/job/unity-scope-gdrive-autolanding/./build=pbuilder,distribution=raring,flavor=i386/1/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Approved revid is not set in launchpad (maybe a permission problem?).
http://s-jenkins:8080/job/unity-scope-gdrive-autolanding/2/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-scope-gdrive-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/2/console
    SUCCESS: http://s-jenkins:8080/job/unity-scope-gdrive-autolanding/./build=pbuilder,distribution=raring,flavor=i386/2/console

review: Needs Fixing (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-15 17:23:13 +0000
+++ debian/changelog	2012-11-16 16:11:20 +0000
@@ -1,5 +1,7 @@
-unity-scope-gdocs (0.7-0ubuntu2) UNRELEASED; urgency=low
+unity-scope-gdrive (0.8-0ubuntu1) UNRELEASED; urgency=low
 
+  * New upstream release
+  * Rename to unity-scope-gdrive
   * debian/control:
     - Update Vcs-Bzr
   * debian/source/format:

=== modified file 'debian/control'
--- debian/control	2012-11-06 19:15:25 +0000
+++ debian/control	2012-11-16 16:11:20 +0000
@@ -1,16 +1,20 @@
-Source: unity-scope-gdocs
+Source: unity-scope-gdrive
 Section: gnome
 Priority: extra
-Maintainer: Ken VanDine <[e-mail]>
-Build-Depends: debhelper (>= 9), python3, python3-distutils-extra, pkg-config, libaccounts-glib-dev
+Maintainer: Ubuntu Developers <[e-mail]>
+Build-Depends: debhelper (>= 9),
+               libaccounts-glib-dev,
+               pkg-config,
+               python3,
+               python3-distutils-extra,
 Standards-Version: 3.9.3
-Homepage: https://launchpad.net/unity-lens-gdocs
+Homepage: https://launchpad.net/unity-scope-gdrive
 # If you aren't a member of ~online-accounts but need to upload packaging
 # changes, just go ahead.  ~online-accounts will notice and sync up the code
 # again.
-Vcs-Bzr: https://code.launchpad.net/~online-accounts/unity-lens-gdocs/trunk
+Vcs-Bzr: https://code.launchpad.net/~online-accounts/unity-scope-gdrive/trunk
 
-Package: unity-scope-gdocs
+Package: unity-scope-gdrive
 Architecture: all
 Depends: ${misc:Depends},
          ${python3:Depends},
@@ -22,8 +26,18 @@
          gir1.2-signon-1.0,
          gir1.2-gdata-0.0,
          account-plugin-google
-Breaks: unity-lens-gdocs
-Replaces: unity-lens-gdocs
-Description: Google Docs scope for Unity
- Unity scope for Google Docs.
+Breaks: unity-lens-gdocs,
+        unity-scope-gdocs (<< 0.8),
+Replaces: unity-lens-gdocs,
+          unity-scope-gdocs (<< 0.8),
+Description: Google Drive scope for Unity
+ Unity scope for Google Drive.
 
+Package: unity-scope-gdocs
+Section: oldlibs
+Architecture: all
+Depends: ${misc:Depends},
+         unity-scope-gdrive,
+Description: obsolete transitional package
+ Transitional package from unity-scope-gdocs to unity-scope-gdrive.  This
+ can safely be removed.

=== modified file 'debian/copyright'
--- debian/copyright	2012-11-06 19:15:25 +0000
+++ debian/copyright	2012-11-16 16:11:20 +0000
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Source: https://launchpad.net/unity-lens-gdocs
-Upstream-Name: unity-lens-gdocs
+Source: https://launchpad.net/unity-scope-gdrive
+Upstream-Name: unity-scope-gdrive
 Upstream-Contact: Alberto Mardegan <[e-mail]>
 
 Files: *

=== modified file 'debian/rules'
--- debian/rules	2012-11-13 19:16:21 +0000
+++ debian/rules	2012-11-16 16:11:20 +0000
@@ -12,7 +12,7 @@
 	python3 setup.py build
 
 override_dh_auto_install:
-	python3 setup.py install --root=$(CURDIR)/debian/unity-scope-gdocs --install-layout=deb
+	python3 setup.py install --root=$(CURDIR)/debian/unity-scope-gdrive --install-layout=deb
 
 override_dh_install:
 	dh_install --fail-missing

=== modified file 'debian/watch'
--- debian/watch	2012-11-06 19:15:25 +0000
+++ debian/watch	2012-11-16 16:11:20 +0000
@@ -1,2 +1,2 @@
 version=3
-http://launchpad.net/unity-lens-gdocs/+download .*/unity-scope-gdocs-([0-9.]+)\.tar\.gz
+http://launchpad.net/unity-scope-gdrive/+download .*/unity-scope-gdrive-([0-9.]+)\.tar\.gz

=== modified file 'setup.py'
--- setup.py	2012-11-06 19:15:25 +0000
+++ setup.py	2012-11-16 16:11:20 +0000
@@ -5,11 +5,11 @@
 import subprocess
 import build_i18n_ext as build_i18n
 
-setup(name="unity-scope-gdocs",
+setup(name="unity-scope-gdrive",
       version="0.7",
       author="Alberto Mardegan",
       author_email="[e-mail]",
-      url="http://launchpad.net/unity-lens-gdocs",
+      url="http://launchpad.net/unity-scope-gdrive",
       license="GNU General Public License v3 (GPLv3)",
       data_files=[
     ('lib/unity-lens-files', ['unity-scope-gdrive']),