From 3726f3dd674e74258c5f47b00f3f6f15f4037175 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sat, 15 Nov 2008 14:43:22 -0500 Subject: [PATCH 1/1] move debian packaging to the packaging/ subdirectory. --- COPYING | 6 +++--- Makefile | 4 ++-- changelog | 1 + packaging/debian/changelog | 1 + {debian => packaging/debian}/compat | 0 {debian => packaging/debian}/control | 0 {debian => packaging/debian}/copyright | 0 {debian => packaging/debian}/monkeysphere.dirs | 0 .../debian}/monkeysphere.postinst | 0 .../debian}/monkeysphere.postrm | 0 .../debian}/monkeysphere.preinst | 0 {debian => packaging/debian}/rules | 0 {debian => website}/changelog | 6 ++++++ website/news/release-0.20-1.mdwn | 18 ++++++++++++++++++ 14 files changed, 31 insertions(+), 5 deletions(-) create mode 120000 changelog create mode 120000 packaging/debian/changelog rename {debian => packaging/debian}/compat (100%) rename {debian => packaging/debian}/control (100%) rename {debian => packaging/debian}/copyright (100%) rename {debian => packaging/debian}/monkeysphere.dirs (100%) rename {debian => packaging/debian}/monkeysphere.postinst (100%) rename {debian => packaging/debian}/monkeysphere.postrm (100%) rename {debian => packaging/debian}/monkeysphere.preinst (100%) rename {debian => packaging/debian}/rules (100%) rename {debian => website}/changelog (98%) create mode 100644 website/news/release-0.20-1.mdwn diff --git a/COPYING b/COPYING index fefe9ab..070c992 100644 --- a/COPYING +++ b/COPYING @@ -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 Greg Lyle -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. diff --git a/Makefile b/Makefile index 7db645a..7493b1f 100755 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ # (c) 2008 Daniel Kahn Gillmor # 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/packaging/debian/changelog b/packaging/debian/changelog new file mode 120000 index 0000000..d9956db --- /dev/null +++ b/packaging/debian/changelog @@ -0,0 +1 @@ +../../website/changelog \ No newline at end of file diff --git a/debian/compat b/packaging/debian/compat similarity index 100% rename from debian/compat rename to packaging/debian/compat diff --git a/debian/control b/packaging/debian/control similarity index 100% rename from debian/control rename to packaging/debian/control diff --git a/debian/copyright b/packaging/debian/copyright similarity index 100% rename from debian/copyright rename to packaging/debian/copyright diff --git a/debian/monkeysphere.dirs b/packaging/debian/monkeysphere.dirs similarity index 100% rename from debian/monkeysphere.dirs rename to packaging/debian/monkeysphere.dirs diff --git a/debian/monkeysphere.postinst b/packaging/debian/monkeysphere.postinst similarity index 100% rename from debian/monkeysphere.postinst rename to packaging/debian/monkeysphere.postinst diff --git a/debian/monkeysphere.postrm b/packaging/debian/monkeysphere.postrm similarity index 100% rename from debian/monkeysphere.postrm rename to packaging/debian/monkeysphere.postrm diff --git a/debian/monkeysphere.preinst b/packaging/debian/monkeysphere.preinst similarity index 100% rename from debian/monkeysphere.preinst rename to packaging/debian/monkeysphere.preinst diff --git a/debian/rules b/packaging/debian/rules similarity index 100% rename from debian/rules rename to packaging/debian/rules diff --git a/debian/changelog b/website/changelog similarity index 98% rename from debian/changelog rename to website/changelog index 6988e89..994b991 100644 --- a/debian/changelog +++ b/website/changelog @@ -1,3 +1,9 @@ +monkeysphere (0.21-1) unstable; urgency=low + + * move debian packaging to packaging subdirectory. + + -- Jameson Graef Rollins Sat, 15 Nov 2008 14:26:48 -0500 + monkeysphere (0.20-1) unstable; urgency=low [ Daniel Kahn Gillmor ] diff --git a/website/news/release-0.20-1.mdwn b/website/news/release-0.20-1.mdwn new file mode 100644 index 0000000..841369d --- /dev/null +++ b/website/news/release-0.20-1.mdwn @@ -0,0 +1,18 @@ +[[meta title="Monkeysphere 0.20-1 released!"]] + +Monkeysphere 0.20-1 has been released. + +Notes from the changelog: + +
+  [ Daniel Kahn Gillmor ]
+  * ensure that tempdirs are properly created, bail out otherwise instead
+    of stumbling ahead.
+  * minor fussing with the test script to make it cleaner.
+
+  [ Jameson Graef Rollins ]
+  * clean up Makefile to generate more elegant source tarballs.
+  * make myself the maintainer.
+
+ +[[Download]] it now! -- 2.25.1