Evernote Online Accounts plugin

Merge lp:~robru/account-plugin-evernote/packaging into lp:account-plugin-evernote

  1. packaging
  2. Merge into trunk
Proposed by Robert Bruce Park
Status: Merged
Approved by: Robert Bruce Park
Approved revision: 13
Merged at revision: 11
Proposed branch: lp:~robru/account-plugin-evernote/packaging
Merge into: lp:account-plugin-evernote
Diff against target: 167 lines (+20/-86)
6 files modified
.bzr-builddeb/default.conf (+1/-1)
debian/changelog (+2/-15)
debian/control (+14/-10)
debian/copyright (+2/-55)
debian/rules (+1/-4)
debian/source/format (+0/-1)
To merge this branch: bzr merge lp:~robru/account-plugin-evernote/packaging
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ken VanDine Approve
Review via email: mp+198983@code.launchpad.net

Commit message

Packaging fixes for daily_release.

Description of the change

Fixes according to the standards outlined at https://wiki.ubuntu.com/DailyRelease/InlinePackaging

To post a comment you must log in.
Revision history for this message
Robert Bruce Park (robru) wrote :

Note that account-plugin-evernote has never been released[0] and therefore the entire debian/changelog was wrong.

[0] https://launchpad.net/ubuntu/+source/account-plugin-evernote

lp:~robru/account-plugin-evernote/packaging updated
13. By Robert Bruce Park

Most of debian/copyright is redundant.

Revision history for this message
Ken VanDine (ken-vandine) wrote :

There are files listed in debian/copyright that are not in the source, you can simplify that down to just one license

