Merge lp:~robru/webaccounts-browser-extension/inline-packaging into lp:webaccounts-browser-extension

[Robert Bruce Park]

Inline packaging metadata.

This mp was already approved my mardy, however jenkins got a bit confused so I deleted that one and am resubmitting an identical mp.

[Didier Roche-Tolomelli (didrocks)]

312 +override_dh_auto_install:
313 + install-xpi -p xul-ext-webaccounts firefox-extension/webaccounts-firefox-extension.xpi
314 + dh_auto_install
315 + rm -rf debian/tmp/usr/lib/*/webaccounts-firefox
316 + rm -f debian/tmp/usr/lib/*/*/libwebaccounts.la

I would prefer that we use the now traditional:
override_dh_install:
   install-xpi…
   rm what we want to remove
   dh_install --fail-missing

Do you mind changing that?

review: Needs Fixing

[lp:~robru/webaccounts-browser-extension/inline-packaging]

33. By Robert Bruce Park on 2012-11-22

Fix debian/rules as per didrocks.

[Didier Roche-Tolomelli (didrocks)]

perfect!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:33
http://s-jenkins:8080/job/webaccounts-browser-extension-ci/4/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/webaccounts-browser-extension-ci/./build=pbuilder,distribution=raring,flavor=amd64/4/console
    SUCCESS: http://s-jenkins:8080/job/webaccounts-browser-extension-ci/./build=pbuilder,distribution=raring,flavor=i386/4/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webaccounts-browser-extension-ci/4//rebuild/?

review: Approve (continuous-integration)

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2012-11-22 16:02:21 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True
 
=== modified file '.bzrignore'
--- .bzrignore	2012-09-07 14:26:17 +0000
+++ .bzrignore	2012-11-22 16:02:21 +0000
@@ -2,7 +2,6 @@
 *.gcno
 *.la
 *.lo
-*.pem
 *.tar.gz
 Makefile
 Makefile.in
 
