r35973 - in /desktop/experimental/pygobject/debian: changelog rules

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Tue Oct 16 05:18:02 2012
New Revision: 35973

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35973
Log:
debian/rules: Update handling of site-packages directory, as this version
now ships an .egg-info.

Modified:
    desktop/experimental/pygobject/debian/changelog
    desktop/experimental/pygobject/debian/rules

Modified: desktop/experimental/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/changelog?rev=35973&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/changelog [utf-8] (original)
+++ desktop/experimental/pygobject/debian/changelog [utf-8] Tue Oct 16 05:18:02 2012
@@ -1,6 +1,8 @@
 pygobject (3.4.1-1) UNRELEASED; urgency=low
 
   * New upstream bug fix release.
+  * debian/rules: Update handling of site-packages directory, as this version
+    now ships an .egg-info.
 
  -- Martin Pitt <mpitt at debian.org>  Tue, 16 Oct 2012 06:57:55 +0200
 

Modified: desktop/experimental/pygobject/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/rules?rev=35973&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/rules [utf-8] (original)
+++ desktop/experimental/pygobject/debian/rules [utf-8] Tue Oct 16 05:18:02 2012
@@ -88,7 +88,8 @@
 	# remove stuff that we do not need in python-gi
 	-find debian/python-gi/ ! -path '*/usr/lib/*' -delete
 	find debian/python-gi/ \( -name '*.pyc' -o -name '*.pyo' -o -name '*.la' \) -delete
-	# dh_python2 trips over this empty dir in the sanity check for >= 2.6, so remove it
+	# Make dh_python2 happy; there is no --install-layout option for pygobject
+	mv debian/python-gi/usr/lib/python2.$*/site-packages/* debian/python-gi/usr/lib/python2.$*/dist-packages/
 	rmdir debian/python-gi/usr/lib/python2.$*/site-packages
 	rm -r debian/python-gi/usr/lib/pkgconfig