From f741d1aded19f9402499c200803b48624f927c81 Mon Sep 17 00:00:00 2001 From: Andrew Ayer Date: Sat, 30 May 2015 20:22:29 -0700 Subject: [PATCH] Update Debian packaging for 0.5.0-1 --- debian/changelog | 13 +++---------- debian/control | 4 ++-- debian/copyright | 32 +++++++++++++++++++++++++++++++- debian/git-crypt.install | 1 - debian/rules | 5 +++-- 5 files changed, 39 insertions(+), 16 deletions(-) delete mode 100644 debian/git-crypt.install diff --git a/debian/changelog b/debian/changelog index a24e0ac..e297313 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,5 @@ -git-crypt (0.4.2-1~agwa1) unstable; urgency=low +git-crypt (0.5.0-1) unstable; urgency=medium - * New upstream release. - * Various packaging improvements. + * Initial release. (Closes: #785346) - -- Andrew Ayer Sat, 31 Jan 2015 19:43:06 -0800 - -git-crypt (0.3-1) unstable; urgency=low - - * Initial release. - - -- Andrew Ayer Sat, 29 Mar 2014 12:38:14 -0700 + -- Andrew Ayer Sat, 30 May 2015 20:22:22 -0700 diff --git a/debian/control b/debian/control index 09fbb29..71d6959 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: git-crypt Maintainer: Andrew Ayer Section: vcs Priority: optional -Standards-Version: 3.9.4 -Build-Depends: debhelper (>= 9), libssl-dev +Standards-Version: 3.9.6 +Build-Depends: debhelper (>= 9), libssl-dev, xsltproc, docbook-xml, docbook-xsl Vcs-Git: https://www.agwa.name/git/git-crypt.git -b debian Homepage: https://www.agwa.name/projects/git-crypt diff --git a/debian/copyright b/debian/copyright index 3a07838..437cea7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,13 @@ Upstream-Name: git-crypt Source: https://www.agwa.name/projects/git-crypt Files: * -Copyright: Copyright 2014 Andrew Ayer +Copyright: Copyright 2012-2015 Andrew Ayer +License: GPL-3+ with OpenSSL exception + +Files: fhstream.cpp fhstream.hpp parse_options.cpp parse_options.hpp +Copyright: Copyright 2012, 2014, 2015 Andrew Ayer +License: X11 + License: GPL-3+ with OpenSSL exception git-crypt is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,3 +38,27 @@ License: GPL-3+ with OpenSSL exception Corresponding Source for a non-source form of such a combination shall include the source code for the parts of OpenSSL used as well as that of the covered work. + +License: X11 + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + . + Except as contained in this notice, the name(s) of the above copyright + holders shall not be used in advertising or otherwise to promote the + sale, use or other dealings in this Software without prior written + authorization. diff --git a/debian/git-crypt.install b/debian/git-crypt.install deleted file mode 100644 index 4ba3722..0000000 --- a/debian/git-crypt.install +++ /dev/null @@ -1 +0,0 @@ -git-crypt usr/bin diff --git a/debian/rules b/debian/rules index 0184cf9..19ee44f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,7 @@ #!/usr/bin/make -f +export PREFIX=/usr +export ENABLE_MAN=yes + %: dh $@ - -override_dh_auto_install: