Turku Backup System

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

  1. debian_config
  2. Merge into 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 Merge Bot (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 Merge Bot (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 Merge Bot (canonical-is-mergebot) wrote :

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

Revision history for this message
🤖 Canonical IS Merge Bot (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
=== modified file 'Makefile'
--- Makefile 2020-06-21 22:21:56 +0000
+++ Makefile 2022-07-04 11:17:12 +0000
@@ -1,4 +1,5 @@
1PYTHON := python31PYTHON := python3
2VERSION=$(shell grep version= setup.py | cut -d'"' -f2)
23
3all: build4all: build
45
@@ -25,4 +26,8 @@
2526
26clean:27clean:
27 $(PYTHON) setup.py clean28 $(PYTHON) setup.py clean
28 $(RM) -r build MANIFEST29 $(RM) -r build MANIFEST .coverage .tox/ turku_agent.egg-info .pybuild/ dist/*.egg
30
31sourcepkg: clean
32 tar czf ../turku-agent_$(VERSION).orig.tar.gz --exclude debian --exclude .bzr --exclude .bzrignore .
33 debuild -S -sa
2934
=== added file 'PKG-INFO'
--- PKG-INFO 1970-01-01 00:00:00 +0000
+++ PKG-INFO 2022-07-04 11:17:12 +0000
@@ -0,0 +1,10 @@
1Metadata-Version: 1.0
2Name: turku_agent
3Version: 0.2.0
4Summary: Turku backups - client agent
5Home-page: https://launchpad.net/turku
6Author: Canonical IS Admin
7Author-email: is-admin@canonical.com
8License: UNKNOWN
9Description: UNKNOWN
10Platform: UNKNOWN
011
=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog 1970-01-01 00:00:00 +0000
+++ debian/changelog 2022-07-04 11:17:12 +0000
@@ -0,0 +1,43 @@
1turku-agent (0.2.0-1ppa1~jammy) jammy; urgency=medium
2
3 * Update debian build configuration
4
5 -- Loïc Gomez (kotodama) <loic.gomez@canonical.com> Wed, 22 Jun 2022 17:13:24 +0200
6
7turku-agent (0.1.0-1ppa1) focal; urgency=medium
8
9 * turku-agent r57
10
11 -- Loïc Gomez (kotodama) <loic.gomez@canonical.com> Wed, 22 Jun 2022 10:14:51 +0200
12
13turku-agent (0.1.0~bzr43) precise-cat; urgency=medium
14
15 * turku-agent r43
16
17 -- Laurent Sesques <laurent.sesques@canonical.com> Mon, 22 May 2017 11:33:17 +0200
18
19turku-agent (0.1.0~bzr40-1~0.IS.12.04) precise-cat; urgency=low
20
21 * precise-cat rebuild (no changes)
22
23 -- Ryan Finnie <ryan.finnie@canonical.com> Sun, 29 Mar 2015 17:25:09 +0000
24
25turku-agent (0.1.0~bzr40-1) lucid; urgency=low
26
27 * turku-agent r40
28 * upstart file is not (yet) updated to turku-agent-rsyncd-wrapper, to
29 assist in a mass migration.
30
31 -- Ryan Finnie <ryan.finnie@canonical.com> Sun, 29 Mar 2015 08:19:25 +0000
32
33turku-agent (0.0.20150318-1) lucid; urgency=low
34
35 * turku-agent r26
36
37 -- Ryan Finnie <ryan.finnie@canonical.com> Wed, 18 Mar 2015 05:48:26 +0000
38
39turku-agent (0.0.20150225-1) trusty; urgency=medium
40
41 * Initial packaging.
42
43 -- Ryan Finnie <ryan.finnie@canonical.com> Fri, 06 Mar 2015 05:52:34 +0000
044
=== added file 'debian/compat'
--- debian/compat 1970-01-01 00:00:00 +0000
+++ debian/compat 2022-07-04 11:17:12 +0000
@@ -0,0 +1,1 @@
110
02
=== added file 'debian/control'
--- debian/control 1970-01-01 00:00:00 +0000
+++ debian/control 2022-07-04 11:17:12 +0000
@@ -0,0 +1,14 @@
1Source: turku-agent
2Priority: extra
3Maintainer: Canonical IS Admin <is-admin@canonical.com>
4Build-Depends: debhelper (>= 7.0.50~), python3-all, python3-setuptools, tox, dh-python
5Standards-Version: 4.5.1
6Section: admin
7
8Package: turku-agent
9Section: admin
10Architecture: all
11Depends: ${shlibs:Depends}, ${misc:Depends}, rsync, python3
12Recommends: upstart
13Description: Turku backups (agent)
14 This package contains the Turku backups agent.
015
=== added file 'debian/copyright'
--- debian/copyright 1970-01-01 00:00:00 +0000
+++ debian/copyright 2022-07-04 11:17:12 +0000
@@ -0,0 +1,13 @@
1Copyright 2015 Canonical Ltd.
2
3This program is free software: you can redistribute it and/or modify it
4under the terms of the GNU General Public License version 3, as published by
5the Free Software Foundation.
6
7This program is distributed in the hope that it will be useful, but WITHOUT
8ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
9SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
10General Public License for more details.
11
12You should have received a copy of the GNU General Public License along with
13this program. If not, see /usr/share/common-licenses/GPL-3
014
=== added file 'debian/dirs'
--- debian/dirs 1970-01-01 00:00:00 +0000
+++ debian/dirs 2022-07-04 11:17:12 +0000
@@ -0,0 +1,2 @@
1etc/turku-agent/config.d
2etc/turku-agent/sources.d
03
=== added file 'debian/files'
--- debian/files 1970-01-01 00:00:00 +0000
+++ debian/files 2022-07-04 11:17:12 +0000
@@ -0,0 +1,1 @@
1turku-agent_0.2.0-1ppa1~jammy_source.buildinfo admin extra
02
=== added file 'debian/install'
--- debian/install 1970-01-01 00:00:00 +0000
+++ debian/install 2022-07-04 11:17:12 +0000
@@ -0,0 +1,2 @@
1debian/turku-agent-rsyncd.conf etc/init
2debian/turku-agent-rsyncd.service lib/systemd/system
03
=== added file 'debian/rules'
--- debian/rules 1970-01-01 00:00:00 +0000
+++ debian/rules 2022-07-04 11:17:12 +0000
@@ -0,0 +1,15 @@
1#!/usr/bin/make -f
2# -*- makefile -*-
3# Sample debian/rules that uses debhelper.
4# This file was originally written by Joey Hess and Craig Small.
5# As a special exception, when this file is copied by dh-make into a
6# dh-make output file, you may use that output file without restriction.
7# This special exception was added by Craig Small in version 0.37 of dh-make.
8
9# Uncomment this to turn on verbose mode.
10export DH_VERBOSE=1
11
12export PYBUILD_NAME=turku-agent
13
14%:
15 dh $@ --with python3 --buildsystem=pybuild
016
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format 1970-01-01 00:00:00 +0000
+++ debian/source/format 2022-07-04 11:17:12 +0000
@@ -0,0 +1,1 @@
13.0 (quilt)
02
=== added file 'debian/turku-agent-rsyncd.conf'
--- debian/turku-agent-rsyncd.conf 1970-01-01 00:00:00 +0000
+++ debian/turku-agent-rsyncd.conf 2022-07-04 11:17:12 +0000
@@ -0,0 +1,8 @@
1description "turku rsync daemon"
2
3start on runlevel [2345]
4stop on runlevel [!2345]
5
6respawn
7
8exec /usr/bin/rsync --no-detach --daemon --config=/var/lib/turku-agent/rsyncd.conf
09
=== added file 'debian/turku-agent-rsyncd.service'
--- debian/turku-agent-rsyncd.service 1970-01-01 00:00:00 +0000
+++ debian/turku-agent-rsyncd.service 2022-07-04 11:17:12 +0000
@@ -0,0 +1,10 @@
1[Unit]
2Description=turku rsyncd daemon
3ConditionPathExists=/var/lib/turku-agent/rsyncd.conf
4
5[Service]
6ExecStart=/usr/bin/env turku-agent-rsyncd-wrapper
7Restart=always
8
9[Install]
10WantedBy=multi-user.target
011
=== added file 'debian/turku-agent.cron.d'
--- debian/turku-agent.cron.d 1970-01-01 00:00:00 +0000
+++ debian/turku-agent.cron.d 2022-07-04 11:17:12 +0000
@@ -0,0 +1,3 @@
1PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
2*/5 * * * * root turku-agent-ping --wait=300 >/dev/null 2>/dev/null
30 0,12 * * * root turku-update-config --wait=7200 >/dev/null 2>/dev/null

Subscribers

People subscribed via source and target branches

to all changes: