From fee78fd45504aa675d8913a9e35c562501080aee Mon Sep 17 00:00:00 2001 From: kink-guest Date: Thu, 2 Jun 2005 23:27:45 +0000 Subject: [PATCH] Merge packages. git-svn-id: svn://svn.debian.org/pgp-tools/trunk@47 b513b33f-fedd-0310-b452-c3deb5f4c849 --- debian/copyright | 19 +++++++++++++++++++ debian/install | 2 ++ debian/rules | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index 623d451..34d5157 100644 --- a/debian/copyright +++ b/debian/copyright @@ -11,6 +11,8 @@ Authors and Copyright: (c) 2004, 2005 Peter Palfrader (c) 2004 Uli Martens (c) 2004, 2005 Christoph Berg + (c) 2001-2005 Simon Richter + (c) 2005 Thijs Kinkhorst Other contributors: Enrico Zini Benjamin Hill @@ -40,3 +42,20 @@ License for caff and gpgsigs: (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Licence for gpg-key2ps and gpg-mailkeys: + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License with + the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; + if not, write to the Free Software Foundation, Inc., 59 Temple Place, + Suite 330, Boston, MA 02111-1307 USA diff --git a/debian/install b/debian/install index 558d90f..bad1212 100644 --- a/debian/install +++ b/debian/install @@ -2,3 +2,5 @@ caff/caff usr/bin caff/pgp-clean usr/bin caff/caffrc.sample usr/share/doc/pgp-tools/examples gpgsigs/gpgsigs usr/bin +gpg-key2ps/gpg-key2ps usr/bin +gpg-mailkeys/gpg-mailkeys usr/bin diff --git a/debian/rules b/debian/rules index 92a87ae..aac01e5 100755 --- a/debian/rules +++ b/debian/rules @@ -26,7 +26,7 @@ install: build dh_clean -k dh_installdirs dh_install - dh_installman caff/*.1 gpgsigs/gpgsigs.1 + dh_installman caff/*.1 gpgsigs/gpgsigs.1 gpg-key2ps/gpg-key2ps.1 gpg-mailkeys/gpg-mailkeys.1 binary-indep: build install dh_testdir -- 2.30.2