=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2012-11-22 16:02:21 +0000
@@ -0,0 +1,134 @@
+webaccounts-browser-extension (0.4.6-0ubuntu1) raring; urgency=low
+
+  * Inline packaging metadata.
+
+ -- Robert Bruce Park <[e-mail]>  Tue, 20 Nov 2012 15:44:39 -0600
+
+webaccounts-browser-extension (0.4.5-0ubuntu4) raring; urgency=low
+
+  * debian/control
+    - build depend on vim-common, it is required
+
+ -- Ken VanDine <[e-mail]>  Thu, 15 Nov 2012 12:22:18 -0500
+
+webaccounts-browser-extension (0.4.5-0ubuntu3) raring; urgency=low
+
+  * debian/control
+    - Move the depends for gnome-control-center-signon to the -common package
+      instead of specifying it multiple times.
+    - Don't build depend on vim-common
+  * debian/copyright
+    - Updated to add license/copyright for lib/*
+
+ -- Ken VanDine <[e-mail]>  Wed, 14 Nov 2012 13:58:52 -0500
+
+webaccounts-browser-extension (0.4.5-0ubuntu2) raring; urgency=low
+
+  * debian/rules
+    - enable tests
+  * debian/compat, debian/control
+    - dh 9
+
+ -- Ken VanDine <[e-mail]>  Thu, 08 Nov 2012 16:13:39 -0500
+
+webaccounts-browser-extension (0.4.5-0ubuntu1) raring; urgency=low
+
+  * New upstream release.
+    - Do not load the libwebaccounts library more than once (LP: #1066917)
+
+ -- Ken VanDine <[e-mail]>  Thu, 08 Nov 2012 12:44:23 -0500
+
+webaccounts-browser-extension (0.4.4-0ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+    - Don't use npapi plugin for firefox
+    - install library as a private lib
+
+ -- Ken VanDine <[e-mail]>  Mon, 10 Sep 2012 14:41:04 -0400
+
+webaccounts-browser-extension (0.4.2-0ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+    - Don't add any symbols to the main window global scope (LP: #1037706)
+    - Don't leak the browser chrome window (LP: #1037707)
+    - Don't import XPCOMUtils.jsm, it's not used anywhere
+    - Get the cookiemanager from Services.jsm
+    - Updated names and descriptions to be consistent between firefox and
+      chromium extensions (LP: #1025462)
+
+ -- Ken VanDine <[e-mail]>  Fri, 17 Aug 2012 16:40:48 -0400
+
+webaccounts-browser-extension (0.4.1-0ubuntu3) quantal; urgency=low
+
+  * debian/rules
+    - enable firefox extension build
+  * debian/control
+    - add the xul-ext-webaccounts binary
+
+ -- Ken VanDine <[e-mail]>  Thu, 16 Aug 2012 12:57:59 -0400
+
+webaccounts-browser-extension (0.4.1-0ubuntu2) quantal; urgency=low
+
+  * debian/rules
+    - bump dbus-test-runner timeout to 180
+
+ -- Ken VanDine <[e-mail]>  Wed, 15 Aug 2012 17:19:21 -0400
+
+webaccounts-browser-extension (0.4.1-0ubuntu1) quantal; urgency=low
+
+  * New upstream release
+  * debian/watch
+    - added
+  * debian/control
+    - added dbus-test-runner build depends
+  * debian/patches/tests_gsettings_fix.patch
+    - setup GSETTINGS_SCHEMA_DIR for tests
+   * debian/rules
+    - compile gsettings schemas for tests
+
+ -- Ken VanDine <[e-mail]>  Wed, 15 Aug 2012 16:56:41 -0400
+
+webaccounts-browser-extension (0.2+bzr13-0quantal2) quantal; urgency=low
+
+  * Added gtest build dep
+
+ -- Ken VanDine <[e-mail]>  Mon, 16 Jul 2012 16:51:06 -0400
+
+webaccounts-browser-extension (0.2+bzr13-0quantal1) quantal; urgency=low
+
+  * rebuild for quantal
+
+ -- Ken VanDine <[e-mail]>  Mon, 16 Jul 2012 10:30:02 -0400
+
+webaccounts-browser-extension (0.2+bzr13-0precise1) precise; urgency=low
+
+  * New snapshot from tag 0.2+bzr13
+
+ -- Ken VanDine <[e-mail]>  Wed, 11 Jul 2012 10:26:00 -0400
+
+webaccounts-browser-extension (0.1-0precise4) precise; urgency=low
+
+  * no change rebuild
+
+ -- Ken VanDine <[e-mail]>  Fri, 15 Jun 2012 16:45:31 -0400
+
+webaccounts-browser-extension (0.1-0precise3) precise; urgency=low
+
+  * debian/control
+    - make both browser extensions depend on gnome-control-center-signon,
+      they require it via dbus
+
+ -- Ken VanDine <[e-mail]>  Thu, 14 Jun 2012 16:54:19 -0400
+
+webaccounts-browser-extension (0.1-0precise2) precise; urgency=low
+
+  * chromium-extension/manifest.json.in
+    - use the .so
+
+ -- Ken VanDine <[e-mail]>  Mon, 11 Jun 2012 15:27:37 -0400
+
+webaccounts-browser-extension (0.1-0precise1) precise; urgency=low
+
+  * Initial package
+
+ -- Ken VanDine <[e-mail]>  Mon, 04 Jun 2012 11:15:08 -0400
 
=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2012-11-22 16:02:21 +0000
@@ -0,0 +1,1 @@
+9
 
=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2012-11-22 16:02:21 +0000
@@ -0,0 +1,52 @@
+Source: webaccounts-browser-extension
+Priority: optional
+Maintainer: Ubuntu Desktop Team <[e-mail]>
+Build-Depends: autotools-dev,
+               dbus-test-runner,
+               debhelper (>= 9),
+               dh-autoreconf,
+               gnome-common,
+               libaccounts-glib-dev (>= 1.1+bzr153),
+               libglib2.0-dev,
+               libgtest-dev,
+               libjson-glib-dev,
+               mozilla-devscripts,
+               openssl,
+               pkg-config,
+               vim-common,
+               zip,
+Standards-Version: 3.9.3
+Section: web
+Homepage: https://launchpad.net/webaccounts-browser-extension
+# 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/webaccounts-browser-extension/trunk
+
+Package: webaccounts-extension-common
+Architecture: any
+Depends: gnome-control-center-signon, ${misc:Depends}, ${shlibs:Depends}
+Description: Ubuntu Online Accounts browser extension - common files
+ Common files needed by the Ubuntu Online Accounts integration Chromium
+ and Firefox extensions
+
+Package: webaccounts-chromium-extension
+Architecture: any
+Depends: chromium-browser,
+         webaccounts-extension-common (= ${binary:Version}),
+         ${misc:Depends},
+Breaks: libwebaccounts-chromium
+Replaces: libwebaccounts-chromium
+Description: Ubuntu Online Accounts extension for chromium
+ Chromium extension to allow integraton with Ubuntu Online Accounts
+
+Package: xul-ext-webaccounts
+Architecture: any
+Depends: webaccounts-extension-common (= ${binary:Version}),
+         ${misc:Depends},
+         ${xpi:Depends},
+Enhances: ${xpi:Enhances}
+Provides: ${xpi:Provides}
+Recommends: ${xpi:Recommends}
+Breaks: ${xpi:Breaks}
+Description: Ubuntu Online Accounts extension for firefox
+ Firefox extension to allow integraton with Ubuntu Online Accounts
 
=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2012-11-22 16:02:21 +0000
@@ -0,0 +1,59 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: online-accounts-browser-extension
+Source: https://launchpad.net/online-accounts-browser-extension
+
+Files: *
+Copyright: Copyright (C) Canonical LTD 2012
+License: GPL-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'.
+
+Files: lib/*
+Copyright: 2012 Canonical Ltd
+License: GPL-2+
+
+Files: npapi-plugin/*
+Copyright: 2012 Canonical Ltd
+License: GPL-2+
+
+Files: npapi-plugin/src/npapi-headers/headers/nptypes.h
+Copyright: 2004 mozilla.org
+License: GPL-2+
+
+Files: npapi-plugin/src/npapi-headers/headers/npapi.h
+       npapi-plugin/src/npapi-headers/headers/npfunctions.h
+Copyright: 1998 Netscape Communications Corporation
+License: GPL-2+
+
+Files: npapi-plugin/src/npapi-headers/headers/npruntime.h
+Copyright: 2004 Apple Computer, Inc.
+License:
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. 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.
+ 3. Neither the names of Apple Computer, Inc. ("Apple") or The Mozilla
+ Foundation ("Mozilla") nor the names of their contributors may be used
+ to endorse or promote products derived from this software without
+ specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY APPLE, MOZILLA AND THEIR CONTRIBUTORS "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 APPLE, MOZILLA OR
+ THEIR CONTRIBUTORS 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: GPL-2+
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
=== added file 'debian/docs'
--- debian/docs	1970-01-01 00:00:00 +0000
+++ debian/docs	2012-11-22 16:02:21 +0000
@@ -0,0 +1,2 @@
+NEWS
+README
 
=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2012-11-22 16:02:21 +0000
@@ -0,0 +1,21 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
+
+override_dh_autoreconf:
+	cp debian/webaccounts.pem .
+	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
+
+override_dh_install:
+	install-xpi -p xul-ext-webaccounts firefox-extension/webaccounts-firefox-extension.xpi
+	rm -rf debian/tmp/usr/lib/*/webaccounts-firefox
+	rm -f debian/tmp/usr/lib/*/*/libwebaccounts.la
+	dh_install --fail-missing
+
+override_dh_auto_test:
+	dbus-test-runner -t make -p check -m 180
+
+%:
+	dh $@ --with xul-ext,autoreconf
 
