Ubuntu Push Notifications

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

  1. packaging
  2. Merge into trunk
Proposed by John Lenton
Status: Merged
Approved by: John Lenton
Approved revision: 50
Merged at revision: 85
Proposed branch: lp:~chipaca/ubuntu-push/packaging
Merge into: lp:ubuntu-push
Diff against target: 221 lines (+151/-0)
13 files modified
.bzr-builddeb/default.conf (+2/-0)
.bzrignore (+9/-0)
debian/changelog (+29/-0)
debian/compat (+1/-0)
debian/config.json (+10/-0)
debian/control (+41/-0)
debian/copyright (+24/-0)
debian/docs (+1/-0)
debian/golang-ubuntu-push-dev.install (+1/-0)
debian/rules (+22/-0)
debian/source/format (+1/-0)
debian/ubuntu-push-client.conf (+6/-0)
debian/ubuntu-push-client.install (+4/-0)
To merge this branch: bzr merge lp:~chipaca/ubuntu-push/packaging
Reviewer Review Type Date Requested Status
Diogo Baeder (community) Approve
Review via email: mp+211922@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

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

Revision history for this message
Sergio Schvezov (sergiusens) wrote :

26 === added file 'client.json'

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

Revision history for this message
Sergio Schvezov (sergiusens) wrote :

103 +Maintainer: John Lenton <email address hidden>

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

Revision history for this message
Sergio Schvezov (sergiusens) wrote :

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.

Revision history for this message
Sergio Schvezov (sergiusens) wrote :

217 +3.0 (native)

use 1.0 or 3.0 (quilt)

Revision history for this message
Sergio Schvezov (sergiusens) wrote :

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

I suspect this was a mistake

Revision history for this message
Diogo Baeder (diogobaeder) wrote :

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 updated
50. By John Lenton

added dbus to depends

