copy debian/sid changes to debian/feisty

diff --git a/misc/feisty/debian/allmydata-tahoe.docs b/misc/feisty/debian/allmydata-tahoe.docs
index 41b9dfa3587af94ddda8868c8fb5d2cf77223114..5dacb6efa4d5baab6c5fb0cbe905d68438e19314 100644 (file)
--- a/misc/feisty/debian/allmydata-tahoe.docs
+++ b/misc/feisty/debian/allmydata-tahoe.docs
@@ -1,3 +1,8 @@
-docs/*.txt
-docs/*.svg
-docs/testgrid
+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 0966bf757028462c04332dc7e7d9592ef1d5b5ab..ad928a7d0561ed502239dea788102d135542a735 100644 (file)
--- a/misc/feisty/debian/rules
+++ b/misc/feisty/debian/rules
@@ -9,6 +9,9 @@ include /usr/share/cdbs/1/class/python-distutils.mk
 
 STAGING_DIR=$(CURDIR)/debian/allmydata-tahoe
 
+# 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
 # the setuptools form (using "entry points") insists upon .egg-info -visible