From 42410c1a02029f1a1d5c5476baacbfba4b922caf Mon Sep 17 00:00:00 2001
From: etrunko <eblima@gmail.com>
Date: Tue, 15 Jul 2008 15:24:46 +0000
Subject: [PATCH] debian/rules: Fixed packaging. Added .install file for
 python2.5-dispatcher package.

---
 trunk/python-dispatcher/debian/changelog           |    6 +++
 .../debian/python2.5-dispatcher.install            |    1 +
 trunk/python-dispatcher/debian/rules               |   39 +++++++-------------
 3 files changed, 21 insertions(+), 25 deletions(-)
 create mode 100644 trunk/python-dispatcher/debian/python2.5-dispatcher.install

diff --git a/trunk/python-dispatcher/debian/changelog b/trunk/python-dispatcher/debian/changelog
index 61576ca..6255f46 100644
--- a/trunk/python-dispatcher/debian/changelog
+++ b/trunk/python-dispatcher/debian/changelog
@@ -1,3 +1,9 @@
+python-dispatcher (0.1.1-maemo2) unstable; urgency=low
+
+  * New release
+
+ -- Eduardo Lima (Etrunko) <eduardo.lima@indt.org.br>  Wed, 09 Jul 2008 16:03:59 -0300
+
 python-dispatcher (0.1.1-maemo1) unstable; urgency=low
 
   * New release
diff --git a/trunk/python-dispatcher/debian/python2.5-dispatcher.install b/trunk/python-dispatcher/debian/python2.5-dispatcher.install
new file mode 100644
index 0000000..52b6b3c
--- /dev/null
+++ b/trunk/python-dispatcher/debian/python2.5-dispatcher.install
@@ -0,0 +1 @@
+usr/lib/python2.5/site-packages/*/*
diff --git a/trunk/python-dispatcher/debian/rules b/trunk/python-dispatcher/debian/rules
index 8a6370e..4008fb2 100755
--- a/trunk/python-dispatcher/debian/rules
+++ b/trunk/python-dispatcher/debian/rules
@@ -1,32 +1,19 @@
 #!/usr/bin/make -f
 
+DEB_DESTDIR=$(CURDIR)/debian/tmp
+
 PYVER=2.5
 PYTHON=python$(PYVER)
 
-p_base=$(PYTHON)-dispatcher
-d_base=debian/$(p_base)
-
-DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-    CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2 -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
-    ifneq (,$(findstring n8x0,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -mfpu=vfp -mfloat-abi=softfp -mcpu=arm1136jf-s
-    endif
-    ifneq (,$(findstring n770,$(DEB_BUILD_OPTIONS)))
-         CFLAGS += -mcpu=arm926ej-s
-    endif
-endif
-
 build: build-stamp
 build-stamp:
 	dh_testdir
-	CFLAGS="$(CFLAGS)" $(PYTHON) setup.py build_ext build install --prefix /usr install_headers
+	$(PYTHON) setup.py build_ext build
 	touch build-stamp
 clean:
 	dh_testdir
 	dh_testroot
-	CFLAGS="$(CFLAGS)" $(PYTHON) setup.py clean
+	$(PYTHON) setup.py clean
 	-rm -f build-stamp
 	-rm -rf build dist python_dispatcher.egg-info
 	-rm -f dispatcher/*.py[co]
@@ -37,18 +24,20 @@ install: build
 	dh_testdir
 	dh_testroot
 	dh_installdirs
-	CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install --root=$(d_base)
-	if [ "x$(DEB_BUILD_ARCH)" = "xarmel" ]; then \
-		rm -rf $(d_base)/usr/lib/$(PYTHON)/site-packages/dispatcher/*.py; \
-		rm -rf $(d_base)/usr/lib/$(PYTHON)/site-packages/dispatcher/*.pyc; \
-	fi
+	$(PYTHON) setup.py install --root=$(DEB_DESTDIR)
+	rm -rf $(DEB_DESTDIR)/usr/lib/$(PYTHON)/site-packages/dispatcher/*.py; \
+	rm -rf $(DEB_DESTDIR)/usr/lib/$(PYTHON)/site-packages/dispatcher/*.pyc; \
+	dh_install --sourcedir=$(DEB_DESTDIR) --fail-missing
 
-binary: binary-arch binary-indep
-binary-arch: build install
+binary: binary-indep
 binary-indep: build install
 	dh_testdir
 	dh_testroot
+	dh_installdocs
+	dh_installdebconf
+	dh_installchangelogs
 	dh_strip
+	dh_compress
 	dh_fixperms
 	dh_makeshlibs
 	dh_installdeb
@@ -57,4 +46,4 @@ binary-indep: build install
 	dh_md5sums
 	dh_builddeb
 
-.PHONY: build install clean binary binary-arch binary-indep
+.PHONY: build install clean binary binary-indep
-- 
1.7.9.5