Merge lp:~kotodama/turku/debian_config into lp:turku/turku-agent

Proposed by Loïc Gomez
Status: Merged
Approved by: Loïc Gomez
Approved revision: 60
Merged at revision: 58
Proposed branch: lp:~kotodama/turku/debian_config
Merge into: lp:turku/turku-agent
Diff against target: 209 lines (+129/-1)
14 files modified
Makefile (+6/-1)
PKG-INFO (+10/-0)
debian/changelog (+43/-0)
debian/compat (+1/-0)
debian/control (+14/-0)
debian/copyright (+13/-0)
debian/dirs (+2/-0)
debian/files (+1/-0)
debian/install (+2/-0)
debian/rules (+15/-0)
debian/source/format (+1/-0)
debian/turku-agent-rsyncd.conf (+8/-0)
debian/turku-agent-rsyncd.service (+10/-0)
debian/turku-agent.cron.d (+3/-0)
To merge this branch: bzr merge lp:~kotodama/turku/debian_config
Reviewer Review Type Date Requested Status
Barry Price Approve
Review via email: mp+425282@code.launchpad.net

Commit message

Add debian directory, update make clean, add make sourcepkg to create source package

To post a comment you must log in.
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

Revision history for this message
Barry Price (barryprice) wrote :

Couple of nitpicks inline, otherwise +1

review: Approve
Revision history for this message
Loïc Gomez (kotodama) wrote :

