[Pkg-voip-commits] r7879 - in /py-asterisk/trunk/debian: changelog rules

[jblache at alioth.debian.org]

Author: jblache
Date: Fri Dec 11 17:56:18 2009
New Revision: 7879

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7879
Log:
Apply patch for NMU 0.1a3+r160-4.1

Modified:
    py-asterisk/trunk/debian/changelog
    py-asterisk/trunk/debian/rules

Modified: py-asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/py-asterisk/trunk/debian/changelog?rev=7879&op=diff
==============================================================================
--- py-asterisk/trunk/debian/changelog (original)
+++ py-asterisk/trunk/debian/changelog Fri Dec 11 17:56:18 2009
@@ -3,6 +3,16 @@
   * NOT RELEASED YET
 
  -- Julien BLACHE <jblache at debian.org>  Sat, 01 Mar 2008 16:50:11 +0100
+
+py-asterisk (0.1a3+r160-4.1) unstable; urgency=low
+
+  * Non-maintainer upload, for the upcoming Python 2.6 transition
+  * debian/rules
+    - optionally include python.mk and add ${py_setup_install_args} to setup.py
+      install; thanks to Bernd Zeimetz for the report and to Luca Falavigna
+      for the patch (uploaded in Ubuntu); Closes: #559237
+
+ -- Sandro Tosi <morph at debian.org>  Thu, 10 Dec 2009 23:18:05 +0100
 
 py-asterisk (0.1a3+r160-4) unstable; urgency=low
 

Modified: py-asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/py-asterisk/trunk/debian/rules?rev=7879&op=diff
==============================================================================
--- py-asterisk/trunk/debian/rules (original)
+++ py-asterisk/trunk/debian/rules Fri Dec 11 17:56:18 2009
@@ -11,6 +11,7 @@
 
 # Include dpatch rules
 include /usr/share/dpatch/dpatch.make
+-include /usr/share/python/python.mk
 
 configure: configure-stamp
 configure-stamp:
@@ -45,7 +46,7 @@
 	dh_clean -k 
 	dh_installdirs
 
-	python setup.py install --root=$(CURDIR)/debian/python-asterisk
+	python setup.py install --root=$(CURDIR)/debian/python-asterisk ${py_setup_install_args}
 	mv $(CURDIR)/debian/python-asterisk/etc/asterisk/py-asterisk.conf.sample \
 		$(CURDIR)/debian/python-asterisk/etc/asterisk/py-asterisk.conf