Google Documents Lens

Merge lp:~didrocks/unity-scope-gdrive/add-correct-path into lp:unity-scope-gdrive

  1. add-correct-path
  2. Merge into trunk
Proposed by Didier Roche-Tolomelli
Status: Superseded
Proposed branch: lp:~didrocks/unity-scope-gdrive/add-correct-path
Merge into: lp:unity-scope-gdrive
Diff against target: 59 lines (+31/-0) (has conflicts)
3 files modified
debian/changelog (+7/-0)
debian/control (+6/-0)
gdrive.scope (+18/-0)
Text conflict in debian/control
Text conflict in gdrive.scope
To merge this branch: bzr merge lp:~didrocks/unity-scope-gdrive/add-correct-path
Reviewer Review Type Date Requested Status
Online Accounts Pending
Review via email: mp+153848@code.launchpad.net

This proposal has been superseded by a proposal from 2013-03-18.

Commit message

use correct path

Description of the change

use correct path

To post a comment you must log in.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-12-05 09:29:06 +0000
3+++ debian/changelog 2013-03-18 15:47:29 +0000
4@@ -1,3 +1,10 @@
5+unity-scope-gdrive (0.8daily12.12.05-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * Add missing build-dep and bump existing ones.
8+ * Some fixes in copyright
9+
10+ -- Didier Roche <didrocks@ubuntu.com> Fri, 15 Mar 2013 11:05:56 +0100
11+
12 unity-scope-gdrive (0.8daily12.12.05-0ubuntu1) raring; urgency=low
13
14 [ Michael Terry ]
15
16=== modified file 'debian/control'
17--- debian/control 2013-03-15 09:33:30 +0000
18+++ debian/control 2013-03-18 15:47:29 +0000
19@@ -19,8 +19,14 @@
20 Depends: ${misc:Depends},
21 ${python3:Depends},
22 python3,
23+<<<<<<< TREE
24 gir1.2-unity-5.0 (>= 6.8),
25 gir1.2-dee-1.0,
26+=======
27+ python3-gi,
28+ gir1.2-unity-5.0 (>= 6.91),
29+ unity-scopes-runner,
30+>>>>>>> MERGE-SOURCE
31 gir1.2-glib-2.0,
32 gir1.2-accounts-1.0,
33 gir1.2-signon-1.0,
34
35=== modified file 'gdrive.scope'
36--- gdrive.scope 2013-03-15 09:33:30 +0000
37+++ gdrive.scope 2013-03-18 15:47:29 +0000
38@@ -1,3 +1,21 @@
39 [Scope]
40+<<<<<<< TREE
41 DBusName=net.launchpad.Unity.Scope.GDrive
42 DBusPath=/net/launchpad/unity/scope/gdrive
43+=======
44+DBusName=com.canonical.Unity.Scope.File.Gdrive
45+DBusPath=/com/canonical/unity/scope/file/gdrive
46+Icon=
47+Keywords=gdrive;doc;drive;google;
48+Loader=/usr/share/unity-scopes/gdrive/unity_gdrive_daemon.py
49+RequiredMetadata=
50+OptionalMetadata=
51+RemoteContent=true
52+Type=file
53+Name=Google Drive
54+Description=Find Google Drive documents
55+SearchHint=Search your Google Drive
56+
57+[Desktop Entry]
58+X-Ubuntu-Gettext-Domain=unity-scope-gdrive
59+>>>>>>> MERGE-SOURCE

Subscribers

People subscribed via source and target branches