r23151 - in /desktop/unstable/alacarte/debian: changelog patches/30-python_private_dir.patch patches/series rules

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Feb 27 13:16:00 2010
New Revision: 23151

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23151
Log:
* 30-python_private_dir.patch: new patch. Modify sys.path to use a 
  private directory.
* Actually install the Python files into a private directory.
  Closes: #529495.

Added:
    desktop/unstable/alacarte/debian/patches/30-python_private_dir.patch
Modified:
    desktop/unstable/alacarte/debian/changelog
    desktop/unstable/alacarte/debian/patches/series
    desktop/unstable/alacarte/debian/rules

Modified: desktop/unstable/alacarte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/alacarte/debian/changelog?rev=23151&op=diff
==============================================================================
--- desktop/unstable/alacarte/debian/changelog [utf-8] (original)
+++ desktop/unstable/alacarte/debian/changelog [utf-8] Sat Feb 27 13:16:00 2010
@@ -1,4 +1,4 @@
-alacarte (0.12.4-2) UNRELEASED; urgency=low
+alacarte (0.12.4-2) unstable; urgency=low
 
   * 03-bind_textdomain_codeset.patch: patch from Matt Kraai. Set the 
     character set to UTF-8 since this is what GTK+ expects.
@@ -7,8 +7,12 @@
   * 01-new_item_location.patch: new patch. Pass menu reference directly 
     instead of using the text ID, for which there can be duplicates.
     Closes: #461318.
-
- -- Josselin Mouette <joss at debian.org>  Wed, 11 Nov 2009 16:53:52 +0100
+  * 30-python_private_dir.patch: new patch. Modify sys.path to use a 
+    private directory.
+  * Actually install the Python files into a private directory.
+    Closes: #529495.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 27 Feb 2010 14:10:37 +0100
 
 alacarte (0.12.4-1) unstable; urgency=low
 

Added: desktop/unstable/alacarte/debian/patches/30-python_private_dir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/alacarte/debian/patches/30-python_private_dir.patch?rev=23151&op=file
==============================================================================
--- desktop/unstable/alacarte/debian/patches/30-python_private_dir.patch (added)
+++ desktop/unstable/alacarte/debian/patches/30-python_private_dir.patch [utf-8] Sat Feb 27 13:16:00 2010
@@ -1,0 +1,12 @@
+Index: alacarte-0.12.4/alacarte.in
+===================================================================
+--- alacarte-0.12.4.orig/alacarte.in	2010-02-27 14:08:06.801032929 +0100
++++ alacarte-0.12.4/alacarte.in	2010-02-27 14:14:56.900530062 +0100
+@@ -19,6 +19,7 @@
+ #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+ import sys
++sys.path.insert(0,'/usr/share/alacarte')
+ from Alacarte.MainWindow import MainWindow
+ 
+ def main():

Modified: desktop/unstable/alacarte/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/alacarte/debian/patches/series?rev=23151&op=diff
==============================================================================
--- desktop/unstable/alacarte/debian/patches/series [utf-8] (original)
+++ desktop/unstable/alacarte/debian/patches/series [utf-8] Sat Feb 27 13:16:00 2010
@@ -1,3 +1,4 @@
 01-new_item_location.patch
 02-fix_delete_undo.patch
 03-bind_textdomain_codeset.patch
+30-python_private_dir.patch

Modified: desktop/unstable/alacarte/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/alacarte/debian/rules?rev=23151&op=diff
==============================================================================
--- desktop/unstable/alacarte/debian/rules [utf-8] (original)
+++ desktop/unstable/alacarte/debian/rules [utf-8] Sat Feb 27 13:16:00 2010
@@ -10,5 +10,7 @@
 
 DEB_CONFIGURE_SCRIPT_ENV += PYTHON="/usr/bin/python"
 
+DEB_MAKE_EXTRA_ARGS += pythondir=/usr/share/alacarte
+
 install/alacarte::
 	dh_pysupport