debian/0000755000000000000000000000000012253630347007173 5ustar debian/README.source0000644000000000000000000000150512253630301011341 0ustar bup for Debian -------------- The bup source is obtained via git from . The bup package source is collaboratively maintained by the Debian collab-maint project. You can obtain a copy of the source (including the upstream source) from . * The 'master' branch is used to track upstream's master * you may wish to add it as a remote to any clone: git remote add upstream git://github.com/bup/bup.git * we fast-forward merge from upstream's master * The 'debian' branch is used to track the debian packaging effort * This usually tracks the most recent upstream tag * we non-fast-forward merge when moving between upstream tags * we carry upstream's tags, which are of the form bup-x.xxx * we prefix our tags with 'debian/' e.g. debian/0.14a-1 debian/bup-doc.install0000644000000000000000000000004012253630301012074 0ustar usr/share/doc/bup usr/share/man debian/bup.install0000644000000000000000000000003012253630301011330 0ustar usr/bin/* usr/lib/bup/* debian/changelog0000644000000000000000000001416112253630301011036 0ustar bup (0.25-1) unstable; urgency=medium * New upstream release. -- Robert S. Edmonds Mon, 16 Dec 2013 11:55:58 -0500 bup (0.25~rc5-1) unstable; urgency=medium * New upstream release. -- Robert S. Edmonds Tue, 10 Dec 2013 14:42:47 -0500 bup (0.25~rc4-1) unstable; urgency=low * New upstream release. * Increase debhelper compat level to 9. * Re-enable python-pylibacl on non-Linux architectures; tentatively closes: #726727. -- Robert S. Edmonds Fri, 15 Nov 2013 14:31:34 -0500 bup (0.25~rc3-1) unstable; urgency=low * New upstream release. -- Robert S. Edmonds Tue, 24 Sep 2013 19:08:12 -0400 bup (0.25~rc2-3) unstable; urgency=low * Build-Depend and Depend on python-pylibacl and python-pyxattr only on linux-any. * Build-Depend and Depend on par2 only on !hurd-i386. * Add Build-Depends-Indep on pandoc-data due to pandoc/pandoc-data binary package split. -- Robert S. Edmonds Sun, 01 Sep 2013 14:40:26 -0400 bup (0.25~rc2-2) unstable; urgency=low * Fold bup-fuse and bup-web back into the main 'bup' package at the suggestion of the Debian FTP Masters. * Demote the Depends on python-fuse (for 'bup fuse') and python-tornado (for 'bup web') to Recommends, since these scripts have import guards and will print a proper error message if these packages aren't installed. -- Robert S. Edmonds Sat, 10 Aug 2013 17:13:36 -0400 bup (0.25~rc2-1) unstable; urgency=low * New upstream release. * New binary packages: - bup-doc - bup-fuse - bup-web * Add dependency on python-pylibacl, python-pyxattr, in order to backup file metadata. * Promote dependency on par2 from Recommends to Depends. -- Robert S. Edmonds Thu, 08 Aug 2013 22:00:57 -0400 bup (0.25~git20130505-1) unstable; urgency=low * Upload to unstable. * Merge upstream commit 6cf3688. * Push Debian source package changes to git.debian.org; closes: #704908. * Don't build docs on mips; closes: #704910. -- Robert S. Edmonds Mon, 06 May 2013 15:35:00 -0400 bup (0.25~git20130303-1) experimental; urgency=low * New maintainer; closes: #699163. * Merge upstream commit 7e9005e. * Convert from python-support to dh_python2. -- Robert S. Edmonds Sun, 03 Mar 2013 19:43:36 -0500 bup (0.25~git2011.11.04-6) experimental; urgency=low * Add --parallel to dh* calls to support parallel building. * Depend upon python-pyxattr and python-pylibacl so that "bup meta" works. Thanks Sascha Silbe. Closes: #692009. -- Jon Dowland Tue, 06 Nov 2012 22:50:59 +0000 bup (0.25~git2011.11.04-5) unstable; urgency=low * Add 0.22a-1 changelog entry to this file. Remove changelog entry for 0.21-1 which was never uploaded. Closes: #665650. * The experimental upload appears to have worked! Closes: #664185, #668997. -- Jon Dowland Fri, 25 May 2012 11:55:14 +0100 bup (0.25~git2011.11.04-4) experimental; urgency=low * Bump standards version. * Skip 'make test' on s390 to avoid FTBFS. This might resolve #664185. * Adjust two 'asserts' to be side-effect free, so that users could run with PYTHONOPTIMIZE adjusted. This might resolve #668997. -- Jon Dowland Thu, 24 May 2012 09:43:28 +0100 bup (0.25~git2011.11.04-3) unstable; urgency=low * Add two patches from Gonéri Le Bouder to fix building on KFreeBSD. Boy, we have a lot of build failures. Thanks Gonéri! Closes: #651104. -- Jon Dowland Wed, 11 Jan 2012 21:34:48 +0000 bup (0.25~git2011.11.04-2) unstable; urgency=low * Add bloom-unaligned-bufs to the series file. Oops! Thanks Jakub Wilk. Closes: #641488. -- Jon Dowland Tue, 03 Jan 2012 20:48:36 +0000 bup (0.25~git2011.11.04-1) unstable; urgency=low [ Teemu Ikonen ] * New upstream version. * Add a proper patch 'no-werror' for the previous NMU, fixing FTBFS (closes: #643060). * Refresh patches 'mangle-version' and 'excise-tornado' to work with the new upstream version. * rules: - override dh_auto_configure: Call ./configure without arguments. - override dh_auto_clean: Remove files generated by configure. [ Jon Dowland ] * We've merged upstream commit 8953dc8 (a couple ahead of bup-0.25-rc1) * Acknowledge NMU. Thanks Julien Cristau! * Don't use pandoc on architectures where it's missing. Thanks Julien Cristau. Closes: #641637. * New package should fix python dependency. Closes: #649351. * Fix an unaligned-access problem which caused FTBFS on SPARC. Thanks once again Julien Cristau. Closes: #641488. -- Jon Dowland Mon, 05 Dec 2011 15:44:38 +0000 bup (0.24b-1.1) unstable; urgency=low * Non-maintainer upload. * Don't build with -Werror, to fix build failure (closes: #633145) -- Julien Cristau Sat, 20 Aug 2011 19:31:19 +0200 bup (0.24b-1) unstable; urgency=low * New upstream version. * bump standards version. -- Jon Dowland Fri, 08 Jul 2011 09:55:48 +0100 bup (0.22a-1) unstable; urgency=low * New upstream version. Closes: #610690. -- Jon Dowland Mon, 07 Feb 2011 22:40:44 +0000 bup (0.20-2) unstable; urgency=low * use python-support to tightly version python dependency, needed due to the binary extensions. Thanks Jakub Wilk. Closes: #608568. -- Jon Dowland Sun, 02 Jan 2011 20:17:40 +0000 bup (0.20-1) unstable; urgency=low * new upstream version. -- Jon Dowland Fri, 17 Dec 2010 23:52:43 +0000 bup (0.17b-2) unstable; urgency=low * add git as a build dependency. Closes: #595949 * bump standards version. -- Jon Dowland Tue, 07 Sep 2010 22:08:48 +0100 bup (0.17b-1) unstable; urgency=low * New upstream version. * document package VCS in control file -- Jon Dowland Tue, 07 Sep 2010 17:03:28 +0100 bup (0.14a-1) unstable; urgency=low * Initial release. Closes: #564600 -- Jon Dowland Thu, 01 Apr 2010 10:05:55 +0100 debian/compat0000644000000000000000000000000212253630301010357 0ustar 9 debian/control0000644000000000000000000000240412253630301010564 0ustar Source: bup Section: admin Priority: extra Maintainer: Robert S. Edmonds Build-Depends: debhelper (>= 9~), dctrl-tools, python-dev (>= 2.6.6-3~), python-pylibacl, python-pyxattr [linux-any], git, par2 [!hurd-i386], rsync Build-Depends-Indep: pandoc (>= 1.11.1-4~), pandoc-data (>= 1.11.1-4~) Standards-Version: 3.9.4 Homepage: https://github.com/bup/bup Vcs-Git: git://anonscm.debian.org/collab-maint/bup.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/bup.git;a=shortlog;h=refs/heads/debian Package: bup Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python, git, par2 [!hurd-i386], python-pylibacl, python-pyxattr [linux-any] Recommends: bup-doc, python-fuse, python-tornado Description: highly efficient file backup system based on git bup is a backup tool which stores the backups in a system based around the packfile format from git. Package: bup-doc Section: doc Architecture: all Depends: ${misc:Depends} Breaks: bup (<< 0.25~rc2-2~) Replaces: bup (<< 0.25~rc2-2~) Description: highly efficient file backup system based on git (documentation) bup is a backup tool which stores the backups in a system based around the packfile format from git. . This package contains the documentation. debian/copyright0000644000000000000000000000137212253630301011117 0ustar This work was packaged for Debian by: Jon Dowland on Thu, 01 Apr 2010 10:05:55 +0100 It was downloaded from: Upstream Authors: Rob Browning Avery Pennarun 'apenwarr' Copyright: Copyright © 2010 Rob Browning Copyright © 2010 Avery Pennarun Additional copyright holders: ./wvtestrun: Copyright © 2007-2009 Versabanq Innovations Inc. and contributors. License: GNU LGPL version 2 See "/usr/share/common-licenses/LGPL-2". The Debian packaging is: Copyright © 2010-2012 Jon Dowland Copyright © 2013 Robert S. Edmonds and is similarly licensed under the LGPL version 2, see "/usr/share/common-licenses/LGPL-2". debian/docs0000644000000000000000000000002112253630301010025 0ustar README README.md debian/gbp.conf0000644000000000000000000000020612253630301010576 0ustar [buildpackage] pristine-tar = False debian-branch = debian upstream-branch = master upstream-tree = branch upstream-tag = %(version)s debian/gen_version_py.sh0000755000000000000000000000031412253630301012544 0ustar #!/bin/sh VERSION="$(dpkg-parsechangelog | grep-dctrl -ensVersion -FSource .)" DATE="$(date '+%Y-%m-%d %H:%M:%S %z')" echo echo "COMMIT=''" echo "NAMES='(tag: bup-debian/$VERSION)'" echo "DATE='$DATE'" debian/rules0000755000000000000000000000060312253630301010240 0ustar #!/usr/bin/make -f %: dh $@ --with python2 override_dh_auto_configure: ./configure override_dh_auto_build-indep: $(MAKE) Documentation/all override_dh_install: rm -rf debian/tmp/usr/lib/bup/tornado dh_install override_dh_auto_clean: -rm config/config.cmd config/config.h config/config.log config/config.mak config/config.md config/config.sub config/config.vars dh_auto_clean debian/source/0000755000000000000000000000000012253630301010461 5ustar debian/source/format0000644000000000000000000000001412253630301011667 0ustar 3.0 (quilt) debian/source/options0000644000000000000000000000002412253630301012073 0ustar single-debian-patch debian/patches/0000755000000000000000000000000012253630347010622 5ustar debian/patches/debian-changes0000644000000000000000000000405112253630347013375 0ustar Description: TODO: Put a short summary on the line above and replace this paragraph with a longer explanation of this change. Complete the meta-information with other relevant fields (see below for details). To make it easier, the information below has been extracted from the changelog. Adjust it or drop it. . bup (0.25-1) unstable; urgency=medium . * New upstream release. Author: Robert S. Edmonds --- The information above should follow the Patch Tagging Guidelines, please checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here are templates for supplementary fields that you might want to add: Origin: , Bug: Bug-Debian: http://bugs.debian.org/ Bug-Ubuntu: https://launchpad.net/bugs/ Forwarded: Reviewed-By: Last-Update: --- bup-0.25.orig/Makefile +++ bup-0.25/Makefile @@ -1,5 +1,5 @@ OS:=$(shell uname | sed 's/[-_].*//') -CFLAGS := -Wall -O2 -Werror $(PYINCLUDE) $(CFLAGS) +CFLAGS := -Wall -O2 $(PYINCLUDE) $(CFLAGS) SOEXT:=.so ifeq ($(OS),CYGWIN) @@ -14,7 +14,7 @@ endif default: all -all: bup Documentation/all +all: bup t/configure-sampledata --setup bup: lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds @@ -80,7 +80,7 @@ lib/bup/_helpers$(SOEXT): \ .PHONY: lib/bup/_version.py lib/bup/_version.py: rm -f $@ $@.new - ./format-subst.pl $@.pre >$@.new + ./debian/gen_version_py.sh >$@.new mv $@.new $@ runtests: all runtests-python runtests-cmdline --- bup-0.25.orig/lib/bup/_version.py.pre +++ bup-0.25/lib/bup/_version.py.pre @@ -1,4 +1,4 @@ -COMMIT='5a7fd007e89bb343ab2024d9a87d54bbee997bbf' -NAMES=' (tag: 0.25-rc5, tag: 0.25, upstream/master, origin/master, origin/HEAD, master)' -DATE='2013-12-09 19:30:45 -0600' +COMMIT='addebf92d2c56924d0ab77eaba0e51006ae1f59e' +NAMES=' (HEAD, tag: debian/0.25-1, debian)' +DATE='2013-12-16 11:56:33 -0500' debian/patches/series0000644000000000000000000000001712253630347012035 0ustar debian-changes