debian: change name of debian packages to 'allmydata-tahoe' to avoid conflicts

diff --git a/dapper/debian/changelog b/dapper/debian/changelog
index 9450e1e13cef9812a205f46497c2542af2266dde..9f4e959e8e2998a36e2a5dce0fe63b1a0625ce9b 100644 (file)
--- a/dapper/debian/changelog
+++ b/dapper/debian/changelog
@@ -1,4 +1,4 @@
-allmydata (0.0.1) unstable; urgency=low
+allmydata-tahoe (0.0.1) unstable; urgency=low
 
   * experimental packaging
 

diff --git a/dapper/debian/control b/dapper/debian/control
index 008430d2d70793600a9abadb15ce6e510addf50b..13319a84895fb28bc9d094280677ff22e1fe7f9b 100644 (file)
--- a/dapper/debian/control
+++ b/dapper/debian/control
@@ -1,11 +1,11 @@
-Source: allmydata
+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
+Package: allmydata-tahoe
 Architecture: all
 Depends: python (>= 2.4), python (<< 2.5), python2.4-foolscap
 Description: A secure distributed filestore

diff --git a/dapper/debian/rules b/dapper/debian/rules
index d96a65c93f353f12e99b88ec903fa9451eb4ecb3..78a33809744bd9d130ca5f9094913a0f561db696 100644 (file)
--- a/dapper/debian/rules
+++ b/dapper/debian/rules
@@ -33,7 +33,7 @@ install: build
 
        ## Python 2.4
        python2.4 setup.py build
-       python2.4 setup.py install --prefix=debian/allmydata/usr
+       python2.4 setup.py install --prefix=debian/allmydata-tahoe/usr
 
 
 # Build architecture-independent files here.

diff --git a/sid/debian/changelog b/sid/debian/changelog
index 9450e1e13cef9812a205f46497c2542af2266dde..9f4e959e8e2998a36e2a5dce0fe63b1a0625ce9b 100644 (file)
--- a/sid/debian/changelog
+++ b/sid/debian/changelog
@@ -1,4 +1,4 @@
-allmydata (0.0.1) unstable; urgency=low
+allmydata-tahoe (0.0.1) unstable; urgency=low
 
   * experimental packaging
 

diff --git a/sid/debian/control b/sid/debian/control
index 30724310b87628e3a70e2ba73f7b214cf88f0d42..87a37b460264608d04e6d078701a09eb584f74e6 100644 (file)
--- a/sid/debian/control
+++ b/sid/debian/control
@@ -1,4 +1,4 @@
-Source: allmydata
+Source: allmydata-tahoe
 Section: python
 Priority: optional
 Maintainer: Brian Warner <warner@allmydata.com>
@@ -7,7 +7,7 @@ Build-Depends-Indep: python-twisted-core
 XS-Python-Version: 2.4
 Standards-Version: 3.7.2
 
-Package: allmydata
+Package: allmydata-tahoe
 Architecture: all
 Depends: ${python:Depends}, python-twisted-core, python-foolscap, python-pyopenssl, python-twisted-names
 Recommends:

diff --git a/sid/debian/rules b/sid/debian/rules
index 335b95840dc8fc603fb2720e3bc41c7780903c32..2335e90e06da422443c7f344d2af890c75b80652 100644 (file)
--- a/sid/debian/rules
+++ b/sid/debian/rules
@@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
 
-install/python-foolscap::
+install/allmydata-tahoe::
        dh_installdocs client.tac queen.tac
 
 clean::