[Piuparts-commits] rev 913 - in trunk: . debian

[Holger Levsen]

Author: holger
Date: 2011-07-10 09:28:50 +0000 (Sun, 10 Jul 2011)
New Revision: 913

Modified:
   trunk/Makefile
   trunk/debian/changelog
   trunk/debian/control
Log:
* debian/control:
  - add X-Python-Version: pseudo-header
* Makefile: build for python 2.6 and 2.7 instead of 2.5 and 2.6

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2011-07-10 08:58:30 UTC (rev 912)
+++ trunk/Makefile	2011-07-10 09:28:50 UTC (rev 913)
@@ -5,8 +5,8 @@
 man1dir = $(mandir)/man1
 libdir = $(prefix)/lib
 docdir = $(prefix)/share/doc/piuparts/
-site25 = $(libdir)/python2.5/site-packages
-site26 = $(libdir)/python2.6/site-packages
+site26 = $(libdir)/python2.6/dist-packages
+site27 = $(libdir)/python2.7/dist-packages
 etcdir = $(prefix)/etc
 distribution=${shell dpkg-parsechangelog | sed -n 's/^Distribution: *//p'}
 ifeq ($(distribution),UNRELEASED)
@@ -47,10 +47,10 @@
 	for file in piuparts-slave piuparts-master piuparts-report piuparts-analyze; do \
 	    install -m 0755 $$file.py $(sharedir)/piuparts/$$file ; done
 	
-	install -d $(site25)/piupartslib
 	install -d $(site26)/piupartslib
-	install -m 0644 piupartslib/*.py $(site25)/piupartslib
+	install -d $(site27)/piupartslib
 	install -m 0644 piupartslib/*.py $(site26)/piupartslib
+	install -m 0644 piupartslib/*.py $(site27)/piupartslib
 
 check:
 	python piuparts.py unittest

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2011-07-10 08:58:30 UTC (rev 912)
+++ trunk/debian/changelog	2011-07-10 09:28:50 UTC (rev 913)
@@ -24,8 +24,12 @@
   * Make piuparts use proxy settings either from apt configuration or
     http_proxy environment variable, the latter overwriting the former (if
     present) - Thanks to Scott Schaefer for the patch. (Closes: #632046)  
-  * debian/control and rules: use dh_python2 instead of python-support to 
-    build the package, require python >= 2.6.6-3~
+  * debian/control:
+    - require python >= 2.6.6-3~
+    - add X-Python-Version: pseudo-header
+  * debian/rules: use dh_python2 instead of python-support to build the 
+    package
+  * Makefile: build for python 2.6 and 2.7 instead of 2.5 and 2.6
 
  -- Holger Levsen <holger at debian.org>  Sat, 25 Jun 2011 23:33:49 +0200
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2011-07-10 08:58:30 UTC (rev 912)
+++ trunk/debian/control	2011-07-10 09:28:50 UTC (rev 913)
@@ -9,6 +9,7 @@
 Vcs-Svn: svn://svn.debian.org/svn/piuparts/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/piuparts/trunk/
 Homepage: http://piuparts.debian.org
+X-Python-Version: >= 2.6
 
 Package: piuparts
 Architecture: all