Permalink
Browse files

Merge branch 'lamby/packaging'

  • Loading branch information...
2 parents 71478bd + fece3d0 commit 07acc1c730154f8caeb6bf68208a6062a17b48c5 @JedMeister JedMeister committed Aug 15, 2017
View
@@ -0,0 +1,12 @@
+sudo: required
+language: generic
+
+services:
+ - docker
+
+script:
+ - wget -O- http://travis.debian.net/script.sh | sh -
+
+branches:
+ except:
+ - /^debian\/\d/
View
@@ -1 +1 @@
-5
+10
View
No changes.
View
@@ -2,11 +2,26 @@ Source: tklbam
Section: misc
Priority: optional
Maintainer: Liraz Siri <liraz@turnkeylinux.org>
-Build-Depends: debhelper (>> 4.2.0), python-docutils
-Standards-Version: 3.6.1
+Build-Depends:
+ debhelper (>= 10),
+ dh-exec,
+ python-docutils,
+ python-all (>= 2.6.6-3~),
+Standards-Version: 4.0.0
+X-Python-Version: >= 2.6
Package: tklbam
Architecture: all
-Depends: python (>= 2.4), tklbam-squid (>= 2.7.STABLE9-2.1turnkey+25), tklbam-duplicity (>= 0.6.18), tklbam-python-boto (>= 2.3.0-2turnkey), turnkey-pylib (>= 0.5), python-crypto, pycurl-wrapper (>= 1.2), python-simplejson, ca-certificates, ntpdate
-Section: misc
+Depends:
+ ca-certificates,
+ ${misc:Depends},
+ ntpdate,
+ pycurl-wrapper (>= 1.2),
+ ${python:Depends},
+ python-crypto,
+ python-simplejson,
+ tklbam-duplicity (>= 0.6.18),
+ tklbam-python-boto (>= 2.3.0-2turnkey),
+ tklbam-squid (>= 2.7.STABLE9-2.1turnkey+25),
+ turnkey-pylib (>= 0.5),
Description: TurnKey GNU/Linux Backup and Migration agent
View
@@ -7,4 +7,3 @@ TKLBAM 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.
-
View
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-#DEBHELPER#
-exit 0
View
@@ -1,43 +1,9 @@
#! /usr/bin/make -f
-buildroot=debian/$(shell awk '/^Package/ {print $$2}' debian/control)
-prefix=$(buildroot)/usr
+include /usr/share/dpkg/pkg-info.mk
-clean:
- dh_clean
+%:
+ dh $@ --with python2 --buildsystem=makefile
-build:
- mkdir -p $(prefix)
-
-install:
- dh_testroot
- dh_clean -k
- dh_testdir
- dh_installdirs
- dh_install
- $(MAKE) install prefix=$(prefix)
- mkdir -p $(buildroot)/etc/cron.daily
- cp contrib/cron.sh $(buildroot)/etc/cron.daily/tklbam-backup
- mkdir -p $(buildroot)/usr/share/tklbam/contrib
- cp contrib/cron.sh $(buildroot)/usr/share/tklbam/contrib
- mkdir -p $(buildroot)/etc/tklbam/hooks.d
- cp contrib/example-conf $(buildroot)/etc/tklbam/conf
- cp contrib/example-overrides $(buildroot)/etc/tklbam/overrides
- cp contrib/example-hook $(buildroot)/etc/tklbam/hooks.d/example
- cp contrib/fixclock-hook $(buildroot)/etc/tklbam/hooks.d/fixclock
-
-binary-indep: install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installman
- dh_installdeb
- dh_installlogrotate
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-arch: install
-
-binary: binary-indep binary-arch
-.PHONY: clean binary-indep binary-arch binary install
+override_dh_auto_install:
+ dh_auto_install -- prefix=debian/$(DEB_SOURCE)/usr
View
@@ -0,0 +1 @@
+3.0 (native)
@@ -1,2 +1,2 @@
-docs/*.txt
docs/*.html
+docs/*.txt
View
@@ -0,0 +1,6 @@
+#!/usr/bin/dh-exec
+
+contrib/example-conf => /etc/tklbam/conf
+contrib/example-overrides => /etc/tklbam/overrides
+contrib/example-hook => /etc/tklbam/hooks.d/example
+contrib/fixclock-hook => /etc/tklbam/hooks.d/fixclock
File renamed without changes.
@@ -1,5 +1,7 @@
#!/bin/sh
+set -e
+
md5sum_match() {
digest=$1
fpath=$2
View
@@ -114,7 +114,7 @@ OPTIONS
webdavs://user[:password]@other.host/some_dir
gdocs://user[:password]@other.host/some_dir
- Note: Alternate targets may require additional dependancies E.g. to use SSH you will need to
+ Note: Alternate targets may require additional dependencies E.g. to use SSH you will need to
install 'python-paramiko' (`apt-get update && apt-get install python-paramiko`).
Currently the requirements of each target are not documented; however if you keep in mind
that TKLBAM uses Duplicity as a back end, google should provide guidance.
@@ -165,7 +165,7 @@ Configurable options
Resolution order for configurable options:
-1) comand line (highest precedence)
+1) command line (highest precedence)
2) configuration file (/etc/tklbam/conf)::
# comment
View
@@ -121,7 +121,7 @@ Configurable options
Resolution order for configurable options:
-1) comand line (highest precedence)
+1) command line (highest precedence)
2) configuration file (/etc/tklbam/conf)::
# comment

0 comments on commit 07acc1c

Please sign in to comment.