diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 49 | ||||
| -rw-r--r-- | debian/control | 11 | ||||
| -rw-r--r-- | debian/copyright | 17 | ||||
| -rw-r--r-- | debian/docs | 1 | ||||
| -rw-r--r-- | debian/gbp.conf | 20 | ||||
| -rw-r--r-- | debian/links | 1 | ||||
| -rw-r--r-- | debian/patches/0001-Debianise-README.patch | 24 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/source/format | 1 | ||||
| -rw-r--r-- | debian/source/lintian-overrides | 2 |
10 files changed, 114 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog index d7e6620..880d7c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,46 @@ +git-remote-gcrypt (1.0.0-1) unstable; urgency=medium + + Upstream: + * Taking over as upstream maintainer. + * Remove notice about repository format potentially changing. + * Implement gcrypt.gpg-args git config setting (Closes: #771011). + * Respect git config gpg.program if configured. + Thanks Christian Amsüss. (Closes: #827943) + * Don't reset the remote ID when a gcrypt remote is not available. + Thanks Sebastian Reuße. (Closes: #827943) + * Suppress bogus warning about keyid matching multiple fingerprints. + Based on work by Raphaël Droz. + Closes https://github.com/joeyh/git-remote-gcrypt/pull/2 + * Add "Note to users of GnuPG version 2" section to README.rst. + See https://github.com/joeyh/git-remote-gcrypt/pull/1 + + Debian packaging: + * Drop patch containing changes by Joey Hess: incorporated in release. + - Update d/copyright accordingly. + * Patch README.rst to remove references to installation. + * Add d/links to avoid duplicate changelogs Lintian warning. + * Drop Lintian override of no-upstream-changelog. + * Update URIs in old changelog entries. + * Add a comment to d/source/lintian-overrides. + * Bump standards version to 3.9.8 (no changes required). + + -- Sean Whitton <spwhitton@spwhitton.name> Mon, 04 Jul 2016 19:18:48 +0900 + +git-remote-gcrypt (0.20130908-8) unstable; urgency=medium + + * Adopt git-remote-gcrypt package (Closes: #771020). + * Install man page using rst2man, rather than just installing README.rst + (Closes: #725455). + * Add Vcs-Git: & Vcs-Browser: pointing at my repository. + * Switch dpkg-source format to 3.0 (quilt). + * Move changes by Joey Hess into a quilt patch. + Update debian/copyright accordingly. + * Bump Standards-Version. + * Add debian/gbp.conf. + * Override Lintian tags no-upstream-changelog & debian-watch-file-is-missing. + + -- Sean Whitton <spwhitton@spwhitton.name> Thu, 07 Jan 2016 11:03:01 -0700 + git-remote-gcrypt (0.20130908-7) unstable; urgency=medium * Added gcrypt.publish-participants configuration setting. @@ -16,10 +59,10 @@ git-remote-gcrypt (0.20130908-6) unstable; urgency=medium git-remote-gcrypt (0.20130908-5) unstable; urgency=low * Better signature validation for subkeys. - Closes https://github.com/blake2-ppc/git-remote-gcrypt/pull/7 + Closes https://github.com/bluss/git-remote-gcrypt/pull/7 * Stop passing --fast-list to gpg as this sometimes causes it to not display key fingerprints, which git-remote-gcrpyt needs. - Closes https://github.com/blake2-ppc/git-remote-gcrypt/issues/8 + Closes https://github.com/bluss/git-remote-gcrypt/issues/8 -- Joey Hess <joeyh@debian.org> Thu, 26 Sep 2013 15:58:52 -0400 @@ -39,7 +82,7 @@ git-remote-gcrypt (0.20130908-2) unstable; urgency=low * Set --trust-model=always when encrypting. Needed to interoperate with git-annex. - Closes https://github.com/blake2-ppc/git-remote-gcrypt/issues/3 + Closes https://github.com/bluss/git-remote-gcrypt/issues/3 -- Joey Hess <joeyh@debian.org> Mon, 16 Sep 2013 15:49:16 -0400 diff --git a/debian/control b/debian/control index e3ec704..6e1410b 100644 --- a/debian/control +++ b/debian/control @@ -1,14 +1,15 @@ Source: git-remote-gcrypt Section: vcs Priority: optional -Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.9.0) -Maintainer: Joey Hess <joeyh@debian.org> -Standards-Version: 3.9.4 -Homepage: https://github.com/blake2-ppc/git-remote-gcrypt +Build-Depends: debhelper (>= 9), python-docutils (>= 0.12+dfsg) +Maintainer: Sean Whitton <spwhitton@spwhitton.name> +Standards-Version: 3.9.8 +Homepage: https://github.com/bluss/git-remote-gcrypt +Vcs-Git: https://git.spwhitton.name/git-remote-gcrypt +Vcs-Browser: https://git.spwhitton.name/?p=git-remote-gcrypt.git;a=summary Package: git-remote-gcrypt Architecture: all -Section: vcs Depends: git, gnupg | gnupg2, ${misc:Depends} Recommends: rsync, curl Description: encrypted git repositories diff --git a/debian/copyright b/debian/copyright index 03bf18a..c5497b4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,8 +1,17 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Source: https://github.com/blake2-ppc/git-remote-gcrypt +Source: https://git.spwhitton.name/git-remote-gcrypt Files: * -Copyright: 2013 by engla +Copyright: (C) 2013 engla + (C) 2013, 2014 Joey Hess <id@joeyh.name> + (C) 2016 Sean Whitton and contributors License: GPL-2+ - On Debian systems, the complete text of the GPL can be found in - /usr/share/common-licenses/GPL. + +Files: debian/* +Copyright: (C) 2015-2016 Sean Whitton <spwhitton@spwhitton.name> + (C) 2013, 2014 Joey Hess <id@joeyh.name> +License: GPL-2+ + +License: GPL-2+ + On Debian systems, the complete text of the GPL-2 can be found in + /usr/share/common-licenses/GPL-2. diff --git a/debian/docs b/debian/docs deleted file mode 100644 index a1320b1..0000000 --- a/debian/docs +++ /dev/null @@ -1 +0,0 @@ -README.rst diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..ff9c2ec --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,20 @@ +[DEFAULT] + +# Debian package maintainer is upstream project maintainer, so +# everything lives on the master branch (from ver. 1.0.0-1 onwards) +upstream-branch = master +debian-branch = master +# However, separate tags (e.g. one commit tagged both 1.0.0 and +# debian/1.0.0-1) because git-remote-gcrypt is meant to be usable +# outside of Debian +upstream-tag = %(version)s +debian-tag = debian/%(version)s + +# Some standard gbp settings +sign-tags = True +pristine-tar = True +pristine-tar-commit = True + +color = on +compression = xz +compression-level = 9 diff --git a/debian/links b/debian/links new file mode 100644 index 0000000..d61fdf7 --- /dev/null +++ b/debian/links @@ -0,0 +1 @@ +/usr/share/doc/git-remote-gcrypt/changelog /usr/share/doc/git-remote-gcrypt/changelog.Debian diff --git a/debian/patches/0001-Debianise-README.patch b/debian/patches/0001-Debianise-README.patch new file mode 100644 index 0000000..e011664 --- /dev/null +++ b/debian/patches/0001-Debianise-README.patch @@ -0,0 +1,24 @@ +From: Sean Whitton <spwhitton@spwhitton.name> +Date: Sun, 17 Jan 2016 22:47:52 -0700 +Subject: Debianise-README + +Remove reference to installation. +--- + README.rst | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/README.rst b/README.rst +index 148abad..19a9d9d 100644 +--- a/README.rst ++++ b/README.rst +@@ -27,9 +27,7 @@ PLEASE help us evaluate how well we meet this design goal! + Quickstart + .......... + +-* Install ``git-remote-gcrypt`` by running the supplied ``install.sh`` script. +- +-* Create an encrypted remote by pushing to it:: ++Create an encrypted remote by pushing to it:: + + git remote add cryptremote gcrypt::rsync://example.com:repo + git push cryptremote master diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..93971b0 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Debianise-README.patch 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/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 0000000..43e41b2 --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1,2 @@ +# upstream maintainer is Debian maintainer +debian-watch-file-is-missing |