move debian files down into misc/

diff --git a/GNUmakefile b/GNUmakefile
index 2749bcc473f243644bf64e2b426a12ccd9427a7b..fa6d640dfe1f27a6231269d9a76e582ed1c0da41 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -213,33 +213,33 @@ show-version:
 .PHONY: deb-dapper deb-sid deb-edgy deb-feisty deb-etch
 .PHONY: increment-deb-version
 .PHONY: deb-dapper-head deb-sid-head deb-edgy-head deb-feisty-head
-.PHONY:  deb-etch-head
+.PHONY: deb-etch-head
 
 setup-dapper:
        rm -f debian
-       ln -s dapper/debian debian
+       ln -s misc/dapper/debian debian
        chmod a+x debian/rules
 
 setup-sid:
        rm -f debian
-       ln -s sid/debian debian
+       ln -s misc/sid/debian debian
        chmod a+x debian/rules
 
 # edgy uses the feisty control files for now
 setup-edgy:
        rm -f debian
-       ln -s feisty/debian debian
+       ln -s misc/feisty/debian debian
        chmod a+x debian/rules
 
 setup-feisty:
        rm -f debian
-       ln -s feisty/debian debian
+       ln -s misc/feisty/debian debian
        chmod a+x debian/rules
 
 # etch uses the fesity control files for now
 setup-etch:
        rm -f debian
-       ln -s feisty/debian debian
+       ln -s misc/feisty/debian debian
        chmod a+x debian/rules
 
 

diff --git a/dapper/debian/changelog b/dapper/debian/changelog
deleted file mode 100644 (file)
index 9f4e959..0000000
--- a/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/dapper/debian/compat b/dapper/debian/compat
deleted file mode 100644 (file)
index b8626c4..0000000
--- a/dapper/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-4

diff --git a/dapper/debian/control b/dapper/debian/control
deleted file mode 100644 (file)
index a2762dd..0000000
--- a/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
-Description: A secure distributed filestore
- Allmydata (tahoe2)

diff --git a/dapper/debian/copyright b/dapper/debian/copyright
deleted file mode 100644 (file)
index 98242b3..0000000
--- a/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/dapper/debian/rules b/dapper/debian/rules
deleted file mode 100644 (file)
index 9f74003..0000000
--- a/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
-
-
-

diff --git a/feisty/debian/changelog b/feisty/debian/changelog
deleted file mode 100644 (file)
index 9f4e959..0000000
--- a/feisty/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/feisty/debian/compat b/feisty/debian/compat
deleted file mode 100644 (file)
index b8626c4..0000000
--- a/feisty/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-4

diff --git a/feisty/debian/control b/feisty/debian/control
deleted file mode 100644 (file)
index 29626dd..0000000
--- a/feisty/debian/control
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: allmydata-tahoe
-Section: python
-Priority: optional
-Maintainer: Brian Warner <warner@allmydata.com>
-Build-Depends: debhelper (>= 5.0.37.1), cdbs (>= 0.4.41), python-central (>= 0.4.10), python, python-all-dev
-Build-Depends-Indep: python-twisted
-XS-Python-Version: 2.4,2.5
-Standards-Version: 3.7.2
-
-Package: allmydata-tahoe
-Architecture: all
-Depends: ${python:Depends}, python-twisted, python-foolscap, python-pyopenssl, python-nevow
-Recommends:
-XB-Python-Version: 2.4,2.5
-Description: A secure distributed filestore
- Allmydata (tahoe2)

diff --git a/feisty/debian/copyright b/feisty/debian/copyright
deleted file mode 100644 (file)
index 98242b3..0000000
--- a/feisty/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/feisty/debian/pycompat b/feisty/debian/pycompat
deleted file mode 100644 (file)
index 0cfbf08..0000000
--- a/feisty/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2

diff --git a/feisty/debian/rules b/feisty/debian/rules
deleted file mode 100644 (file)
index fc046a4..0000000
--- a/feisty/debian/rules
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-DEB_PYTHON_SYSTEM=pycentral
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-STAGING_DIR=$(CURDIR)/debian/allmydata-tahoe
-
-install/allmydata-tahoe::
-       mkdir -pm755 $(STAGING_DIR)
-       cd src/zfec && python setup.py install --single-version-externally-managed --root=$(STAGING_DIR)
-       cd src/Crypto && python setup.py install --root=$(STAGING_DIR)
-       python setup.py install --root=$(STAGING_DIR)
-
-       dh_pycentral
-
-clean::
-       -rm -rf build