=== added file 'debian/webaccounts-chromium-extension.install'
--- debian/webaccounts-chromium-extension.install	1970-01-01 00:00:00 +0000
+++ debian/webaccounts-chromium-extension.install	2012-11-22 16:02:21 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/webaccounts-chromium/*.crx
+usr/share/chromium/extensions
 
=== added file 'debian/webaccounts-extension-common.install'
--- debian/webaccounts-extension-common.install	1970-01-01 00:00:00 +0000
+++ debian/webaccounts-extension-common.install	2012-11-22 16:02:21 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/webaccounts-browser-extension
+usr/share/glib-2.0/schemas
 
=== added file 'debian/webaccounts.pem'
--- debian/webaccounts.pem	1970-01-01 00:00:00 +0000
+++ debian/webaccounts.pem	2012-11-22 16:02:21 +0000
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDDkeiTu8AJ32tEHdtsPV3zzd6qKc2xIMu6MkfyADxssTvshm1W
+uSyWQPEOpoyklDD4XtjjlhrOgh1DTslCv/uz0+fi7P2M+IRWzRQynRcbA9OUkdHt
+TKhXgVkY+5iNSPxVLtObY5KxLqXu9EDmeFFvK3j/XiIEj0FOMZBrV6NYiwIDAQAB
+AoGAPexiNvzYxod+gFfv1SrtJ7hEy55m6bHXsAIhs6eNemD392FtF2uUiZLQgPIN
+UEM36jyl8hHiNQcP2vMEWOVO/cjQmM3mSkVTHav1bgFv/UolXQZ6XuO5jg28p3fa
+C4gjTqCMtfcRV5+TU9nPHR+dU6T8b2VyblrUL0amN9B76jECQQDngF5lhwvnCI90
+sIwDy3fplUGRBB7nsJhSgSi3VGkFsVQq80pv8WAzsi/8Awy/x0nQjldTb7srkxkc
+K90e6tOTAkEA2EQdq+eOXBdoKpG9x/15jPebm13CYJIFSgZlb1b8y5qRDGvjTipx
+c55Yf7lqjsYvipwKuZWbLclyFBqKqPByKQJAU8CvZg/LkJQaQl806JKOGWW0SOCy
+xaOwF/k+X8UcEcEr8DYAsisjYNCQZ5462I8i917n3PnJP2SCaxy7bNoMHQJBAMy0
+3Skky5ncBhuVTICLK40Fq2MLAryKOztwhn83ZZ4LtpR9YvFQN4drMPXlOjne2o1n
+WreEJxjV/4eMAAgdYNECQGw1H3AVMrrRPNoneX4ryT2NiuTILGmTVIFeTM2Y/p1Q
+2+ISRM2Vjdz7wvnpwYNfxflM5PHV/wJnlUwE+mnnAHY=
+-----END RSA PRIVATE KEY-----
 
=== added file 'debian/xul-ext-webaccounts.postinst'
--- debian/xul-ext-webaccounts.postinst	1970-01-01 00:00:00 +0000
+++ debian/xul-ext-webaccounts.postinst	2012-11-22 16:02:21 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+echo "Please restart all running instances of firefox, or you will experience problems."
+
+if [ -d /var/run ] ; then
+    touch /var/run/firefox-restart-required
+fi
+
+#DEBHELPER#
+