clean up debian packaging: we have control files for etch/lenny/sid, and

everything else uses one of those. Add dependency on python-pysqlite2 for
platforms that use py2.4 by default. Update foolscap dependency to 0.4.1.
This commit is contained in:
Brian Warner 2009-07-03 00:28:04 -07:00
parent ba9f3dcc7d
commit d79b2a02b4
14 changed files with 127 additions and 38 deletions

View File

@ -295,28 +295,27 @@ show-pp:
.PHONY: deb-etch deb-lenny deb-sid
.PHONY: deb-edgy deb-feisty deb-gutsy deb-hardy deb-intrepid deb-jaunty
# etch uses the feisty control files for now
deb-etch:
$(MAKE) deb-ARCH ARCH=etch TAHOE_ARCH=feisty
deb-lenny:
$(MAKE) deb-ARCH ARCH=lenny TAHOE_ARCH=feisty
deb-sid:
$(MAKE) deb-ARCH ARCH=sid
# we use misc/$TAHOE_ARCH/debian
# edgy uses the feisty control files for now
deb-edgy:
$(MAKE) deb-ARCH ARCH=edgy TAHOE_ARCH=feisty
deb-feisty:
$(MAKE) deb-ARCH ARCH=feisty
# same with gutsy, the process has been nicely stable for a while now
deb-gutsy:
$(MAKE) deb-ARCH ARCH=gutsy TAHOE_ARCH=feisty
deb-hardy:
$(MAKE) deb-ARCH ARCH=hardy TAHOE_ARCH=feisty
deb-intrepid:
$(MAKE) deb-ARCH ARCH=intrepid TAHOE_ARCH=feisty
deb-jaunty:
$(MAKE) deb-ARCH ARCH=jaunty TAHOE_ARCH=feisty
deb-etch: # py2.4
$(MAKE) deb-ARCH ARCH=etch TAHOE_ARCH=etch
deb-lenny: # py2.5
$(MAKE) deb-ARCH ARCH=lenny TAHOE_ARCH=lenny
deb-sid:
$(MAKE) deb-ARCH ARCH=sid TAHOE_ARCH=sid
deb-edgy: # py2.4
$(MAKE) deb-ARCH ARCH=edgy TAHOE_ARCH=etch
deb-feisty: # py2.5
$(MAKE) deb-ARCH ARCH=feisty TAHOE_ARCH=lenny
deb-gutsy: # py2.5
$(MAKE) deb-ARCH ARCH=gutsy TAHOE_ARCH=lenny
deb-hardy: # py2.5
$(MAKE) deb-ARCH ARCH=hardy TAHOE_ARCH=lenny
deb-intrepid: # py2.5
$(MAKE) deb-ARCH ARCH=intrepid TAHOE_ARCH=lenny
deb-jaunty: # py2.6
$(MAKE) deb-ARCH ARCH=jaunty TAHOE_ARCH=lenny
@ -366,40 +365,40 @@ deb-ARCH: is-known-debian-arch setup-deb
increment-deb-version: make-version
debchange --newversion $(VER) $(DEBCOMMENTS)
deb-etch-head:
$(MAKE) setup-deb ARCH=etch TAHOE_ARCH=feisty
$(MAKE) setup-deb ARCH=etch TAHOE_ARCH=etch
$(MAKE) increment-deb-version
fakeroot debian/rules binary
deb-lenny-head:
$(MAKE) setup-deb ARCH=lenny TAHOE_ARCH=feisty
$(MAKE) setup-deb ARCH=lenny TAHOE_ARCH=lenny
$(MAKE) increment-deb-version
fakeroot debian/rules binary
deb-sid-head:
$(MAKE) setup-deb ARCH=sid
$(MAKE) setup-deb ARCH=sid TAHOE_ARCH=lenny
$(MAKE) increment-deb-version
fakeroot debian/rules binary
deb-edgy-head:
$(MAKE) setup-deb ARCH=edgy TAHOE_ARCH=feisty
$(MAKE) setup-deb ARCH=edgy TAHOE_ARCH=etch
$(MAKE) increment-deb-version
fakeroot debian/rules binary
deb-feisty-head:
$(MAKE) setup-deb ARCH=feisty
$(MAKE) setup-deb ARCH=feisty TAHOE_ARCH=lenny
$(MAKE) increment-deb-version
fakeroot debian/rules binary
deb-gutsy-head:
$(MAKE) setup-deb ARCH=gutsy TAHOE_ARCH=feisty
$(MAKE) setup-deb ARCH=gutsy TAHOE_ARCH=lenny
$(MAKE) increment-deb-version
fakeroot debian/rules binary
deb-hardy-head:
$(MAKE) setup-deb ARCH=hardy TAHOE_ARCH=feisty
$(MAKE) setup-deb ARCH=hardy TAHOE_ARCH=lenny
$(MAKE) increment-deb-version
fakeroot debian/rules binary
deb-intrepid-head:
$(MAKE) setup-deb ARCH=intrepid TAHOE_ARCH=feisty
$(MAKE) setup-deb ARCH=intrepid TAHOE_ARCH=lenny
$(MAKE) increment-deb-version
fakeroot debian/rules binary
deb-jaunty-head:
$(MAKE) setup-deb ARCH=jaunty TAHOE_ARCH=feisty
$(MAKE) setup-deb ARCH=jaunty TAHOE_ARCH=lenny
$(MAKE) increment-deb-version
fakeroot debian/rules binary

