diff options
| -rw-r--r-- | COPYING | 6 | ||||
| -rwxr-xr-x | Makefile | 4 | ||||
| l--------- | changelog | 1 | ||||
| -rw-r--r-- | packaging/debian/changelog (renamed from debian/changelog) | 8 | ||||
| -rw-r--r-- | packaging/debian/compat (renamed from debian/compat) | 0 | ||||
| -rw-r--r-- | packaging/debian/control (renamed from debian/control) | 0 | ||||
| -rw-r--r-- | packaging/debian/copyright (renamed from debian/copyright) | 0 | ||||
| -rw-r--r-- | packaging/debian/monkeysphere.dirs (renamed from debian/monkeysphere.dirs) | 0 | ||||
| -rwxr-xr-x | packaging/debian/monkeysphere.postinst (renamed from debian/monkeysphere.postinst) | 7 | ||||
| -rwxr-xr-x | packaging/debian/monkeysphere.postrm (renamed from debian/monkeysphere.postrm) | 0 | ||||
| -rwxr-xr-x | packaging/debian/monkeysphere.preinst (renamed from debian/monkeysphere.preinst) | 7 | ||||
| -rwxr-xr-x | packaging/debian/monkeysphere.prerm | 18 | ||||
| -rwxr-xr-x | packaging/debian/rules (renamed from debian/rules) | 0 |
13 files changed, 46 insertions, 5 deletions
@@ -1,4 +1,4 @@ -MonkeySphere is a system to use the OpenPGP web-of-trust to +Monkeysphere is a system to use the OpenPGP web-of-trust to authenticate and encrypt ssh connections. It is free software, developed by: @@ -12,12 +12,12 @@ It is free software, developed by: Ross Glover <ross@ross.mayfirst.org> Greg Lyle <greg@stealthisemail.com> -MonkeySphere is distributed in the hope that it will be useful, but +Monkeysphere 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. -MonkeySphere Copyright 2007, and are all released under the GPL, +Monkeysphere Copyright 2007, and are all released under the GPL, version 3 or later. @@ -5,7 +5,7 @@ # (c) 2008 Daniel Kahn Gillmor <dkg@fifthhorseman.net> # Licensed under GPL v3 or later -MONKEYSPHERE_VERSION = `head -n1 debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/'` +MONKEYSPHERE_VERSION = `head -n1 packaging/debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/'` # these defaults are for debian. porters should probably adjust them # before calling make install @@ -29,7 +29,7 @@ tarball: clean debian-package: tarball tar xzf monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz - cp -a debian monkeysphere-$(MONKEYSPHERE_VERSION) + cp -a packaging/debian monkeysphere-$(MONKEYSPHERE_VERSION) (cd monkeysphere-$(MONKEYSPHERE_VERSION) && debuild -uc -us) rm -rf monkeysphere-$(MONKEYSPHERE_VERSION) diff --git a/changelog b/changelog new file mode 120000 index 0000000..b9a9e21 --- /dev/null +++ b/changelog @@ -0,0 +1 @@ +website/changelog
\ No newline at end of file diff --git a/debian/changelog b/packaging/debian/changelog index 6988e89..8c42032 100644 --- a/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,11 @@ +monkeysphere (0.21-1) unstable; urgency=low + + * move debian packaging to packaging subdirectory. + * add debian prerm script, and add debhelper lines to other install + scripts. + + -- Jameson Graef Rollins <jrollins@finestructure.net> Sat, 15 Nov 2008 15:48:54 -0500 + monkeysphere (0.20-1) unstable; urgency=low [ Daniel Kahn Gillmor ] diff --git a/debian/compat b/packaging/debian/compat index 7f8f011..7f8f011 100644 --- a/debian/compat +++ b/packaging/debian/compat diff --git a/debian/control b/packaging/debian/control index 4c836b4..4c836b4 100644 --- a/debian/control +++ b/packaging/debian/control diff --git a/debian/copyright b/packaging/debian/copyright index 4c25286..4c25286 100644 --- a/debian/copyright +++ b/packaging/debian/copyright diff --git a/debian/monkeysphere.dirs b/packaging/debian/monkeysphere.dirs index 1f9e66b..1f9e66b 100644 --- a/debian/monkeysphere.dirs +++ b/packaging/debian/monkeysphere.dirs diff --git a/debian/monkeysphere.postinst b/packaging/debian/monkeysphere.postinst index 02d6304..8f1fe77 100755 --- a/debian/monkeysphere.postinst +++ b/packaging/debian/monkeysphere.postinst @@ -26,3 +26,10 @@ ln -sTf "$ETC"/gnupg-host.conf "$VARLIB"/gnupg-host/gpg.conf install --owner monkeysphere --group monkeysphere --mode 700 -d "$VARLIB"/gnupg-authentication # link in the gpg.conf ln -sTf "$ETC"/gnupg-authentication.conf "$VARLIB"/gnupg-authentication/gpg.conf + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/monkeysphere.postrm b/packaging/debian/monkeysphere.postrm index 8f87ed3..8f87ed3 100755 --- a/debian/monkeysphere.postrm +++ b/packaging/debian/monkeysphere.postrm diff --git a/debian/monkeysphere.preinst b/packaging/debian/monkeysphere.preinst index 860286b..528da84 100755 --- a/debian/monkeysphere.preinst +++ b/packaging/debian/monkeysphere.preinst @@ -20,3 +20,10 @@ if [ -f "$VARLIB"/gnupg-authentication/gpg.conf -a ! -L "$VARLIB"/gnupg-authenti chown root:root "$ETC"/gpg-authentication.conf ln -s "$ETC"/gpg-authentication.conf "$VARLIB"/gnupg-authentication/gpg.conf fi + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/packaging/debian/monkeysphere.prerm b/packaging/debian/monkeysphere.prerm new file mode 100755 index 0000000..433a0aa --- /dev/null +++ b/packaging/debian/monkeysphere.prerm @@ -0,0 +1,18 @@ +#!/bin/sh -e + +# prerm script for monkeysphere + +# Author: Jameson Rollins <jrollins@fifthhorseman.net> +# Copyright 2008 + +VARLIB="/var/lib/monkeysphere" + +rm -f "$VARLIB"/gnupg-host/gpg.conf +rm -f "$VARLIB"/gnupg-authentication/gpg.conf + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/rules b/packaging/debian/rules index cbe925d..cbe925d 100755 --- a/debian/rules +++ b/packaging/debian/rules |