Skip to content

Commit

Permalink
pkg: update to debhelper 9
Browse files Browse the repository at this point in the history
Updating to debhelper 9 allows us to make the 'debian/rules' much simpler.

This package satisfies 'lintian -iIEcv -pedantic' on Debian 8, other that two
obsolete messages which have been disabled in the upstream lintian packages:
- spelling-error-in-binary: tarsnap(1) contains the string "tEH".
  (too many false positives from this warning)
- hyphen-used-as-minus-sign: old versions of groff apparently interpreted
  "-" as hypehen (U+2010) and not minus signs (U+002D), so in some
  locales this meant that you could not copy&paste from a man page to
  the command-line.
  (groff now handles this correctly, so escaping - with \- is no longer
  necessary)

On Ubuntu 14.04, the only error is
- bad-distribution-in-changes-file: this is a stupid error -- and yes, it
  counts as an actual "error" -- because Ubuntu doesn't include the codename
  "unstable".
  • Loading branch information
gperciva committed Feb 21, 2016
1 parent cd672d5 commit 09e7704
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 118 deletions.
2 changes: 1 addition & 1 deletion pkg/debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5
9
18 changes: 11 additions & 7 deletions pkg/debian/control
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
Source: tarsnap
Section: net
Priority: extra
Maintainer: Mads Sulau Joergensen <mads@sulau.dk>
Build-Depends: debhelper (>= 5), e2fslibs-dev, zlib1g-dev, libssl-dev, libbz2-dev, libattr1-dev, libacl1-dev
Standards-Version: 3.7.2
Maintainer: Graham Percival <gperciva@tarsnap.com>
Build-Depends: debhelper (>= 9.0.0), e2fslibs-dev, zlib1g-dev, libssl-dev, libbz2-dev, libattr1-dev, libacl1-dev, pkg-config, bash-completion
Standards-Version: 3.9.5

Package: tarsnap
Architecture: any
Depends: ${shlibs:Depends}
Description: tarsnap is an online encrypted snapshotted backup service
Tarsnap is an encrypted snapshotted online backup service for BSD,
Linux, OpenSolaris, and OS X.
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: secure, efficient online backup service
This package contains the client for Tarsnap: a secure, efficient online
backup service.
- Your data is encrypted with your personal keys.
- The client source code is available.
- Deduplication finds unique data between your current data and encrypted
archives.
59 changes: 29 additions & 30 deletions pkg/debian/copyright
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
This is tarsnap, written and maintained by Colin Percival
on Sat, 31 Jan 2009 22:54:01 +0000.
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Tarsnap
Upstream-Contact: Colin Percival <cperciva@tarsnap.com>
Source: https://tarsnap.com/download.html

The original source can always be found at:
https://www.tarsnap.com/download.html

Copyright Holder: Colin Percival

License:

Unless specified otherwise in individual files, the contents of this
package is covered by the following copyright, license, and disclaimer:

Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Colin Percival
All rights reserved.

Redistribution and use in source and binary forms, without modification,
is permitted for the sole purpose of using the "tarsnap" backup service
provided by Colin Percival.

THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
Files: *
Copyright: 2006 - 2016 Colin Percival
License: Commercial
.
Unless specified otherwise in individual files, the contents of this
package is covered by the following copyright, license, and disclaimer:
.
Copyright 2006 - 2016 Colin Percival
All rights reserved.
.
Redistribution and use in source and binary forms, without modification,
is permitted for the sole purpose of using the "tarsnap" backup service
provided by Colin Percival.
.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
4 changes: 0 additions & 4 deletions pkg/debian/dirs

This file was deleted.

79 changes: 4 additions & 75 deletions pkg/debian/rules
Original file line number Diff line number Diff line change
@@ -1,80 +1,9 @@
#!/usr/bin/make -f
# -*- makefile -*-
#
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)

CFLAGS = -Wall -g
%:
dh $@

ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
endif
override_dh_auto_configure:
dh_auto_configure -- --with-bash-completion-dir

config.status: configure
dh_testdir

./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-xattr --enable-acl --with-bz2lib CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"

build: build-stamp

build-stamp: config.status
dh_testdir
$(MAKE)
touch $@

clean:
dh_testdir
dh_testroot
rm -f build-stamp

-$(MAKE) clean
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
endif
ifneq "$(wildcard /usr/share/misc/config.guess)" ""
cp -f /usr/share/misc/config.guess config.guess
endif

dh_clean

install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs

$(MAKE) prefix=$(CURDIR)/debian/tarsnap/usr sysconfdir=$(CURDIR)/debian/tarsnap/etc install

mv $(CURDIR)/debian/tarsnap/etc/tarsnap.conf.sample $(CURDIR)/debian/tarsnap/etc/tarsnap.conf
sed -i 's,^[a-z],#\0,' $(CURDIR)/debian/tarsnap/etc/tarsnap.conf
sed -i 's,#cachedir .*,cachedir /var/lib/tarsnap/cache,' $(CURDIR)/debian/tarsnap/etc/tarsnap.conf

# Build architecture-independent files here.
binary-indep: build install

# Build architecture-dependent files here.
binary-arch: build install
dh_testdir
dh_testroot
dh_installchangelogs
dh_installdocs
dh_installexamples
dh_install
dh_installman
dh_link
dh_strip
dh_compress
dh_fixperms
chmod 0700 $(CURDIR)/debian/tarsnap/var/lib/tarsnap/cache
dh_installdeb
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb

binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
1 change: 1 addition & 0 deletions pkg/debian/source/format
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.0 (quilt)
1 change: 0 additions & 1 deletion pkg/debian/watch
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
version=3
https://www.tarsnap.com/download.html tarsnap-autoconf-(.*)\.tgz

0 comments on commit 09e7704

Please sign in to comment.