From 2fa2cffba66c400189eaf50d95cfda9b0f516f39 Mon Sep 17 00:00:00 2001 From: Andrew Ayer Date: Tue, 27 Jan 2015 21:36:55 -0800 Subject: [PATCH] Freshen Debian packaging --- debian/control | 3 ++- debian/copyright | 2 +- debian/gbp.conf | 3 ++- debian/rules | 9 --------- debian/source/format | 1 + debian/source/options | 1 + debian/source/patch-header | 17 +++++++++++++++++ 7 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 debian/source/format create mode 100644 debian/source/options create mode 100644 debian/source/patch-header diff --git a/debian/control b/debian/control index af323a5..09fbb29 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,14 @@ Maintainer: Andrew Ayer Section: vcs Priority: optional Standards-Version: 3.9.4 -Build-Depends: debhelper (>= 9), make (>= 3.81-5), libc6-dev (>= 2.7-18), gcc (>= 4:4.3.2-2), coreutils (>= 6.10-6), libssl-dev (>= 0.9.8o-4) +Build-Depends: debhelper (>= 9), libssl-dev Vcs-Git: https://www.agwa.name/git/git-crypt.git -b debian Homepage: https://www.agwa.name/projects/git-crypt Package: git-crypt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, git (>= 1.7.2) +Recommends: gnupg Enhances: git Description: Transparent file encryption in git git-crypt enables transparent encryption and decryption of files in a diff --git a/debian/copyright b/debian/copyright index 0e08e90..3a07838 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: git-crypt -Source: https://github.com/AGWA/git-crypt +Source: https://www.agwa.name/projects/git-crypt Files: * Copyright: Copyright 2014 Andrew Ayer diff --git a/debian/gbp.conf b/debian/gbp.conf index 5f78644..f880220 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,4 +1,5 @@ [DEFAULT] +pristine-tar = True +pristine-tar-commit = True debian-branch = debian upstream-tag = %(version)s - diff --git a/debian/rules b/debian/rules index 1f61dae..0184cf9 100755 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,4 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 %: dh $@ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..7423a2d --- /dev/null +++ b/debian/source/options @@ -0,0 +1 @@ +single-debian-patch diff --git a/debian/source/patch-header b/debian/source/patch-header new file mode 100644 index 0000000..d20d141 --- /dev/null +++ b/debian/source/patch-header @@ -0,0 +1,17 @@ +Subject: Collected Debian patches for git-crypt +Author: Andrew Ayer + +Since I am also upstream for this package, there will normally not be +any patches to apply to the upstream source. However, occasionally +I'll pull up specific upstream commits prior to making an upstream +release. When this happens, this patch will collect all of those +modifications. + +I use Git to maintain both the upstream source and the Debian +packages, and generating individual patches rather than using git +cherry-pick takes extra work for no gain. Since I'm also upstream, +there's no need to separate the patches for later upstream submission. +Hence, I take this approach with a unified patch when it's necessary. + +For full commit history and separated commits, see the upstream Git +repository.