Merge packages.

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@47 b513b33f-fedd-0310-b452-c3deb5f4c849

diff --git a/debian/copyright b/debian/copyright
index 623d451ea7a4d6050c3ddce7e4f3b80c179e1176..34d5157cbc822079b8c232b619b210dded67e04f 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,6 +11,8 @@ Authors and Copyright:
   (c) 2004, 2005 Peter Palfrader <peter@palfrader.org>
   (c) 2004 Uli Martens <uli@youam.net>
   (c) 2004, 2005 Christoph Berg <cb@df7cb.de>
+  (c) 2001-2005  Simon Richter <sjr@debian.org>
+  (c) 2005  Thijs Kinkhorst <kink@squirrelmail.org>
   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 558d90f58f5b061764096b03c90b80b8b11c9516..bad121232981da4f03e9d33e7604a6eb0aa8c55c 100644 (file)
--- 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 92a87aed8537e5fef1da552aaba5c4e0f3d6d5ac..aac01e54373710831818f17949504442d0c40cb2 100755 (executable)
--- 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