Revision history for this message
Diogo Baeder (diogobaeder) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1[BUILDDEB]
2split = True
03
=== modified file '.bzrignore'
--- .bzrignore 2014-01-20 06:23:17 +0000
+++ .bzrignore 2014-03-20 13:54:57 +0000
@@ -2,3 +2,12 @@
2testserver2testserver
3coverhtml3coverhtml
4coverage.out4coverage.out
5debian/files
6obj-*
7debian/tmp
8debian/golang-ubuntu-push-dev
9debian/ubuntu-push-client
10debian/*.debhelper.log
11debian/*.ex
12debian/*.EX
13debian/*.substvars
514
=== 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 @@
1ubuntu-push (0.1-0ubuntu1) trusty; urgency=medium
2
3 * Getting ready for CI train.
4
5 -- John Lenton <john.lenton@canonical.com> Thu, 20 Mar 2014 12:20:13 +0000
6
7ubuntu-push (0.1-0pre4) trusty; urgency=medium
8
9 * Pointing it to staging. Building a source package.
10
11 -- John Lenton <john.lenton@canonical.com> Fri, 07 Feb 2014 19:35:50 +0000
12
13ubuntu-push (0.1-0pre3) trusty; urgency=medium
14
15 * first one with a config file and upstart thingie!
16
17 -- John Lenton <john.lenton@canonical.com> Fri, 07 Feb 2014 11:29:36 +0000
18
19ubuntu-push (0.1-0pre2) trusty; urgency=medium
20
21 * A lot closer!
22
23 -- John Lenton <jlenton@gmail.com> Thu, 06 Feb 2014 17:31:39 +0000
24
25ubuntu-push (0.1-0pre1) trusty; urgency=low
26
27 * Initial release
28
29 -- John Lenton <john.lenton@canonical.com> Sun, 26 Jan 2014 22:53:09 +0000
030
=== 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 @@
19
02
=== 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 @@
1{
2 "exchange_timeout": "30s",
3 "addr": "push-delivery.ubuntu.com:443",
4 "cert_pem_file": "",
5 "stabilizing_timeout": "2s",
6 "recheck_timeout": "10m",
7 "connectivity_check_url": "http://start.ubuntu.com/connectivity-check.html",
8 "connectivity_check_md5": "4589f42e1546aa47ca181e5d949d310b",
9 "log_level": "debug"
10}
011
=== 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 @@
1Source: ubuntu-push
2Section: net
3Priority: optional
4X-Original-Maintainer: John Lenton <john.lenton@canonical.com>
5Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
6Build-Depends: debhelper (>= 9),
7 dh-golang,
8 dh-exec (>= 0.3),
9 golang-go,
10 libwhoopsie-dev,
11 libglib2.0-dev (>= 2.31.6),
12 libgcrypt11-dev,
13 golang-gocheck-dev,
14 golang-go-dbus-dev,
15 golang-go-xdg-dev,
16 golang-gosqlite-dev,
17Standards-Version: 3.9.5
18Homepage: http://launchpad.net/ubuntu-push
19Vcs-Bzr: lp:ubuntu-push
20Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-push-hackers/ubuntu-push/trunk/files
21
22Package: ubuntu-push-client
23Architecture: any
24Depends: ${shlibs:Depends},
25 ${misc:Depends},
26 dbus,
27 network-manager,
28 url-dispatcher,
29 notification-daemon,
30Built-Using: ${misc:Built-Using}
31Description: Ubuntu Push Notifications client-side daemon
32 The Ubuntu Push Notifications client-side daemon.
33
34Package: golang-ubuntu-push-dev
35Architecture: all
36Depends: ${shlibs:Depends}, ${misc:Depends}
37Built-Using: ${misc:Built-Using}
38Description: Ubuntu Push Notifications client-side daemon
39 The Ubuntu Push Notifications client-side daemon library.
40 .
41 This package contains the source.
042
=== 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 @@
1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2Upstream-Name: ubuntu-push-client
3Source: <url://launchpad.net/ubuntu-push>
4
5Files: *
6Copyright: 2013-2014 Canonical Ltd.
7License: GPL-3.0+
8
9License: GPL-3.0+
10 This program is free software: you can redistribute it and/or modify
11 it under the terms of the GNU General Public License as published by
12 the Free Software Foundation, either version 3 of the License, or
13 (at your option) any later version.
14 .
15 This package is distributed in the hope that it will be useful,
16 but WITHOUT ANY WARRANTY; without even the implied warranty of
17 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 GNU General Public License for more details.
19 .
20 You should have received a copy of the GNU General Public License
21 along with this program. If not, see <http://www.gnu.org/licenses/>.
22 .
23 On Debian systems, the complete text of the GNU General
24 Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
025
=== 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 @@
1README
02
=== 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 @@
1usr/share/gocode
02
=== 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 @@
1#!/usr/bin/make -f
2# -*- makefile -*-
3
4export DH_GOPKG := launchpad.net/ubuntu-push
5export DEB_BUILD_OPTIONS := nostrip
6export UBUNTU_PUSH_TEST_RESOURCES_ROOT := $(CURDIR)
7
8TMP := debian/tmp
9DIR := debian/ubuntu-push-client
10BIN := $(DIR)/usr/lib/ubuntu-push-client
11CFG := $(DIR)/etc/xdg/ubuntu-push-client
12UPS := $(DIR)/usr/share/upstart/sessions
13
14# override_dh_install:
15# mv -v $(DIR) $(TMP)
16# mkdir -vp $(BIN) $(CFG) $(UPS)
17# mv -v $(TMP)/usr/bin/ubuntu-push $(BIN)/ubuntu-push-client
18# cp -v debian/config.json $(CFG)
19# cp -v debian/ubuntu-push-client.conf $(UPS)
20
21%:
22 dh $@ --buildsystem=golang --with=golang
023
=== 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 @@
13.0 (quilt)
02
=== 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 @@
1description "Starts the ubuntu push notifications client side daemon"
2
3start on dbus
4stop on runlevel [06]
5
6exec /usr/lib/ubuntu-push-client/ubuntu-push-client
07
=== 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 @@
1#!/usr/bin/dh-exec
2debian/config.json /etc/xdg/ubuntu-push-client
3debian/ubuntu-push-client.conf /usr/share/upstart/sessions
4usr/bin/ubuntu-push => /usr/lib/${DEB_HOST_MULTIARCH}/ubuntu-push-client/ubuntu-push-client

Subscribers

People subscribed via source and target branches