r23179 - in /desktop/unstable/gedit/debian: changelog control control.in patches/80_not_using_localmodlibs.patch

[pochu at users.alioth.debian.org]

Author: pochu
Date: Tue Mar  2 17:37:38 2010
New Revision: 23179

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23179
Log:
* debian/patches/80_not_using_localmodlibs.patch:
  - Patch from Sebastien Bacher to fix the build with Python 2.6
    as the default interpreter. Closes: #571488.
* debian/control.in:
  - Standards-Version is 3.8.3, no changes needed.

Added:
    desktop/unstable/gedit/debian/patches/80_not_using_localmodlibs.patch
Modified:
    desktop/unstable/gedit/debian/changelog
    desktop/unstable/gedit/debian/control
    desktop/unstable/gedit/debian/control.in

Modified: desktop/unstable/gedit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/changelog?rev=23179&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/changelog [utf-8] (original)
+++ desktop/unstable/gedit/debian/changelog [utf-8] Tue Mar  2 17:37:38 2010
@@ -1,3 +1,13 @@
+gedit (2.28.3-2) unstable; urgency=low
+
+  * debian/patches/80_not_using_localmodlibs.patch:
+    - Patch from Sebastien Bacher to fix the build with Python 2.6
+      as the default interpreter. Closes: #571488.
+  * debian/control.in:
+    - Standards-Version is 3.8.3, no changes needed.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 02 Mar 2010 18:34:13 +0100
+
 gedit (2.28.3-1) unstable; urgency=low
 
   * New upstream bugfix release.

Modified: desktop/unstable/gedit/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/control?rev=23179&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/control [utf-8] (original)
+++ desktop/unstable/gedit/debian/control [utf-8] Tue Mar  2 17:37:38 2010
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 5.0.37.2),
                gnome-pkg-tools (>= 0.10),
@@ -33,7 +33,7 @@
 Build-Depends-Indep: libglib2.0-doc,
                      libgtk2.0-doc,
                      libgtksourceview2.0-doc
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 XS-Python-Version: >= 2.5
 Homepage: http://www.gnome.org/projects/gedit/
 

Modified: desktop/unstable/gedit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/control.in?rev=23179&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/control.in [utf-8] (original)
+++ desktop/unstable/gedit/debian/control.in [utf-8] Tue Mar  2 17:37:38 2010
@@ -28,7 +28,7 @@
 Build-Depends-Indep: libglib2.0-doc,
                      libgtk2.0-doc,
                      libgtksourceview2.0-doc
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 XS-Python-Version: >= 2.5
 Homepage: http://www.gnome.org/projects/gedit/
 

Added: desktop/unstable/gedit/debian/patches/80_not_using_localmodlibs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/80_not_using_localmodlibs.patch?rev=23179&op=file
==============================================================================
--- desktop/unstable/gedit/debian/patches/80_not_using_localmodlibs.patch (added)
+++ desktop/unstable/gedit/debian/patches/80_not_using_localmodlibs.patch [utf-8] Tue Mar  2 17:37:38 2010
@@ -1,0 +1,18 @@
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572244
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=600706
+
+diff -Nur -x '*.orig' -x '*~' gedit-2.28.0/configure.ac gedit-2.28.0.new/configure.ac
+--- gedit-2.28.0/configure.ac	2009-11-04 17:54:11.000000000 +0100
++++ gedit-2.28.0.new/configure.ac	2009-11-04 17:54:37.000000000 +0100
+@@ -310,10 +310,9 @@
+ 	PYTHON_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config"
+ 	PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION"
+ 	PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/Makefile"
+-	PYTHON_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
+ 	PYTHON_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
+ 	PYTHON_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
+-	PYTHON_EXTRA_LIBS="$PYTHON_LOCALMODLIBS $PYTHON_BASEMODLIBS $PYTHON_OTHER_LIBS"
++	PYTHON_EXTRA_LIBS="$PYTHON_BASEMODLIBS $PYTHON_OTHER_LIBS"
+ 	AC_SUBST([PYTHON_LIBS])
+ 	AC_SUBST([PYTHON_LIB_LOC])
+ 	AC_SUBST([PYTHON_CFLAGS])