r22424 - in /packages/unstable/jhbuild/debian: changelog patches/ rules

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Sat Nov 21 15:33:07 UTC 2009


Author: pochu
Date: Sat Nov 21 15:33:06 2009
New Revision: 22424

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22424
Log:
* debian/patches/01_import_from_pkgdatadir.patch,
  debian/rules:
  - Remove hack to install the python modules in /usr/share/jhbuild
    and the patch to make jhbuild import them from that location.
    Set pythondir=/usr/share/jhbuild instead and pass it to make install.

Removed:
    packages/unstable/jhbuild/debian/patches/
Modified:
    packages/unstable/jhbuild/debian/changelog
    packages/unstable/jhbuild/debian/rules

Modified: packages/unstable/jhbuild/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/jhbuild/debian/changelog?rev=22424&op=diff
==============================================================================
--- packages/unstable/jhbuild/debian/changelog [utf-8] (original)
+++ packages/unstable/jhbuild/debian/changelog [utf-8] Sat Nov 21 15:33:06 2009
@@ -1,3 +1,13 @@
+jhbuild (2.28.0-2) UNRELEASED; urgency=low
+
+  * debian/patches/01_import_from_pkgdatadir.patch,
+    debian/rules:
+    - Remove hack to install the python modules in /usr/share/jhbuild
+      and the patch to make jhbuild import them from that location.
+      Set pythondir=/usr/share/jhbuild instead and pass it to make install.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 17 Nov 2009 10:25:45 +0100
+
 jhbuild (2.28.0-1) unstable; urgency=low
 
   [ Loic Minier ]

Modified: packages/unstable/jhbuild/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/jhbuild/debian/rules?rev=22424&op=diff
==============================================================================
--- packages/unstable/jhbuild/debian/rules [utf-8] (original)
+++ packages/unstable/jhbuild/debian/rules [utf-8] Sat Nov 21 15:33:06 2009
@@ -10,10 +10,9 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-doc-installation=yes
 
+DEB_MAKE_ENVVARS += MAKEFLAGS=pythondir=/usr/share/jhbuild
+
 install/jhbuild::
-	mv debian/jhbuild/usr/lib/python*/*-packages/jhbuild \
-	   debian/jhbuild/usr/share/jhbuild
-	cd debian/jhbuild/usr && rmdir -p lib/python*/*-packages
 	rm -r debian/jhbuild/usr/share/jhbuild/jhbuild/cut_n_paste
 
 binary-install/jhbuild::




More information about the pkg-gnome-commits mailing list