View File

@ -9,8 +9,8 @@ Standards-Version: 3.7.2
Package: allmydata-tahoe
Architecture: all
Depends: ${python:Depends}, python-twisted, python-foolscap (>= 0.3.0), python-pyopenssl, python-nevow, python-simplejson (>= 1.4), python-zfec (>= 1.1), python-pycryptopp (>= 0.5), python-setuptools
Depends: ${python:Depends}, python-twisted, python-foolscap (>= 0.4.1), python-pyopenssl, python-nevow, python-simplejson (>= 1.4), python-zfec (>= 1.1), python-pycryptopp (>= 0.5), python-setuptools, python-sqlite2
Recommends:
XB-Python-Version: 2.4,2.5
Description: A secure distributed filestore
Allmydata (tahoe2)
XB-Python-Version: 2.4,2.5,2.6
Description: A secure distributed filesystem
Allmydata Tahoe

View File

@ -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

1
misc/lenny/debian/compat Normal file
View File

@ -0,0 +1 @@
4

16
misc/lenny/debian/control Normal file
View File

@ -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-setuptools, python, python-dev
Build-Depends-Indep: python-twisted
XS-Python-Version: 2.4,2.5,2.6
Standards-Version: 3.7.2
Package: allmydata-tahoe
Architecture: all
Depends: ${python:Depends}, python-twisted, python-foolscap (>= 0.4.1), python-pyopenssl, python-nevow, python-simplejson (>= 1.4), python-zfec (>= 1.1), python-pycryptopp (>= 0.5), python-setuptools
Recommends:
XB-Python-Version: 2.4,2.5,2.6
Description: A secure distributed filesystem
Allmydata Tahoe

View File

@ -0,0 +1,19 @@
This package was debianized by Brian Warner <warner@allmydata.com>
The upstream source of this project is http://allmydata.org .
Copyright (c) 2006-2009
AllMyData, Inc.
You may use this package under the GNU General Public License, version 2 or, at
your option, any later version.
You may use this package under the Transitive Grace Period Public Licence,
version 1.0. The Transitive Grace Period Public Licence has requirements
similar to the GPL except that it allows you to wait for up to twelve months
after you redistribute a derived work before releasing the source code of your
derived work. See the file COPYING.TGPPL.html for the terms of the Transitive
Grace Period Public Licence, version 1.0.
(You may choose to use this package under the terms of either licence, at your
option.)

View File

@ -0,0 +1 @@
2

48
misc/lenny/debian/rules Normal file
View File

@ -0,0 +1,48 @@
#! /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
# this ought to be the name of the package that we're building, which is
# different on each tahoe branch. debian/control is the master: whatever
# package is listed in there will be built.
DEBNAME := $(firstword $(DEB_PACKAGES))
STAGING_DIR := $(CURDIR)/debian/$(DEBNAME)
DEB_INSTALL_DOCS_ALL := COPYING.GPL COPYING.TGPPL.html CREDITS \
NEWS README relnotes.txt docs misc/spacetime misc/cpu-watcher.tac
DEB_COMPRESS_EXCLUDE := .tac
# we overwrite the setuptools-generated /usr/bin/tahoe (located in
# support/bin/tahoe after a 'make build') with a different version, because
# the setuptools form (using "entry points") insists upon .egg-info -visible
# forms of dependent packages to be installed. For a debian package, we rely
# upon the dependencies that are declared in debian/control .
#
# To make sure the #! line matches the version of python that we're using for
# this build, we copy it from the setuptools-generated /usr/bin/tahoe, then
# add other code to the generated file.
install/$(DEBNAME)::
mkdir -pm755 $(STAGING_DIR)
python setup.py install --root=$(STAGING_DIR)
head -1 $(STAGING_DIR)/usr/bin/tahoe >$(STAGING_DIR)/usr/bin/tahoe.new
echo "from allmydata.scripts import runner" >>$(STAGING_DIR)/usr/bin/tahoe.new
echo "runner.run()" >>$(STAGING_DIR)/usr/bin/tahoe.new
chmod +x $(STAGING_DIR)/usr/bin/tahoe.new
mv $(STAGING_DIR)/usr/bin/tahoe.new $(STAGING_DIR)/usr/bin/tahoe
dh_install misc/munin/* usr/share/$(DEBNAME)/munin
chmod +x $(STAGING_DIR)/usr/share/$(DEBNAME)/munin/*
dh_pycentral
clean::
-rm -rf build

View File

@ -9,8 +9,8 @@ Standards-Version: 3.7.2
Package: allmydata-tahoe
Architecture: all
Depends: ${python:Depends}, python-twisted-core, python-foolscap (>= 0.3.0), python-pyopenssl, python-twisted-names, python-nevow, python-simplejson (>= 1.4), python-zfec (>= 1.1), python-pycryptopp (>= 0.5), python-setuptools
Depends: ${python:Depends}, python-twisted-core, python-twisted-names, python-twisted-web, python-foolscap (>= 0.4.1), python-pyopenssl, python-nevow, python-simplejson (>= 1.4), python-zfec (>= 1.1), python-pycryptopp (>= 0.5), python-setuptools
Recommends:
XB-Python-Version: 2.4,2.5
Description: A secure distributed filestore
Allmydata (tahoe2)
XB-Python-Version: 2.4,2.5,2.6
Description: A secure distributed filesystem
Allmydata Tahoe