Fixes.

git-svn-id: svn://svn.autonomy.net.au/python-dmidecode@178 abc39116-655e-4be6-ad55-d661dc543056

5 files changed, 13 insertions, 20 deletions

diff --git a/debian/changelog b/debian/changelog
index 2e048ba..940a149 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-dmidecode (2.10.5-1) unstable; urgency=low
+
+  * Upstream (cleanup) release.
+
+ -- Nima Talebi <nima@it.net.au>  Mon, 09 Mar 2009 10:29:52 +1100
+
 python-dmidecode (2.10.4-1) unstable; urgency=low
 
   * Upstream release - purely to do with rpm packaging.
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index e845566..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/debian/python-dmidecode-dbg.docs b/debian/python-dmidecode-dbg.docs
new file mode 100644
index 0000000..5ac33e9
--- /dev/null
+++ b/debian/python-dmidecode-dbg.docs
@@ -0,0 +1,2 @@
+README
+doc/changelog
diff --git a/debian/python-dmidecode.docs b/debian/python-dmidecode.docs
new file mode 100644
index 0000000..5ac33e9
--- /dev/null
+++ b/debian/python-dmidecode.docs
@@ -0,0 +1,2 @@
+README
+doc/changelog
diff --git a/debian/rules b/debian/rules
index 63a950b..5e4d832 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,14 +4,9 @@ export DH_VERBOSE=0
 PACKAGE = $(shell dh_listpackages)
 PYVERS  = $(shell pyversions -vr)
 
-AGE = $(strip $(wildcard $(HOME)/bin/age))
-CACHE_AGE = 86400
-UPSTREAM_CHANGELOG = /tmp/python-dmidecode.upstream.changelog
-CL_EXISTS = `test -f $(UPSTREAM_CHANGELOG) && echo 1 || echo 0`
-
 ################################################################################
 #. Build
-build: $(UPSTREAM_CHANGELOG) build-stamp
+build: build-stamp
 build-stamp: $(PYVERS:%=build-ext-%) $(PYVERS:%=build-dbg-ext-%)
 	dh_testdir
 	touch $@
@@ -22,19 +17,14 @@ build-dbg-ext-%:
 	python$*-dbg src/setup-dbg.py build
 	touch $@
 
-$(UPSTREAM_CHANGELOG):
-	  svn log > $@
-
 ################################################################################
 #. Install
-install: $(UPSTREAM_CHANGELOG) install-stamp
+install: install-stamp
 	dh_testdir
 	dh_testroot
 	dh_installdirs
 	dh_installchangelogs
 	dh_installdocs
-	install $(UPSTREAM_CHANGELOG) debian/python-dmidecode/usr/share/doc/python-dmidecode/changelog
-	install $(UPSTREAM_CHANGELOG) debian/python-dmidecode-dbg/usr/share/doc/python-dmidecode-dbg/changelog
 	dh_installexamples
 	dh_install
 	dh_pycentral
@@ -68,17 +58,11 @@ binary-arch: build install
 
 ################################################################################
 #. Clean
-clean: CL_AGE := $(CACHE_AGE)
-ifeq ($(CL_EXISTS),1)
-ifneq ($(AGE),)
-clean: CL_AGE := $(shell $(AGE) $(UPSTREAM_CHANGELOG))
-endif
-endif
 clean:
 	dh_testdir
 	dh_testroot
 	$(MAKE) -f Makefile clean
-	test $(CL_AGE) -le $(CACHE_AGE) || dh_clean $(UPSTREAM_CHANGELOG)
+	test $(CL_AGE) -le $(CACHE_AGE) || dh_clean
 	dh_clean build-stamp install-stamp \
 	  $(PYVERS:%=install-ext-%) $(PYVERS:%=build-ext-%) \
 	  $(PYVERS:%=install-dbg-ext-%) $(PYVERS:%=build-dbg-ext-%)