diff --git a/misc/dapper/debian/changelog b/misc/dapper/debian/changelog
new file mode 100644 (file)
index 0000000..9f4e959
--- /dev/null
+++ b/misc/dapper/debian/changelog
@@ -0,0 +1,5 @@
+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
new file mode 100644 (file)
index 0000000..b8626c4
--- /dev/null
+++ b/misc/dapper/debian/compat
@@ -0,0 +1 @@
+4

diff --git a/misc/dapper/debian/control b/misc/dapper/debian/control
new file mode 100644 (file)
index 0000000..a2762dd
--- /dev/null
+++ b/misc/dapper/debian/control
@@ -0,0 +1,12 @@
+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
+Description: A secure distributed filestore
+ Allmydata (tahoe2)

diff --git a/misc/dapper/debian/copyright b/misc/dapper/debian/copyright
new file mode 100644 (file)
index 0000000..98242b3
--- /dev/null
+++ b/misc/dapper/debian/copyright
@@ -0,0 +1,15 @@
+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
new file mode 100644 (file)
index 0000000..9f74003
--- /dev/null
+++ b/misc/dapper/debian/rules
@@ -0,0 +1,62 @@
+#!/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
+
+
+

diff --git a/misc/feisty/debian/changelog b/misc/feisty/debian/changelog
new file mode 100644 (file)
index 0000000..9f4e959
--- /dev/null
+++ b/misc/feisty/debian/changelog
@@ -0,0 +1,5 @@
+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/feisty/debian/compat b/misc/feisty/debian/compat
new file mode 100644 (file)
index 0000000..b8626c4
--- /dev/null
+++ b/misc/feisty/debian/compat
@@ -0,0 +1 @@
+4

diff --git a/misc/feisty/debian/control b/misc/feisty/debian/control
new file mode 100644 (file)
index 0000000..29626dd
--- /dev/null
+++ b/misc/feisty/debian/control
@@ -0,0 +1,16 @@
+Source: allmydata-tahoe
+Section: python
+Priority: optional
+Maintainer: Brian Warner <warner@allmydata.com>
+Build-Depends: debhelper (>= 5.0.37.1), cdbs (>= 0.4.41), python-central (>= 0.4.10), python, python-all-dev
+Build-Depends-Indep: python-twisted
+XS-Python-Version: 2.4,2.5
+Standards-Version: 3.7.2
+
+Package: allmydata-tahoe
+Architecture: all
+Depends: ${python:Depends}, python-twisted, python-foolscap, python-pyopenssl, python-nevow
+Recommends:
+XB-Python-Version: 2.4,2.5
+Description: A secure distributed filestore
+ Allmydata (tahoe2)

diff --git a/misc/feisty/debian/copyright b/misc/feisty/debian/copyright
new file mode 100644 (file)
index 0000000..98242b3
--- /dev/null
+++ b/misc/feisty/debian/copyright
@@ -0,0 +1,15 @@
+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/feisty/debian/pycompat b/misc/feisty/debian/pycompat
new file mode 100644 (file)
index 0000000..0cfbf08
--- /dev/null
+++ b/misc/feisty/debian/pycompat
@@ -0,0 +1 @@
+2

diff --git a/misc/feisty/debian/rules b/misc/feisty/debian/rules
new file mode 100644 (file)
index 0000000..fc046a4
--- /dev/null
+++ b/misc/feisty/debian/rules
@@ -0,0 +1,21 @@
+#! /usr/bin/make -f
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DEB_PYTHON_SYSTEM=pycentral
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+
+STAGING_DIR=$(CURDIR)/debian/allmydata-tahoe
+
+install/allmydata-tahoe::
+       mkdir -pm755 $(STAGING_DIR)
+       cd src/zfec && python setup.py install --single-version-externally-managed --root=$(STAGING_DIR)
+       cd src/Crypto && python setup.py install --root=$(STAGING_DIR)
+       python setup.py install --root=$(STAGING_DIR)
+
+       dh_pycentral
+
+clean::
+       -rm -rf build

