[Python-apps-commits] r3986 - in packages/txt2tags/trunk/debian (rules txt2tags.install)

[jmw-guest at users.alioth.debian.org]

    Date: Sunday, October 18, 2009 @ 16:57:04
  Author: jmw-guest
Revision: 3986

Install python module in a more sane way

Modified:
  packages/txt2tags/trunk/debian/rules
Deleted:
  packages/txt2tags/trunk/debian/txt2tags.install

Modified: packages/txt2tags/trunk/debian/rules
===================================================================
--- packages/txt2tags/trunk/debian/rules	2009-10-18 11:00:00 UTC (rev 3985)
+++ packages/txt2tags/trunk/debian/rules	2009-10-18 16:57:04 UTC (rev 3986)
@@ -3,8 +3,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/python/python.mk
-PYVERS=$(shell pyversions -vr)
+-include /usr/share/python/python.mk
+ifeq (,$(py_libdir))
+  py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages
+endif
+PYDEF=$(shell pyversions -vd)
 
 override_dh_clean:
 	dh_quilt_patch
@@ -18,16 +21,11 @@
 	dh_quilt_patch
 	dh_auto_build
 	cd doc && $(MAKE) build
-	mkdir build
-	cp txt2tags build/txt2tags.py
-	cp debian/usr-bin-txt2tags build/txt2tags
 
-install-ext-%-stamp:
-	dh_testdir
-	dh_install build/txt2tags.py usr/lib/python$*/$(call py_sitename, $*)
-
-override_dh_install: $(PYVERS:%=install-ext-%-stamp)
+override_dh_install:
 	dh_install
+	install -D debian/usr-bin-txt2tags debian/txt2tags/usr/bin/txt2tags
+	install -D txt2tags debian/txt2tags$(call py_libdir,$(PYDEF))/txt2tags.py
 	cd po && $(MAKE) install BASEDIR=$(CURDIR)/debian/txt2tags
 
 override_dh_compress:

Deleted: packages/txt2tags/trunk/debian/txt2tags.install
===================================================================
--- packages/txt2tags/trunk/debian/txt2tags.install	2009-10-18 11:00:00 UTC (rev 3985)
+++ packages/txt2tags/trunk/debian/txt2tags.install	2009-10-18 16:57:04 UTC (rev 3986)
@@ -1 +0,0 @@
-build/txt2tags		usr/bin