[Pgp-tools-commit] r47 - trunk/debian

[Thijs Kinkhorst]

Author: kink-guest
Date: 2005-06-02 23:27:45 +0000 (Thu, 02 Jun 2005)
New Revision: 47

Modified:
   trunk/debian/copyright
   trunk/debian/install
   trunk/debian/rules
Log:
Merge packages.


Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright	2005-06-02 23:21:25 UTC (rev 46)
+++ trunk/debian/copyright	2005-06-02 23:27:45 UTC (rev 47)
@@ -11,6 +11,8 @@
   (c) 2004, 2005 Peter Palfrader <peter at palfrader.org>
   (c) 2004 Uli Martens <uli at youam.net>
   (c) 2004, 2005 Christoph Berg <cb at df7cb.de>
+  (c) 2001-2005  Simon Richter <sjr at debian.org>
+  (c) 2005  Thijs Kinkhorst <kink at squirrelmail.org>
   Other contributors:
   Enrico Zini
   Benjamin Hill
@@ -40,3 +42,20 @@
   (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

Modified: trunk/debian/install
===================================================================
--- trunk/debian/install	2005-06-02 23:21:25 UTC (rev 46)
+++ trunk/debian/install	2005-06-02 23:27:45 UTC (rev 47)
@@ -2,3 +2,5 @@
 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

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2005-06-02 23:21:25 UTC (rev 46)
+++ trunk/debian/rules	2005-06-02 23:27:45 UTC (rev 47)
@@ -26,7 +26,7 @@
 	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