debian/rules: put munin plugins in /usr/share/PACKAGENAME/munin/, make them +x, remov...

diff --git a/misc/feisty/debian/allmydata-tahoe.docs b/misc/feisty/debian/allmydata-tahoe.docs
deleted file mode 100644 (file)
index 5dacb6e..0000000
--- a/misc/feisty/debian/allmydata-tahoe.docs
+++ /dev/null
@@ -1,8 +0,0 @@
-COPYING.GPL
-COPYING.TGPPL.html
-CREDITS
-NEWS
-README
-relnotes.txt
-misc/munin
-docs

diff --git a/misc/feisty/debian/rules b/misc/feisty/debian/rules
index ad928a7d0561ed502239dea788102d135542a735..18d789af47abffbfad9ebe36becc5cfd9e7ac866 100644 (file)
--- a/misc/feisty/debian/rules
+++ b/misc/feisty/debian/rules
@@ -7,10 +7,16 @@ 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
+# 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
 
-# to add files to /usr/share/doc/, edit ./allmydata-tahoe.docs
-DEB_COMPRESS_EXCLUDE := "munin/"
 
 # we overwrite the setuptools-generated /usr/bin/tahoe (located in
 # support/bin/tahoe after a 'make build') with a different version, because
@@ -22,7 +28,7 @@ DEB_COMPRESS_EXCLUDE := "munin/"
 # this build, we copy it from the setuptools-generated /usr/bin/tahoe, then
 # add other code to the generated file.
 
-install/allmydata-tahoe::
+install/$(DEBNAME)::
        mkdir -pm755 $(STAGING_DIR)
        python setup.py install --root=$(STAGING_DIR)
 
@@ -32,6 +38,9 @@ install/allmydata-tahoe::
        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::

diff --git a/misc/sid/debian/allmydata-tahoe.docs b/misc/sid/debian/allmydata-tahoe.docs
deleted file mode 100644 (file)
index 5dacb6e..0000000
--- a/misc/sid/debian/allmydata-tahoe.docs
+++ /dev/null
@@ -1,8 +0,0 @@
-COPYING.GPL
-COPYING.TGPPL.html
-CREDITS
-NEWS
-README
-relnotes.txt
-misc/munin
-docs

diff --git a/misc/sid/debian/rules b/misc/sid/debian/rules
index ad928a7d0561ed502239dea788102d135542a735..18d789af47abffbfad9ebe36becc5cfd9e7ac866 100644 (file)
--- a/misc/sid/debian/rules
+++ b/misc/sid/debian/rules
@@ -7,10 +7,16 @@ 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
+# 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
 
-# to add files to /usr/share/doc/, edit ./allmydata-tahoe.docs
-DEB_COMPRESS_EXCLUDE := "munin/"
 
 # we overwrite the setuptools-generated /usr/bin/tahoe (located in
 # support/bin/tahoe after a 'make build') with a different version, because
@@ -22,7 +28,7 @@ DEB_COMPRESS_EXCLUDE := "munin/"
 # this build, we copy it from the setuptools-generated /usr/bin/tahoe, then
 # add other code to the generated file.
 
-install/allmydata-tahoe::
+install/$(DEBNAME)::
        mkdir -pm755 $(STAGING_DIR)
        python setup.py install --root=$(STAGING_DIR)
 
@@ -32,6 +38,9 @@ install/allmydata-tahoe::
        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::