[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.52-4-g9497c7b

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 9497c7b6865076090e752528a61c77c85bfab9a1
Author: Andreas Beckmann <anbe at debian.org>
Date:   Fri May 24 10:33:16 2013 +0200

    remove remaining support for $libdir/python2.6/dist-packages
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/Makefile b/Makefile
index c20cd71..d101f66 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,6 @@ man1dir = $(mandir)/man1
 man8dir = $(mandir)/man8
 libdir = $(prefix)/lib
 docdir = $(prefix)/share/doc/piuparts/
-site26 = $(libdir)/python2.6/dist-packages
 site27 = $(libdir)/python2.7/dist-packages
 htdocsdir	 = $(sharedir)/piuparts/htdocs
 etcdir = $(prefix)/etc
@@ -120,9 +119,7 @@ install: build-stamp
 	install -d $(DESTDIR)$(sharedir)/piuparts
 	install -m 0755 piuparts-slave piuparts-master piuparts-master-backend piuparts-report piuparts-analyze $(DESTDIR)$(sharedir)/piuparts/
 
-	install -d $(DESTDIR)$(site26)/piupartslib
 	install -d $(DESTDIR)$(site27)/piupartslib
-	install -m 0644 piupartslib/*.py $(DESTDIR)$(site26)/piupartslib/
 	install -m 0644 piupartslib/*.py $(DESTDIR)$(site27)/piupartslib/
 
 	install -d $(DESTDIR)$(sharedir)/piuparts/lib
diff --git a/debian/changelog b/debian/changelog
index 3d428d2..b6f4461 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ piuparts (0.53) UNRELEASED; urgency=low
   * piuparts-analyze.py:
   * piuparts-report.py:
   * Makefile:
+    - Stop installing python modules in $libdir/python2.6/dist-packages.
 
   [ David Steele ]
   * Update python Requires to 2.7 (for argparse)
diff --git a/instances/piuparts.conf.goldwasser b/instances/piuparts.conf.goldwasser
index ff2a21b..62be96a 100644
--- a/instances/piuparts.conf.goldwasser
+++ b/instances/piuparts.conf.goldwasser
@@ -63,7 +63,7 @@ piuparts-command =
 	env PYTHONPATH=%(PYTHONPATH)s
 	timeout -s INT -k 5m 35m
 	/srv/piuparts.debian.org/sbin/piuparts
-PYTHONPATH = /srv/piuparts.debian.org/lib/python2.6/dist-packages:/srv/piuparts.debian.org/lib/python2.7/dist-packages
+PYTHONPATH = /srv/piuparts.debian.org/lib/python2.7/dist-packages
 master-directory = /srv/piuparts.debian.org/master
 slave-directory = /srv/piuparts.debian.org/slave
 basetgz-directory = /srv/piuparts.debian.org/slave/basetgz
diff --git a/instances/piuparts.conf.pejacevic b/instances/piuparts.conf.pejacevic
index b01b9fb..a6af8a2 100644
--- a/instances/piuparts.conf.pejacevic
+++ b/instances/piuparts.conf.pejacevic
@@ -85,7 +85,7 @@ piuparts-command =
 	env PYTHONPATH=%(PYTHONPATH)s
 	timeout -s INT -k 5m 35m
 	/srv/piuparts.debian.org/sbin/piuparts
-PYTHONPATH = /srv/piuparts.debian.org/lib/python2.6/dist-packages:/srv/piuparts.debian.org/lib/python2.7/dist-packages
+PYTHONPATH = /srv/piuparts.debian.org/lib/python2.7/dist-packages
 master-directory = /srv/piuparts.debian.org/master
 slave-directory = /srv/piuparts.debian.org/slave
 basetgz-directory = /srv/piuparts.debian.org/slave/basetgz

-- 
piuparts git repository