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

[Robert Bruce Park]

Packaging fixes for daily_release.

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

[Robert Bruce Park (robru)]

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]

13. By Robert Bruce Park on 2013-12-13

Most of debian/copyright is redundant.

[Ken VanDine (ken-vandine)]

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

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== added directory '.bzr-builddeb'
=== renamed file 'debian/bzr-builddeb.conf' => '.bzr-builddeb/default.conf'
--- debian/bzr-builddeb.conf	2013-11-14 03:39:10 +0000
+++ .bzr-builddeb/default.conf	2013-12-13 18:39:28 +0000
@@ -1,2 +1,2 @@
 [BUILDDEB]
-native = True
+split = True
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-11-16 09:20:58 +0000
+++ debian/changelog	2013-12-13 18:39:28 +0000
@@ -1,18 +1,5 @@
-account-plugin-evernote (3) trusty; urgency=low
-
-  * Fix icon size (Closes: #1251655)
-  * Fix Evernote sandbox host (Closes: #1251656)
-
- -- David Planella <[e-mail]>  Sat, 16 Nov 2013 10:19:00 +0100
-
-account-plugin-evernote (2) trusty; urgency=low
-
-  * Fixed d/rules
-
- -- Chris Wayne <[e-mail]>  Thu, 14 Nov 2013 10:25:55 -0500
-
-account-plugin-evernote (1) trusty; urgency=low
+account-plugin-evernote (0-0ubuntu1) UNRELEASED; urgency=low
 
   * Initial release.
 
- -- Chris Wayne <[e-mail]>  Wed, 13 Nov 2013 22:25:50 -0500
+ -- Robert Bruce Park <[e-mail]>  Fri, 13 Dec 2013 10:05:09 -0800
 
=== modified file 'debian/control'
--- debian/control	2013-11-14 03:39:10 +0000
+++ debian/control	2013-12-13 18:39:28 +0000
@@ -1,22 +1,26 @@
 Source: account-plugin-evernote
 Section: gnome
 Priority: optional
-Maintainer: Chris Wayne <[e-mail]>
-Build-Depends: debhelper (>= 9.0.0),
-               autotools-dev,
+Maintainer: Ubuntu Desktop Team <[e-mail]>
+Build-Depends: autotools-dev,
+               debhelper (>= 9),
                dh-autoreconf,
                intltool,
                libaccounts-glib-dev (>= 1.8),
+               libonline-accounts-client-dev,
                pkg-config,
-               libonline-accounts-client-dev
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/account-plugin-evernote
+# if you don't have have commit access to this branch but would like to upload
+# directly to Ubuntu, don't worry: your changes will be merged back into the
+# upstream branch
+Vcs-Bzr: lp:account-plugin-evernote
 
 Package: account-plugin-evernote
 Architecture: all
-Depends: ${misc:Depends},
-         libaccount-plugin-generic-oauth,
-         qtdeclarative5-online-accounts-client0.1
-Description: Allow Ubuntu to access FitBit data
- This plugin allows the user to authenticate to their FitBit account, which
- allows the user to gain Accomplishments based on their FitBit data.
+Depends: libaccount-plugin-generic-oauth,
+         qtdeclarative5-online-accounts-client0.1,
+         ${misc:Depends},
+Description: Allow Ubuntu to access Evernote
+ This plugin allows the user to authenticate to their Evernote account, which
+ allows syncing of Evernote notes across Ubuntu devies.
 
=== modified file 'debian/copyright'
--- debian/copyright	2013-11-14 03:39:10 +0000
+++ debian/copyright	2013-12-13 18:39:28 +0000
@@ -3,21 +3,8 @@
 Source: http://launchpad.net/account-plugin-evernote
 
 Files: *
-Copyright: 2012 Chris Wayne <[e-mail]>
-License: GPL-3.0
-
-Files: debian/*
-Copyright: 2012 Chris Wayne <[e-mail]>
-License: GPL-3.0
-
-Files: qml/evernote/js/oauth.js
-Copyright: 2008 Netflix
-License: Apache-2.0
-
-Files: qml/evernote/js/sha1.js
-Copyright: 2000 - 2002 Paul Johnston 
-License: BSD
-
+Copyright: 2013 Canonical Ltd.
+License: GPL-3.0
 
 License: GPL-3.0
  This program is free software: you can redistribute it and/or modify
@@ -35,43 +22,3 @@
  .
  On Debian systems, the complete text of the GNU General
  Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-
-License: BSD
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
-     * Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
- .
-     * Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
- .
- THIS SOFTWARE IS PROVIDED BY Michael Stapelberg ''AS IS'' AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL Michael Stapelberg BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-License: Apache-2.0
- Licensed under the Apache License, Version 2.0 (the "License"); you may not
- use this file except in compliance with the License. You may obtain a copy
- of the License at
- .
-     http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- License for the specific language governing permissions and limitations
- under the License.
- .
- On Debian systems, the full text of the Apache License, Version 2.0
- can be found in the file
- `/usr/share/common-licenses/Apache-2.0'.
 
=== modified file 'debian/rules'
--- debian/rules	2013-11-14 15:25:44 +0000
+++ debian/rules	2013-12-13 18:39:28 +0000
@@ -12,8 +12,5 @@
 		--with-evernote-consumer-key="ubuntu" \
 		--with-evernote-consumer-secret="44f8ee81a8359500"
 
-override_dh_install:
-	dh_install --fail-missing
-
 %:
-	dh $@ --with autoreconf
+	dh $@ --with autoreconf --fail-missing
 
=== removed directory 'debian/source'
=== removed file 'debian/source/format'
--- debian/source/format	2013-11-14 03:39:10 +0000
+++ debian/source/format	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-3.0 (native)