cease producing .debs for dapper, since they'd depend upon a library (simplejson...

diff --git a/Makefile b/Makefile
index 49956c4831a0813aa09f3cc241dffdfa6aaab338..8491f072d65421a053402d724ece9c6159082e9e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -217,10 +217,8 @@ show-version:
        @echo $(VER)
 
 .PHONY: setup-deb deb-ARCH is-known-debian-arch
-.PHONY: deb-dapper deb-sid deb-feisty deb-edgy deb-etch
+.PHONY: deb-sid deb-feisty deb-edgy deb-etch
 
-deb-dapper:
-       $(MAKE) deb-ARCH ARCH=dapper
 deb-sid:
        $(MAKE) deb-ARCH ARCH=sid
 deb-feisty:
@@ -233,7 +231,7 @@ deb-etch:
        $(MAKE) deb-ARCH ARCH=etch FOOLSCAP_ARCH=sid TAHOE_ARCH=feisty
 
 # we know how to handle the following debian architectures
-KNOWN_DEBIAN_ARCHES := dapper sid feisty edgy etch
+KNOWN_DEBIAN_ARCHES := sid feisty edgy etch
 
 ifeq ($(findstring x-$(ARCH)-x,$(foreach arch,$(KNOWN_DEBIAN_ARCHES),"x-$(arch)-x")),)
 is-known-debian-arch:
@@ -274,7 +272,7 @@ deb-ARCH: is-known-debian-arch setup-deb
        echo "The newly built .deb packages are in the parent directory from here."
 
 .PHONY: increment-deb-version
-.PHONY: deb-dapper-head deb-sid-head deb-edgy-head deb-feisty-head
+.PHONY: deb-sid-head deb-edgy-head deb-feisty-head
 .PHONY: deb-etch-head
 
 # The buildbot runs the following targets after each change, to produce
@@ -283,10 +281,6 @@ deb-ARCH: is-known-debian-arch setup-deb
 
 increment-deb-version: make-version
        debchange --newversion $(VER) $(DEBCOMMENTS)
-deb-dapper-head:
-       $(MAKE) setup-deb ARCH=dapper
-       $(MAKE) increment-deb-version
-       fakeroot debian/rules binary
 deb-sid-head:
        $(MAKE) setup-deb ARCH=sid
        $(MAKE) increment-deb-version

diff --git a/misc/dapper/debian/changelog b/misc/dapper/debian/changelog
deleted file mode 100644 (file)
index 9f4e959..0000000
--- a/misc/dapper/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-allmydata-tahoe (0.0.1) unstable; urgency=low
-
-  * experimental packaging
-
- -- Brian Warner <warner@allmydata.com>  Mon,  4 Dec 2006 23:34:07 -0800

diff --git a/misc/dapper/debian/compat b/misc/dapper/debian/compat
deleted file mode 100644 (file)
index b8626c4..0000000
--- a/misc/dapper/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-4

diff --git a/misc/dapper/debian/control b/misc/dapper/debian/control
deleted file mode 100644 (file)
index eda79bb..0000000
--- a/misc/dapper/debian/control
+++ /dev/null
@@ -1,12 +0,0 @@
-Source: allmydata-tahoe
-Section: python
-Priority: optional
-Maintainer: Brian Warner <warner@allmydata.com>
-Build-Depends: debhelper (>> 4.1.68), python2.4-dev, python2.4-twisted, cdbs
-Standards-Version: 3.7.2
-
-Package: allmydata-tahoe
-Architecture: all
-Depends: python (>= 2.4), python (<< 2.5), python2.4-foolscap, python-twisted, python-nevow, python-pyopenssl, python-simplejson
-Description: A secure distributed filestore
- Allmydata (tahoe2)

diff --git a/misc/dapper/debian/copyright b/misc/dapper/debian/copyright
deleted file mode 100644 (file)
index 98242b3..0000000
--- a/misc/dapper/debian/copyright
+++ /dev/null
@@ -1,15 +0,0 @@
-This package was debianized by Brian Warner <warner@allmydata.com>
-
-The upstream source of this project is http://allmydata.org .
-
-Copyright (c) 2006-2007
-AllMyData, Inc.
-
-This package is licensed under the GPL (v2), with additional rights. For a
-description of the GPL v2, see /usr/share/common-licenses/GPL-2 on your
-Debian system.
-
-It also comes with the added permission that, in the case that you are
-obligated to release a derived work under this licence (as per section 2.b of
-the GPLv2), you may delay the fulfillment of this obligation for up to 12
-months.

diff --git a/misc/dapper/debian/rules b/misc/dapper/debian/rules
deleted file mode 100644 (file)
index 9f74003..0000000
--- a/misc/dapper/debian/rules
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This is the debhelper compatability version to use.
-export DH_COMPAT=4
-
-PREFIX=$(shell pwd)/debian/allmydata-tahoe/usr
-
-build: build-stamp
-build-stamp:
-       dh_testdir
-
-       ## Build for all python versions
-       python2.4 setup.py build
-
-       touch build-stamp
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp
-       rm -rf build
-       find . -name '*.pyc' |xargs -r rm
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-
-       cd src/zfec && python2.4 setup.py install --single-version-externally-managed --root=$(PREFIX)/..
-       cd src/Crypto && python2.4 setup.py install --prefix=$(PREFIX)
-       python2.4 setup.py install --prefix=$(PREFIX)
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-       dh_testdir
-       dh_testroot
-       dh_installdocs -i
-       dh_installchangelogs -i
-       dh_compress -i -X.py
-       dh_fixperms
-       dh_python
-       dh_installdeb
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary-arch:
-# nothing to do
-
-binary: binary-indep
-.PHONY: build clean binary-indep binary-arch binary install
-
-
-