Merge lp:~chipaca/ubuntu-push/packaging into lp:ubuntu-push

[John Lenton]

Merging the packaging branch (to get on the CI train).

For the CI train, packaging needs to be in trunk. Merging the packaging branch into trunk, then.

[Sergio Schvezov (sergiusens)]

- 45 +ubuntu-push (0.1-0.5) trusty; urgency=medium
+ 45 +ubuntu-push (0.1-0ubuntu1) trusty; urgency=medium

[Sergio Schvezov (sergiusens)]

26 === added file 'client.json'

Add this to 'debian/' to make the trunk more generic

[Sergio Schvezov (sergiusens)]

103 +Maintainer: John Lenton <email address hidden>

put yourself as x-original-maintainer and use the ubuntu developers one as maintainer

[Sergio Schvezov (sergiusens)]

147 +Files: debian/*
148 +Copyright: 2014 John Lenton <email address hidden>
149 +License: GPL-3.0+

don't really need this as all our work is copyright canonical anyways.

[Sergio Schvezov (sergiusens)]

217 +3.0 (native)

use 1.0 or 3.0 (quilt)

[Sergio Schvezov (sergiusens)]

239 === added file 'ubuntu-push-client.go.moved'

I suspect this was a mistake

[Diogo Baeder (diogobaeder)]

109 +Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager, url-dispatcher, notification-daemon

Doesn't it depend on dbus as well?

[lp:~chipaca/ubuntu-push/packaging]

50. By John Lenton on 2014-03-20

added dbus to depends

[Diogo Baeder (diogobaeder)]

LGTM

review: Approve

=== 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	2014-03-20 13:54:57 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== modified file '.bzrignore'
--- .bzrignore	2014-01-20 06:23:17 +0000
+++ .bzrignore	2014-03-20 13:54:57 +0000
@@ -2,3 +2,12 @@
 testserver
 coverhtml
 coverage.out
+debian/files
+obj-*
+debian/tmp
+debian/golang-ubuntu-push-dev
+debian/ubuntu-push-client
+debian/*.debhelper.log
+debian/*.ex
+debian/*.EX
+debian/*.substvars

=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2014-03-20 13:54:57 +0000
@@ -0,0 +1,29 @@
+ubuntu-push (0.1-0ubuntu1) trusty; urgency=medium
+
+  * Getting ready for CI train.
+
+ -- John Lenton <[e-mail]>  Thu, 20 Mar 2014 12:20:13 +0000
+
+ubuntu-push (0.1-0pre4) trusty; urgency=medium
+
+  * Pointing it to staging. Building a source package.
+
+ -- John Lenton <[e-mail]>  Fri, 07 Feb 2014 19:35:50 +0000
+
+ubuntu-push (0.1-0pre3) trusty; urgency=medium
+
+  * first one with a config file and upstart thingie!
+
+ -- John Lenton <[e-mail]>  Fri, 07 Feb 2014 11:29:36 +0000
+
+ubuntu-push (0.1-0pre2) trusty; urgency=medium
+
+  * A lot closer!
+
+ -- John Lenton <[e-mail]>  Thu, 06 Feb 2014 17:31:39 +0000
+
+ubuntu-push (0.1-0pre1) trusty; urgency=low
+
+  * Initial release
+
+ -- John Lenton <[e-mail]>  Sun, 26 Jan 2014 22:53:09 +0000

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2014-03-20 13:54:57 +0000
@@ -0,0 +1,1 @@
+9

=== added file 'debian/config.json'
--- debian/config.json	1970-01-01 00:00:00 +0000
+++ debian/config.json	2014-03-20 13:54:57 +0000
@@ -0,0 +1,10 @@
+{
+    "exchange_timeout": "30s",
+    "addr": "push-delivery.ubuntu.com:443",
+    "cert_pem_file": "",
+    "stabilizing_timeout": "2s",
+    "recheck_timeout": "10m",
+    "connectivity_check_url": "http://start.ubuntu.com/connectivity-check.html",
+    "connectivity_check_md5": "4589f42e1546aa47ca181e5d949d310b",
+    "log_level": "debug"
+}

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2014-03-20 13:54:57 +0000
@@ -0,0 +1,41 @@
+Source: ubuntu-push
+Section: net
+Priority: optional
+X-Original-Maintainer: John Lenton <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+Build-Depends: debhelper (>= 9),
+               dh-golang,
+               dh-exec (>= 0.3),
+               golang-go,
+               libwhoopsie-dev,
+               libglib2.0-dev (>= 2.31.6),
+               libgcrypt11-dev,
+               golang-gocheck-dev,
+               golang-go-dbus-dev,
+               golang-go-xdg-dev,
+               golang-gosqlite-dev,
+Standards-Version: 3.9.5
+Homepage: http://launchpad.net/ubuntu-push
+Vcs-Bzr: lp:ubuntu-push
+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-push-hackers/ubuntu-push/trunk/files
+
+Package: ubuntu-push-client
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         dbus,
+         network-manager,
+         url-dispatcher,
+         notification-daemon,
+Built-Using: ${misc:Built-Using}
+Description: Ubuntu Push Notifications client-side daemon
+ The Ubuntu Push Notifications client-side daemon.
+
+Package: golang-ubuntu-push-dev
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Built-Using: ${misc:Built-Using}
+Description: Ubuntu Push Notifications client-side daemon
+ The Ubuntu Push Notifications client-side daemon library.
+ .
+ This package contains the source.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2014-03-20 13:54:57 +0000
@@ -0,0 +1,24 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ubuntu-push-client
+Source: <url://launchpad.net/ubuntu-push>
+
+Files: *
+Copyright: 2013-2014 Canonical Ltd.
+License: GPL-3.0+
+
+License: GPL-3.0+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

=== added file 'debian/docs'
--- debian/docs	1970-01-01 00:00:00 +0000
+++ debian/docs	2014-03-20 13:54:57 +0000
@@ -0,0 +1,1 @@
+README

=== added file 'debian/golang-ubuntu-push-dev.install'
--- debian/golang-ubuntu-push-dev.install	1970-01-01 00:00:00 +0000
+++ debian/golang-ubuntu-push-dev.install	2014-03-20 13:54:57 +0000
@@ -0,0 +1,1 @@
+usr/share/gocode

=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2014-03-20 13:54:57 +0000
@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+export DH_GOPKG := launchpad.net/ubuntu-push
+export DEB_BUILD_OPTIONS := nostrip
+export UBUNTU_PUSH_TEST_RESOURCES_ROOT := $(CURDIR)
+
+TMP := debian/tmp
+DIR := debian/ubuntu-push-client
+BIN := $(DIR)/usr/lib/ubuntu-push-client
+CFG := $(DIR)/etc/xdg/ubuntu-push-client
+UPS := $(DIR)/usr/share/upstart/sessions
+
+# override_dh_install:
+# 	mv -v $(DIR) $(TMP)
+# 	mkdir -vp $(BIN) $(CFG) $(UPS)
+# 	mv -v $(TMP)/usr/bin/ubuntu-push $(BIN)/ubuntu-push-client
+# 	cp -v debian/config.json $(CFG)
+# 	cp -v debian/ubuntu-push-client.conf $(UPS)
+
+%:
+	dh $@ --buildsystem=golang --with=golang

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2014-03-20 13:54:57 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)

=== added file 'debian/ubuntu-push-client.conf'
--- debian/ubuntu-push-client.conf	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-push-client.conf	2014-03-20 13:54:57 +0000
@@ -0,0 +1,6 @@
+description		"Starts the ubuntu push notifications client side daemon"
+
+start on dbus
+stop on runlevel [06]
+
+exec /usr/lib/ubuntu-push-client/ubuntu-push-client

=== added file 'debian/ubuntu-push-client.install'
--- debian/ubuntu-push-client.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-push-client.install	2014-03-20 13:54:57 +0000
@@ -0,0 +1,4 @@
+#!/usr/bin/dh-exec
+debian/config.json /etc/xdg/ubuntu-push-client
+debian/ubuntu-push-client.conf /usr/share/upstart/sessions
+usr/bin/ubuntu-push => /usr/lib/${DEB_HOST_MULTIARCH}/ubuntu-push-client/ubuntu-push-client