Thanks, fixed !

Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change has no commit message, setting status to needs review.

Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision 58

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2020-06-21 22:21:56 +0000
3+++ Makefile 2022-07-04 11:17:12 +0000
4@@ -1,4 +1,5 @@
5 PYTHON := python3
6+VERSION=$(shell grep version= setup.py | cut -d'"' -f2)
7
8 all: build
9
10@@ -25,4 +26,8 @@
11
12 clean:
13 $(PYTHON) setup.py clean
14- $(RM) -r build MANIFEST
15+ $(RM) -r build MANIFEST .coverage .tox/ turku_agent.egg-info .pybuild/ dist/*.egg
16+
17+sourcepkg: clean
18+ tar czf ../turku-agent_$(VERSION).orig.tar.gz --exclude debian --exclude .bzr --exclude .bzrignore .
19+ debuild -S -sa
20
21=== added file 'PKG-INFO'
22--- PKG-INFO 1970-01-01 00:00:00 +0000
23+++ PKG-INFO 2022-07-04 11:17:12 +0000
24@@ -0,0 +1,10 @@
25+Metadata-Version: 1.0
26+Name: turku_agent
27+Version: 0.2.0
28+Summary: Turku backups - client agent
29+Home-page: https://launchpad.net/turku
30+Author: Canonical IS Admin
31+Author-email: is-admin@canonical.com
32+License: UNKNOWN
33+Description: UNKNOWN
34+Platform: UNKNOWN
35
36=== added directory 'debian'
37=== added file 'debian/changelog'
38--- debian/changelog 1970-01-01 00:00:00 +0000
39+++ debian/changelog 2022-07-04 11:17:12 +0000
40@@ -0,0 +1,43 @@
41+turku-agent (0.2.0-1ppa1~jammy) jammy; urgency=medium
42+
43+ * Update debian build configuration
44+
45+ -- Loïc Gomez (kotodama) <loic.gomez@canonical.com> Wed, 22 Jun 2022 17:13:24 +0200
46+
47+turku-agent (0.1.0-1ppa1) focal; urgency=medium
48+
49+ * turku-agent r57
50+
51+ -- Loïc Gomez (kotodama) <loic.gomez@canonical.com> Wed, 22 Jun 2022 10:14:51 +0200
52+
53+turku-agent (0.1.0~bzr43) precise-cat; urgency=medium
54+
55+ * turku-agent r43
56+
57+ -- Laurent Sesques <laurent.sesques@canonical.com> Mon, 22 May 2017 11:33:17 +0200
58+
59+turku-agent (0.1.0~bzr40-1~0.IS.12.04) precise-cat; urgency=low
60+
61+ * precise-cat rebuild (no changes)
62+
63+ -- Ryan Finnie <ryan.finnie@canonical.com> Sun, 29 Mar 2015 17:25:09 +0000
64+
65+turku-agent (0.1.0~bzr40-1) lucid; urgency=low
66+
67+ * turku-agent r40
68+ * upstart file is not (yet) updated to turku-agent-rsyncd-wrapper, to
69+ assist in a mass migration.
70+
71+ -- Ryan Finnie <ryan.finnie@canonical.com> Sun, 29 Mar 2015 08:19:25 +0000
72+
73+turku-agent (0.0.20150318-1) lucid; urgency=low
74+
75+ * turku-agent r26
76+
77+ -- Ryan Finnie <ryan.finnie@canonical.com> Wed, 18 Mar 2015 05:48:26 +0000
78+
79+turku-agent (0.0.20150225-1) trusty; urgency=medium
80+
81+ * Initial packaging.
82+
83+ -- Ryan Finnie <ryan.finnie@canonical.com> Fri, 06 Mar 2015 05:52:34 +0000
84
85=== added file 'debian/compat'
86--- debian/compat 1970-01-01 00:00:00 +0000
87+++ debian/compat 2022-07-04 11:17:12 +0000
88@@ -0,0 +1,1 @@
89+10
90
91=== added file 'debian/control'
92--- debian/control 1970-01-01 00:00:00 +0000
93+++ debian/control 2022-07-04 11:17:12 +0000
94@@ -0,0 +1,14 @@
95+Source: turku-agent
96+Priority: extra
97+Maintainer: Canonical IS Admin <is-admin@canonical.com>
98+Build-Depends: debhelper (>= 7.0.50~), python3-all, python3-setuptools, tox, dh-python
99+Standards-Version: 4.5.1
100+Section: admin
101+
102+Package: turku-agent
103+Section: admin
104+Architecture: all
105+Depends: ${shlibs:Depends}, ${misc:Depends}, rsync, python3
106+Recommends: upstart
107+Description: Turku backups (agent)
108+ This package contains the Turku backups agent.
109
110=== added file 'debian/copyright'
111--- debian/copyright 1970-01-01 00:00:00 +0000
112+++ debian/copyright 2022-07-04 11:17:12 +0000
113@@ -0,0 +1,13 @@
114+Copyright 2015 Canonical Ltd.
115+
116+This program is free software: you can redistribute it and/or modify it
117+under the terms of the GNU General Public License version 3, as published by
118+the Free Software Foundation.
119+
120+This program is distributed in the hope that it will be useful, but WITHOUT
121+ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
122+SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
123+General Public License for more details.
124+
125+You should have received a copy of the GNU General Public License along with
126+this program. If not, see /usr/share/common-licenses/GPL-3
127
128=== added file 'debian/dirs'
129--- debian/dirs 1970-01-01 00:00:00 +0000
130+++ debian/dirs 2022-07-04 11:17:12 +0000
131@@ -0,0 +1,2 @@
132+etc/turku-agent/config.d
133+etc/turku-agent/sources.d
134
135=== added file 'debian/files'
136--- debian/files 1970-01-01 00:00:00 +0000
137+++ debian/files 2022-07-04 11:17:12 +0000
138@@ -0,0 +1,1 @@
139+turku-agent_0.2.0-1ppa1~jammy_source.buildinfo admin extra
140
141=== added file 'debian/install'
142--- debian/install 1970-01-01 00:00:00 +0000
143+++ debian/install 2022-07-04 11:17:12 +0000
144@@ -0,0 +1,2 @@
145+debian/turku-agent-rsyncd.conf etc/init
146+debian/turku-agent-rsyncd.service lib/systemd/system
147
148=== added file 'debian/rules'
149--- debian/rules 1970-01-01 00:00:00 +0000
150+++ debian/rules 2022-07-04 11:17:12 +0000
151@@ -0,0 +1,15 @@
152+#!/usr/bin/make -f
153+# -*- makefile -*-
154+# Sample debian/rules that uses debhelper.
155+# This file was originally written by Joey Hess and Craig Small.
156+# As a special exception, when this file is copied by dh-make into a
157+# dh-make output file, you may use that output file without restriction.
158+# This special exception was added by Craig Small in version 0.37 of dh-make.
159+
160+# Uncomment this to turn on verbose mode.
161+export DH_VERBOSE=1
162+
163+export PYBUILD_NAME=turku-agent
164+
165+%:
166+ dh $@ --with python3 --buildsystem=pybuild
167
168=== added directory 'debian/source'
169=== added file 'debian/source/format'
170--- debian/source/format 1970-01-01 00:00:00 +0000
171+++ debian/source/format 2022-07-04 11:17:12 +0000
172@@ -0,0 +1,1 @@
173+3.0 (quilt)
174
175=== added file 'debian/turku-agent-rsyncd.conf'
176--- debian/turku-agent-rsyncd.conf 1970-01-01 00:00:00 +0000
177+++ debian/turku-agent-rsyncd.conf 2022-07-04 11:17:12 +0000
178@@ -0,0 +1,8 @@
179+description "turku rsync daemon"
180+
181+start on runlevel [2345]
182+stop on runlevel [!2345]
183+
184+respawn
185+
186+exec /usr/bin/rsync --no-detach --daemon --config=/var/lib/turku-agent/rsyncd.conf
187
188=== added file 'debian/turku-agent-rsyncd.service'
189--- debian/turku-agent-rsyncd.service 1970-01-01 00:00:00 +0000
190+++ debian/turku-agent-rsyncd.service 2022-07-04 11:17:12 +0000
191@@ -0,0 +1,10 @@
192+[Unit]
193+Description=turku rsyncd daemon
194+ConditionPathExists=/var/lib/turku-agent/rsyncd.conf
195+
196+[Service]
197+ExecStart=/usr/bin/env turku-agent-rsyncd-wrapper
198+Restart=always
199+
200+[Install]
201+WantedBy=multi-user.target
202
203=== added file 'debian/turku-agent.cron.d'
204--- debian/turku-agent.cron.d 1970-01-01 00:00:00 +0000
205+++ debian/turku-agent.cron.d 2022-07-04 11:17:12 +0000
206@@ -0,0 +1,3 @@
207+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
208+*/5 * * * * root turku-agent-ping --wait=300 >/dev/null 2>/dev/null
209+0 0,12 * * * root turku-update-config --wait=7200 >/dev/null 2>/dev/null

Subscribers

People subscribed via source and target branches

to all changes: