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

[Holger Levsen]

Author: holger
Date: 2010-01-23 17:09:53 +0000 (Sat, 23 Jan 2010)
New Revision: 635

Modified:
   trunk/Makefile
   trunk/debian/changelog
   trunk/debian/control
Log:
  * Makefile: support python 2.5 and 2.6 instead of 2.4 and 2.5, adjust
    debian/control accordingly.



Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2010-01-11 12:50:03 UTC (rev 634)
+++ trunk/Makefile	2010-01-23 17:09:53 UTC (rev 635)
@@ -5,8 +5,8 @@
 man1dir = $(mandir)/man1
 libdir = $(prefix)/lib
 docdir = $(prefix)/share/doc/piuparts/
-site24 = $(libdir)/python2.4/site-packages
 site25 = $(libdir)/python2.5/site-packages
+site26 = $(libdir)/python2.6/site-packages
 etcdir = $(prefix)/etc
 distribution=${shell dpkg-parsechangelog | sed -n 's/^Distribution: *//p'}
 ifeq ($(distribution),UNRELEASED)
@@ -49,10 +49,10 @@
 	for file in piuparts-slave piuparts-master piuparts-report piuparts-analyze; do \
 	    install -m 0755 $$file.py $(sharedir)/piuparts/$$file ; done
 	
-	install -d $(site24)/piupartslib
 	install -d $(site25)/piupartslib
-	install -m 0644 piupartslib/*.py $(site24)/piupartslib
+	install -d $(site26)/piupartslib
 	install -m 0644 piupartslib/*.py $(site25)/piupartslib
+	install -m 0644 piupartslib/*.py $(site26)/piupartslib
 
 check:
 	python piuparts.py unittest

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-01-11 12:50:03 UTC (rev 634)
+++ trunk/debian/changelog	2010-01-23 17:09:53 UTC (rev 635)
@@ -17,7 +17,9 @@
     before this change.
 TODO: make packagesDB.py read config
   * piuparts-slave.py: fix crash when going into sleep when idle. 
-  * Add ${misc:Depends} to Depends in debian/control.
+  * Add ${misc:Depends} to Depends in debian/control. 
+  * Makefile: support python 2.5 and 2.6 instead of 2.4 and 2.5, adjust
+    debian/control accordingly.
 
  -- Holger Levsen <holger at debian.org>  Fri, 18 Dec 2009 13:32:16 +0100
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2010-01-11 12:50:03 UTC (rev 634)
+++ trunk/debian/control	2010-01-23 17:09:53 UTC (rev 635)
@@ -13,7 +13,7 @@
 
 Package: piuparts
 Architecture: all
-Depends: apt, python (>> 2.4), debootstrap (>= 0.3.3), lsof, lsb-release, 
+Depends: apt, python (>> 2.5), debootstrap (>= 0.3.3), lsof, lsb-release, 
     python-debian, ${misc:Depends}
 Suggests: python-rpy, ghostscript
 Description: .deb package installation, upgrading, and removal testing tool