review: Needs Fixing
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== renamed file 'debian/bzr-builddeb.conf' => '.bzr-builddeb/default.conf'
3--- debian/bzr-builddeb.conf 2013-11-14 03:39:10 +0000
4+++ .bzr-builddeb/default.conf 2013-12-13 18:39:28 +0000
5@@ -1,2 +1,2 @@
6 [BUILDDEB]
7-native = True
8+split = True
9
10=== modified file 'debian/changelog'
11--- debian/changelog 2013-11-16 09:20:58 +0000
12+++ debian/changelog 2013-12-13 18:39:28 +0000
13@@ -1,18 +1,5 @@
14-account-plugin-evernote (3) trusty; urgency=low
15-
16- * Fix icon size (Closes: #1251655)
17- * Fix Evernote sandbox host (Closes: #1251656)
18-
19- -- David Planella <david.planella@ubuntu.com> Sat, 16 Nov 2013 10:19:00 +0100
20-
21-account-plugin-evernote (2) trusty; urgency=low
22-
23- * Fixed d/rules
24-
25- -- Chris Wayne <chris.wayne@canonical.com> Thu, 14 Nov 2013 10:25:55 -0500
26-
27-account-plugin-evernote (1) trusty; urgency=low
28+account-plugin-evernote (0-0ubuntu1) UNRELEASED; urgency=low
29
30 * Initial release.
31
32- -- Chris Wayne <chris.wayne@canonical.com> Wed, 13 Nov 2013 22:25:50 -0500
33+ -- Robert Bruce Park <robert.park@canonical.com> Fri, 13 Dec 2013 10:05:09 -0800
34
35=== modified file 'debian/control'
36--- debian/control 2013-11-14 03:39:10 +0000
37+++ debian/control 2013-12-13 18:39:28 +0000
38@@ -1,22 +1,26 @@
39 Source: account-plugin-evernote
40 Section: gnome
41 Priority: optional
42-Maintainer: Chris Wayne <chris.wayne@canonical.com>
43-Build-Depends: debhelper (>= 9.0.0),
44- autotools-dev,
45+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
46+Build-Depends: autotools-dev,
47+ debhelper (>= 9),
48 dh-autoreconf,
49 intltool,
50 libaccounts-glib-dev (>= 1.8),
51+ libonline-accounts-client-dev,
52 pkg-config,
53- libonline-accounts-client-dev
54 Standards-Version: 3.9.4
55 Homepage: http://launchpad.net/account-plugin-evernote
56+# if you don't have have commit access to this branch but would like to upload
57+# directly to Ubuntu, don't worry: your changes will be merged back into the
58+# upstream branch
59+Vcs-Bzr: lp:account-plugin-evernote
60
61 Package: account-plugin-evernote
62 Architecture: all
63-Depends: ${misc:Depends},
64- libaccount-plugin-generic-oauth,
65- qtdeclarative5-online-accounts-client0.1
66-Description: Allow Ubuntu to access FitBit data
67- This plugin allows the user to authenticate to their FitBit account, which
68- allows the user to gain Accomplishments based on their FitBit data.
69+Depends: libaccount-plugin-generic-oauth,
70+ qtdeclarative5-online-accounts-client0.1,
71+ ${misc:Depends},
72+Description: Allow Ubuntu to access Evernote
73+ This plugin allows the user to authenticate to their Evernote account, which
74+ allows syncing of Evernote notes across Ubuntu devies.
75
76=== modified file 'debian/copyright'
77--- debian/copyright 2013-11-14 03:39:10 +0000
78+++ debian/copyright 2013-12-13 18:39:28 +0000
79@@ -3,21 +3,8 @@
80 Source: http://launchpad.net/account-plugin-evernote
81
82 Files: *
83-Copyright: 2012 Chris Wayne <cwayne@ubuntu.com>
84-License: GPL-3.0
85-
86-Files: debian/*
87-Copyright: 2012 Chris Wayne <cwayne@ubuntu.com>
88-License: GPL-3.0
89-
90-Files: qml/evernote/js/oauth.js
91-Copyright: 2008 Netflix
92-License: Apache-2.0
93-
94-Files: qml/evernote/js/sha1.js
95-Copyright: 2000 - 2002 Paul Johnston
96-License: BSD
97-
98+Copyright: 2013 Canonical Ltd.
99+License: GPL-3.0
100
101 License: GPL-3.0
102 This program is free software: you can redistribute it and/or modify
103@@ -35,43 +22,3 @@
104 .
105 On Debian systems, the complete text of the GNU General
106 Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
107-
108-License: BSD
109- Redistribution and use in source and binary forms, with or without
110- modification, are permitted provided that the following conditions are met:
111- .
112- * Redistributions of source code must retain the above copyright
113- notice, this list of conditions and the following disclaimer.
114- .
115- * Redistributions in binary form must reproduce the above copyright
116- notice, this list of conditions and the following disclaimer in the
117- documentation and/or other materials provided with the distribution.
118- .
119- THIS SOFTWARE IS PROVIDED BY Michael Stapelberg ''AS IS'' AND ANY
120- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
121- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
122- DISCLAIMED. IN NO EVENT SHALL Michael Stapelberg BE LIABLE FOR ANY
123- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
124- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
125- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
126- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
127- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
128- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
129-
130-
131-License: Apache-2.0
132- Licensed under the Apache License, Version 2.0 (the "License"); you may not
133- use this file except in compliance with the License. You may obtain a copy
134- of the License at
135- .
136- http://www.apache.org/licenses/LICENSE-2.0
137- .
138- Unless required by applicable law or agreed to in writing, software
139- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
140- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
141- License for the specific language governing permissions and limitations
142- under the License.
143- .
144- On Debian systems, the full text of the Apache License, Version 2.0
145- can be found in the file
146- `/usr/share/common-licenses/Apache-2.0'.
147
148=== modified file 'debian/rules'
149--- debian/rules 2013-11-14 15:25:44 +0000
150+++ debian/rules 2013-12-13 18:39:28 +0000
151@@ -12,8 +12,5 @@
152 --with-evernote-consumer-key="ubuntu" \
153 --with-evernote-consumer-secret="44f8ee81a8359500"
154
155-override_dh_install:
156- dh_install --fail-missing
157-
158 %:
159- dh $@ --with autoreconf
160+ dh $@ --with autoreconf --fail-missing
161
162=== removed directory 'debian/source'
163=== removed file 'debian/source/format'
164--- debian/source/format 2013-11-14 03:39:10 +0000
165+++ debian/source/format 1970-01-01 00:00:00 +0000
166@@ -1,1 +0,0 @@
167-3.0 (native)

Subscribers

People subscribed via source and target branches