diff --git a/misc/sid/debian/changelog b/misc/sid/debian/changelog
new file mode 100644 (file)
index 0000000..9f4e959
--- /dev/null
+++ b/misc/sid/debian/changelog
@@ -0,0 +1,5 @@
+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/sid/debian/compat b/misc/sid/debian/compat
new file mode 100644 (file)
index 0000000..b8626c4
--- /dev/null
+++ b/misc/sid/debian/compat
@@ -0,0 +1 @@
+4

diff --git a/misc/sid/debian/control b/misc/sid/debian/control
new file mode 100644 (file)
index 0000000..6be7791
--- /dev/null
+++ b/misc/sid/debian/control
@@ -0,0 +1,16 @@
+Source: allmydata-tahoe
+Section: python
+Priority: optional
+Maintainer: Brian Warner <warner@allmydata.com>
+Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-central (>= 0.5), python, python-dev
+Build-Depends-Indep: python-twisted-core
+XS-Python-Version: 2.4
+Standards-Version: 3.7.2
+
+Package: allmydata-tahoe
+Architecture: all
+Depends: ${python:Depends}, python-twisted-core, python-foolscap, python-pyopenssl, python-twisted-names, python-nevow
+Recommends:
+XB-Python-Version: 2.4
+Description: A secure distributed filestore
+ Allmydata (tahoe2)

diff --git a/misc/sid/debian/copyright b/misc/sid/debian/copyright
new file mode 100644 (file)
index 0000000..98242b3
--- /dev/null
+++ b/misc/sid/debian/copyright
@@ -0,0 +1,15 @@
+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/sid/debian/pycompat b/misc/sid/debian/pycompat
new file mode 100644 (file)
index 0000000..0cfbf08
--- /dev/null
+++ b/misc/sid/debian/pycompat
@@ -0,0 +1 @@
+2

diff --git a/misc/sid/debian/rules b/misc/sid/debian/rules
new file mode 100644 (file)
index 0000000..8317201
--- /dev/null
+++ b/misc/sid/debian/rules
@@ -0,0 +1,18 @@
+#! /usr/bin/make -f
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DEB_PYTHON_SYSTEM=pycentral
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+
+PREFIX=$(shell pwd)/debian/allmydata-tahoe/usr
+
+build/allmydata-tahoe::
+       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)
+
+clean::
+       -rm -rf build

diff --git a/sid/debian/changelog b/sid/debian/changelog
deleted file mode 100644 (file)
index 9f4e959..0000000
--- a/sid/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/sid/debian/compat b/sid/debian/compat
deleted file mode 100644 (file)
index b8626c4..0000000
--- a/sid/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-4

diff --git a/sid/debian/control b/sid/debian/control
deleted file mode 100644 (file)
index 6be7791..0000000
--- a/sid/debian/control
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: allmydata-tahoe
-Section: python
-Priority: optional
-Maintainer: Brian Warner <warner@allmydata.com>
-Build-Depends: debhelper (>= 5.0.37.2), cdbs (>= 0.4.43), python-central (>= 0.5), python, python-dev
-Build-Depends-Indep: python-twisted-core
-XS-Python-Version: 2.4
-Standards-Version: 3.7.2
-
-Package: allmydata-tahoe
-Architecture: all
-Depends: ${python:Depends}, python-twisted-core, python-foolscap, python-pyopenssl, python-twisted-names, python-nevow
-Recommends:
-XB-Python-Version: 2.4
-Description: A secure distributed filestore
- Allmydata (tahoe2)

diff --git a/sid/debian/copyright b/sid/debian/copyright
deleted file mode 100644 (file)
index 98242b3..0000000
--- a/sid/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/sid/debian/pycompat b/sid/debian/pycompat
deleted file mode 100644 (file)
index 0cfbf08..0000000
--- a/sid/debian/pycompat
+++ /dev/null
@@ -1 +0,0 @@
-2

diff --git a/sid/debian/rules b/sid/debian/rules
deleted file mode 100644 (file)
index 8317201..0000000
--- a/sid/debian/rules
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-DEB_PYTHON_SYSTEM=pycentral
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-PREFIX=$(shell pwd)/debian/allmydata-tahoe/usr
-
-build/allmydata-tahoe::
-       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)
-
-clean::
-       -rm -rf build