r17484 - in /desktop/experimental/pygtk/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed Nov 12 17:40:20 UTC 2008
Author: joss
Date: Wed Nov 12 17:40:19 2008
New Revision: 17484
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17484
Log:
* Require python 2.5 since pygobject requires it already.
* Do not split debug packages for glade.
* Do not suggest the -dbg packages.
* 01_pygtk-demo.patch: new patch.
+ Use /usr/bin/python instead of python2.X.
+ Put data in /usr/share.
* Install the demos in /usr/share/pygtk accordingly.
* Rename the demos symlink in examples/ into demo, to avoid doing the
symbolic link dance.
* Switch to quilt for patch handling, build-depend on quilt.
* 02_numpy.patch: new patch, mostly taken from Gentoo. Port to numpy.
Closes: #478452.
* 70_autoconf.patch: run autoconf on top of it.
* Switch all dependencies to python-numpy.
* Build-depend on python-numpy-dbg for the debugging build.
* Copy config.{sub,guess} at config time and clean them later to avoid
having them in the diff.
* Build-depend on autotools-dev.
Added:
desktop/experimental/pygtk/debian/patches/01_pygtk-demo.patch
desktop/experimental/pygtk/debian/patches/02_numpy.patch
desktop/experimental/pygtk/debian/patches/70_autoconf.patch
desktop/experimental/pygtk/debian/patches/series
Modified:
desktop/experimental/pygtk/debian/changelog
desktop/experimental/pygtk/debian/control
desktop/experimental/pygtk/debian/control.in
desktop/experimental/pygtk/debian/patches/60_pygtk-wakeupfd-fix.patch
desktop/experimental/pygtk/debian/python-gtk2-doc.install
desktop/experimental/pygtk/debian/python-gtk2-doc.links
desktop/experimental/pygtk/debian/rules
Modified: desktop/experimental/pygtk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/changelog?rev=17484&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/changelog (original)
+++ desktop/experimental/pygtk/debian/changelog Wed Nov 12 17:40:19 2008
@@ -1,4 +1,4 @@
-pygtk (2.13.0-1) UNRELEASED; urgency=low
+pygtk (2.13.0-1) experimental; urgency=low
[ Emilio Pozuelo Monfort ]
* Merge -dbg packages and running the test suite from Ubuntu,
@@ -36,7 +36,6 @@
- debian/rules:
+ Change permission fixup constructs (chmod 755) to use xargs and not
run if nothing has to be fixed.
-
* debian/control.in:
- Bump Standards-Version to 3.8.0.
@@ -75,58 +74,27 @@
* Pass -s -noreset to xvfb-run as otherwise Xvfb will reset when the first
client (test) disconnects and xvfb-run will fail killing Xvfb.
- -- Emilio Pozuelo Monfort <pochu at ubuntu.com> Sat, 27 Sep 2008 02:16:46 +0200
-
-pygtk (2.13.0-0ubuntu3) intrepid; urgency=low
-
- * debian/python-gtk2-dev.install:
- - install pygtk-codegen-2.0 there (lp: #267167)
-
- -- Sebastien Bacher <seb128 at canonical.com> Mon, 08 Sep 2008 10:31:44 +0200
-
-pygtk (2.13.0-0ubuntu2) intrepid; urgency=low
-
- * Add gnome-icon-theme to the bdeps as some buildds might have optical
- drives which require a special icon in the file chooser.
-
- -- Loic Minier <lool at dooz.org> Wed, 03 Sep 2008 09:49:28 +0200
-
-pygtk (2.13.0-0ubuntu1) intrepid; urgency=low
-
- * New upstream release
- - Bump libgtk2.0-dev bdep to >= 2.13.6 and python-gobject-dev bdep to >=
- 2.15.3; also bump libgtk2.0-dev and python-gobject* deps.
- - Drop patch 10_use-default-python as pygtk's codegen copy was dropped; it
- now relies on pygobject's.
- - Drop patch 50_wakeupfd-curruption, merged upstream.
- - Refresh patch 60_pygtk-wakeupfd-fix to apply cleanly.
- - Drop all codegen related code from rules (checks mostly) and drop
- reference in python-gtk2-dev.install.
- * Build-dep on xauth and xfonts-base as xvfb-run needs these and also bdep
- on libgl1-mesa-dri for now until Xvfb can start without AIGLX support or
- this dep is added to the package.
- * Use ${binary:Version} in control instead of ${Source-Version}.
- * Change permission fixup constructs (chmod 755) to use xargs and not run if
- nothing has to be fixed.
-
- -- Loic Minier <lool at dooz.org> Tue, 02 Sep 2008 12:04:12 +0200
-
-
-pygtk (2.12.1-6ubuntu1) intrepid; urgency=low
-
- * Sync on Debian
- * debian/control.in:
- - Build-Depends on xvfb and python-all-dbg
- - list debug variants
- - python-gtk Suggests python-gtk2-dbg
- - updated maintainer information
- * debian/python-gtk2-doc.examples, debian/python-gtk2-doc.install:
- - install pygtk-demo there
- * debian/rules:
- - build debug variant
- - run testsuite during the build
-
- -- Sebastien Bacher <seb128 at canonical.com> Mon, 23 Jun 2008 15:42:00 +0200
+ [ Josselin Mouette ]
+ * Require python 2.5 since pygobject requires it already.
+ * Do not split debug packages for glade.
+ * Do not suggest the -dbg packages.
+ * 01_pygtk-demo.patch: new patch.
+ + Use /usr/bin/python instead of python2.X.
+ + Put data in /usr/share.
+ * Install the demos in /usr/share/pygtk accordingly.
+ * Rename the demos symlink in examples/ into demo, to avoid doing the
+ symbolic link dance.
+ * Switch to quilt for patch handling, build-depend on quilt.
+ * 02_numpy.patch: new patch, mostly taken from Gentoo. Port to numpy.
+ Closes: #478452.
+ * 70_autoconf.patch: run autoconf on top of it.
+ * Switch all dependencies to python-numpy.
+ * Build-depend on python-numpy-dbg for the debugging build.
+ * Copy config.{sub,guess} at config time and clean them later to avoid
+ having them in the diff.
+ * Build-depend on autotools-dev.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 12 Nov 2008 17:36:25 +0100
pygtk (2.12.1-6) unstable; urgency=low
Modified: desktop/experimental/pygtk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/control?rev=17484&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/control (original)
+++ desktop/experimental/pygtk/debian/control Wed Nov 12 17:40:19 2008
@@ -3,28 +3,30 @@
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
Uploaders: Torsten Landschoff <torsten at debian.org>,
- Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at ubuntu.com>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
+ Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
Build-Depends: debhelper (>= 5),
python-support (>= 0.7.6),
gnome-pkg-tools (>= 0.10),
cdbs,
+ autotools-dev,
+ quilt,
xvfb, xauth, xfonts-base, libgl1-mesa-dri,
python2.5-dev (>= 2.5.2-5),
- python-all-dev (>= 2.3.5-11),
+ python-all-dev (>= 2.5),
python-all-dbg,
libgtk2.0-dev (>= 2.13.6),
libglib2.0-dev (>= 2.8.0),
libpango1.0-dev (>= 1.16.0),
libatk1.0-dev (>= 1.12.0),
libglade2-dev (>= 2.5.0),
- python-numeric (>= 24.2-3),
+ python-numpy-dbg (>= 1:1.0.4-1~),
python-cairo-dev (>= 1.0.2),
python-gobject-dev (>= 2.15.3),
xsltproc,
docbook-xsl,
autotools-dev,
gnome-icon-theme
-XS-Python-Version: >= 2.3
+XS-Python-Version: >= 2.5
Standards-Version: 3.8.0
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/experimental/pygtk/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/pygtk/
@@ -36,11 +38,10 @@
python2.5 (>= 2.5.2-5),
${shlibs:Depends},
${misc:Depends}
-Python-Depends: python-numeric (>= 24.2-3),
+Python-Depends: python-numpy,
python-cairo (>= 1.0.2-1.1),
python-gobject (>= 2.15.3)
-Suggests: python-gtk2-doc,
- python-gtk2-dbg
+Suggests: python-gtk2-doc
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Conflicts: python-gdk-imlib,
@@ -59,8 +60,9 @@
Architecture: any
Priority: extra
Depends: python-gtk2 (= ${binary:Version}),
+ python-glade2 (= ${binary:Version}),
python-dbg,
- python-numeric-dbg,
+ python-numpy-dbg,
python-cairo-dbg,
python-gobject-dbg,
${shlibs:Depends}
@@ -103,8 +105,7 @@
${shlibs:Depends},
${misc:Depends},
python-gtk2 (= ${binary:Version})
-Suggests: python-gtk2-doc,
- python-glade2-dbg
+Suggests: python-gtk2-doc
Conflicts: python-gdk-imlib,
python-glade,
python-gnome,
@@ -117,21 +118,6 @@
makes it very easy to create a user interface. In the target
application you just need to load the interface description from
the .glade file instead of constructing the GUI at runtime.
-
-Package: python-glade2-dbg
-Architecture: any
-Priority: extra
-Depends: python-glade2 (= ${binary:Version}),
- python-dbg,
- python-gtk2-dbg,
- ${shlibs:Depends}
-Description: GTK+ bindings: Glade support (debug extension)
- Contains bindings for the glade library from use within Python. Glade
- makes it very easy to create a user interface. In the target
- application you just need to load the interface description from
- the .glade file instead of constructing the GUI at runtime.
- .
- This package contains the extension built for the Python debug interpreter.
Package: python-gtk2-doc
Architecture: all
Modified: desktop/experimental/pygtk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/control.in?rev=17484&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/control.in (original)
+++ desktop/experimental/pygtk/debian/control.in Wed Nov 12 17:40:19 2008
@@ -8,23 +8,25 @@
python-support (>= 0.7.6),
gnome-pkg-tools (>= 0.10),
cdbs,
+ autotools-dev,
+ quilt,
xvfb, xauth, xfonts-base, libgl1-mesa-dri,
python2.5-dev (>= 2.5.2-5),
- python-all-dev (>= 2.3.5-11),
+ python-all-dev (>= 2.5),
python-all-dbg,
libgtk2.0-dev (>= 2.13.6),
libglib2.0-dev (>= 2.8.0),
libpango1.0-dev (>= 1.16.0),
libatk1.0-dev (>= 1.12.0),
libglade2-dev (>= 2.5.0),
- python-numeric (>= 24.2-3),
+ python-numpy-dbg (>= 1:1.0.4-1~),
python-cairo-dev (>= 1.0.2),
python-gobject-dev (>= 2.15.3),
xsltproc,
docbook-xsl,
autotools-dev,
gnome-icon-theme
-XS-Python-Version: >= 2.3
+XS-Python-Version: >= 2.5
Standards-Version: 3.8.0
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/experimental/pygtk/
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/pygtk/
@@ -36,11 +38,10 @@
python2.5 (>= 2.5.2-5),
${shlibs:Depends},
${misc:Depends}
-Python-Depends: python-numeric (>= 24.2-3),
+Python-Depends: python-numpy,
python-cairo (>= 1.0.2-1.1),
python-gobject (>= 2.15.3)
-Suggests: python-gtk2-doc,
- python-gtk2-dbg
+Suggests: python-gtk2-doc
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Conflicts: python-gdk-imlib,
@@ -59,8 +60,9 @@
Architecture: any
Priority: extra
Depends: python-gtk2 (= ${binary:Version}),
+ python-glade2 (= ${binary:Version}),
python-dbg,
- python-numeric-dbg,
+ python-numpy-dbg,
python-cairo-dbg,
python-gobject-dbg,
${shlibs:Depends}
@@ -103,8 +105,7 @@
${shlibs:Depends},
${misc:Depends},
python-gtk2 (= ${binary:Version})
-Suggests: python-gtk2-doc,
- python-glade2-dbg
+Suggests: python-gtk2-doc
Conflicts: python-gdk-imlib,
python-glade,
python-gnome,
@@ -117,21 +118,6 @@
makes it very easy to create a user interface. In the target
application you just need to load the interface description from
the .glade file instead of constructing the GUI at runtime.
-
-Package: python-glade2-dbg
-Architecture: any
-Priority: extra
-Depends: python-glade2 (= ${binary:Version}),
- python-dbg,
- python-gtk2-dbg,
- ${shlibs:Depends}
-Description: GTK+ bindings: Glade support (debug extension)
- Contains bindings for the glade library from use within Python. Glade
- makes it very easy to create a user interface. In the target
- application you just need to load the interface description from
- the .glade file instead of constructing the GUI at runtime.
- .
- This package contains the extension built for the Python debug interpreter.
Package: python-gtk2-doc
Architecture: all
Added: desktop/experimental/pygtk/debian/patches/01_pygtk-demo.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/patches/01_pygtk-demo.patch?rev=17484&op=file
==============================================================================
--- desktop/experimental/pygtk/debian/patches/01_pygtk-demo.patch (added)
+++ desktop/experimental/pygtk/debian/patches/01_pygtk-demo.patch Wed Nov 12 17:40:19 2008
@@ -1,0 +1,14 @@
+Index: pygtk-2.13.0/examples/pygtk-demo/pygtk-demo.in
+===================================================================
+--- pygtk-2.13.0.orig/examples/pygtk-demo/pygtk-demo.in 2008-04-27 11:51:14.000000000 +0200
++++ pygtk-2.13.0/examples/pygtk-demo/pygtk-demo.in 2008-11-12 17:59:10.695490976 +0100
+@@ -1,7 +1,7 @@
+-#! @PYTHON@
++#! /usr/bin/python
+
+ import sys
+ import os.path
+-pygtklibdir = os.path.join("@libdir@", "pygtk", "2.0")
++pygtklibdir = os.path.join("/usr/share", "pygtk", "2.0")
+ sys.path.insert(0, pygtklibdir)
+ execfile(os.path.join(pygtklibdir, "pygtk-demo.py"))
Added: desktop/experimental/pygtk/debian/patches/02_numpy.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/patches/02_numpy.patch?rev=17484&op=file
==============================================================================
--- desktop/experimental/pygtk/debian/patches/02_numpy.patch (added)
+++ desktop/experimental/pygtk/debian/patches/02_numpy.patch Wed Nov 12 17:40:19 2008
@@ -1,0 +1,81 @@
+Index: pygtk-2.13.0/README
+===================================================================
+--- pygtk-2.13.0.orig/README 2008-11-12 18:04:27.870985209 +0100
++++ pygtk-2.13.0/README 2008-11-12 18:04:34.210985126 +0100
+@@ -54,7 +54,7 @@ Requirements
+ GTK+ 2.14.0 or higher for 2.14 API
+ * libglade 2.5.0 or higher (optional)
+ * pycairo 1.0.2 or higher (optional)
+- * Numeric (optional)
++ * numpy (optional)
+
+ This release is supporting the following GTK+ releases:
+
+Index: pygtk-2.13.0/configure.ac
+===================================================================
+--- pygtk-2.13.0.orig/configure.ac 2008-11-12 17:59:44.822987000 +0100
++++ pygtk-2.13.0/configure.ac 2008-11-12 18:01:50.203309500 +0100
+@@ -336,18 +336,19 @@ case $gdk_target in
+ esac
+
+
+-dnl checks to see if Numeric Python is installed.
++dnl checks to see if numpy is installed.
+ AC_ARG_ENABLE(numpy,
+ AC_HELP_STRING([--disable-numpy], [Disable numeric python features]),,
+ enable_numpy=yes)
+
+ if test "x$enable_numpy" != xno; then
+ save_CPPFLAGS="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+- AC_CHECK_HEADER([Numeric/arrayobject.h],
++ numpy_INCLUDES=`$PYTHON -c "import numpy; print numpy.get_include()"`
++ CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES -I$numpy_INCLUDES"
++ AC_CHECK_HEADER([numpy/arrayobject.h],
+ [AC_DEFINE(HAVE_NUMPY,,[whether to include numeric python support])],,
+ [#include <Python.h>])
+- CPPFLAGS="$save_CPPFLAGS"
++ CPPFLAGS="$save_CPPFLAGS -I$numpy_INCLUDES"
+ fi
+
+
+Index: pygtk-2.13.0/gtk/gdk.override
+===================================================================
+--- pygtk-2.13.0.orig/gtk/gdk.override 2008-11-12 18:04:06.139490006 +0100
++++ pygtk-2.13.0/gtk/gdk.override 2008-11-12 18:04:11.850987486 +0100
+@@ -43,7 +43,7 @@ headers
+ #define GDK_DISPLAY(object) (GDK_DISPLAY_OBJECT(object))
+
+ #ifdef HAVE_NUMPY
+-# include <Numeric/arrayobject.h>
++# include <numpy/arrayobject.h>
+ static int have_numpy(void);
+ #endif
+
+Index: pygtk-2.13.0/setup.py
+===================================================================
+--- pygtk-2.13.0.orig/setup.py 2008-11-12 18:02:06.030988087 +0100
++++ pygtk-2.13.0/setup.py 2008-11-12 18:02:57.707318739 +0100
+@@ -228,16 +228,16 @@ if pango.can_build():
+ data_files.append((DEFS_DIR, ('pangocairo.defs',)))
+ GLOBAL_MACROS.append(('HAVE_PYCAIRO',1))
+ if gtk.can_build():
+- if '--disable-numeric' in sys.argv:
+- sys.argv.remove('--disable-numeric')
++ if '--disable-numpy' in sys.argv:
++ sys.argv.remove('--disable-numpy')
+ else:
+ try:
+- import Numeric
+- Numeric # pyflakes
++ import numpy
++ numpy # pyflakes
+ GLOBAL_MACROS.append(('HAVE_NUMPY', 1))
+ except ImportError:
+- print ('* Numeric module could not be found, '
+- 'will build without Numeric support.')
++ print ('* numpy module could not be found, '
++ 'will build without numpy support.')
+ ext_modules.append(gtk)
+ data_files.append((os.path.join(INCLUDE_DIR, 'pygtk'), ('gtk/pygtk.h',)))
+ data_files.append((DEFS_DIR, ('gtk/gdk.defs', 'gtk/gdk-types.defs',
Modified: desktop/experimental/pygtk/debian/patches/60_pygtk-wakeupfd-fix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/patches/60_pygtk-wakeupfd-fix.patch?rev=17484&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/patches/60_pygtk-wakeupfd-fix.patch (original)
+++ desktop/experimental/pygtk/debian/patches/60_pygtk-wakeupfd-fix.patch Wed Nov 12 17:40:19 2008
@@ -1,6 +1,8 @@
---- gtk/gtk.override.orig 2008-06-07 14:13:22.259007849 +0200
-+++ gtk/gtk.override 2008-06-07 15:07:41.158504434 +0200
-@@ -37,6 +37,8 @@
+Index: pygtk-2.13.0/gtk/gtk.override
+===================================================================
+--- pygtk-2.13.0.orig/gtk/gtk.override 2008-11-12 17:59:15.427489178 +0100
++++ pygtk-2.13.0/gtk/gtk.override 2008-11-12 17:59:19.103489690 +0100
+@@ -37,6 +37,8 @@ extern PyTypeObject PyGdkCairoContext_Ty
#include "pygtk-private.h"
@@ -9,7 +11,7 @@
#define PYGTK_CONTAINER_FOREACH 0
#define PYGTK_CONTAINER_FORALL 1
#define countof(array) (sizeof(array)/sizeof(array[0]))
-@@ -1068,7 +1070,10 @@
+@@ -1069,7 +1071,10 @@ static gboolean
pygtk_main_watch_prepare(GSource *source,
int *timeout)
{
@@ -20,7 +22,7 @@
/* Python only invokes signal handlers from the main thread,
* so if a thread other than the main thread receives the signal
-@@ -1102,6 +1107,11 @@
+@@ -1103,6 +1108,11 @@ pygtk_main_watch_prepare(GSource *source
real_source->fd.events = G_IO_IN | G_IO_HUP | G_IO_ERR;
g_source_add_poll(source, &real_source->fd);
@@ -32,7 +34,7 @@
PySignal_SetWakeupFd(real_source->fds[1]);
#else /* !HAVE_PYSIGNAL_SETWAKEUPFD */
-@@ -1121,8 +1131,18 @@
+@@ -1122,8 +1132,18 @@ pygtk_main_watch_check(GSource *source)
{
PyGILState_STATE state;
Added: desktop/experimental/pygtk/debian/patches/70_autoconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/patches/70_autoconf.patch?rev=17484&op=file
==============================================================================
--- desktop/experimental/pygtk/debian/patches/70_autoconf.patch (added)
+++ desktop/experimental/pygtk/debian/patches/70_autoconf.patch Wed Nov 12 17:40:19 2008
@@ -1,0 +1,63 @@
+Index: pygtk-2.13.0/configure
+===================================================================
+--- pygtk-2.13.0.orig/configure 2008-11-12 18:05:27.582994347 +0100
++++ pygtk-2.13.0/configure 2008-11-12 18:05:32.287485211 +0100
+@@ -12539,10 +12539,11 @@ fi
+
+ if test "x$enable_numpy" != xno; then
+ save_CPPFLAGS="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+- { echo "$as_me:$LINENO: checking for Numeric/arrayobject.h" >&5
+-echo $ECHO_N "checking for Numeric/arrayobject.h... $ECHO_C" >&6; }
+-if test "${ac_cv_header_Numeric_arrayobject_h+set}" = set; then
++ numpy_INCLUDES=`$PYTHON -c "import numpy; print numpy.get_include()"`
++ CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES -I$numpy_INCLUDES"
++ { echo "$as_me:$LINENO: checking for numpy/arrayobject.h" >&5
++echo $ECHO_N "checking for numpy/arrayobject.h... $ECHO_C" >&6; }
++if test "${ac_cv_header_numpy_arrayobject_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -12553,7 +12554,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <Python.h>
+
+-#include <Numeric/arrayobject.h>
++#include <numpy/arrayobject.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+@@ -12572,19 +12573,19 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+- ac_cv_header_Numeric_arrayobject_h=yes
++ ac_cv_header_numpy_arrayobject_h=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+- ac_cv_header_Numeric_arrayobject_h=no
++ ac_cv_header_numpy_arrayobject_h=no
+ fi
+
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_header_Numeric_arrayobject_h" >&5
+-echo "${ECHO_T}$ac_cv_header_Numeric_arrayobject_h" >&6; }
+-if test $ac_cv_header_Numeric_arrayobject_h = yes; then
++{ echo "$as_me:$LINENO: result: $ac_cv_header_numpy_arrayobject_h" >&5
++echo "${ECHO_T}$ac_cv_header_numpy_arrayobject_h" >&6; }
++if test $ac_cv_header_numpy_arrayobject_h = yes; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_NUMPY
+@@ -12593,7 +12594,7 @@ _ACEOF
+ fi
+
+
+- CPPFLAGS="$save_CPPFLAGS"
++ CPPFLAGS="$save_CPPFLAGS -I$numpy_INCLUDES"
+ fi
+
+
Added: desktop/experimental/pygtk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/patches/series?rev=17484&op=file
==============================================================================
--- desktop/experimental/pygtk/debian/patches/series (added)
+++ desktop/experimental/pygtk/debian/patches/series Wed Nov 12 17:40:19 2008
@@ -1,0 +1,4 @@
+01_pygtk-demo.patch
+02_numpy.patch
+60_pygtk-wakeupfd-fix.patch
+70_autoconf.patch
Modified: desktop/experimental/pygtk/debian/python-gtk2-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/python-gtk2-doc.install?rev=17484&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/python-gtk2-doc.install (original)
+++ desktop/experimental/pygtk/debian/python-gtk2-doc.install Wed Nov 12 17:40:19 2008
@@ -1,3 +1,3 @@
debian/tmp/usr/share/gtk-doc
debian/tmp/usr/bin/pygtk-demo
-debian/tmp/usr/lib/pygtk/2.0
+debian/tmp/usr/lib/pygtk/2.0 usr/share/pygtk
Modified: desktop/experimental/pygtk/debian/python-gtk2-doc.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/python-gtk2-doc.links?rev=17484&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/python-gtk2-doc.links (original)
+++ desktop/experimental/pygtk/debian/python-gtk2-doc.links Wed Nov 12 17:40:19 2008
@@ -1,2 +1,2 @@
/usr/share/gtk-doc/html/pygtk /usr/share/doc/python-gtk2-doc/html
-/usr/lib/pygtk/2.0/demos /usr/share/doc/python-gtk2-doc/examples/demos
+/usr/share/pygtk/2.0/demos /usr/share/doc/python-gtk2-doc/examples/demo
Modified: desktop/experimental/pygtk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygtk/debian/rules?rev=17484&op=diff
==============================================================================
--- desktop/experimental/pygtk/debian/rules (original)
+++ desktop/experimental/pygtk/debian/rules Wed Nov 12 17:40:19 2008
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
@@ -21,7 +21,14 @@
.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
-build-%/configure-stamp:
+guessub-stamp:
+ cp config.sub config.sub.back
+ cp config.guess config.guess.back
+ cp -f /usr/share/misc/config.sub config.sub
+ cp -f /usr/share/misc/config.guess config.guess
+ touch $@
+
+build-%/configure-stamp: apply-patches guessub-stamp
dh_testdir
mkdir -p build-$*
cd build-$* && \
@@ -48,7 +55,7 @@
$(MAKE) -C dbg-build-$*
touch $@
-build: apply-patches $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp)
+build: $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp)
install-clean:
dh_testdir
@@ -78,9 +85,6 @@
$(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-gtk2-dbg
find debian/python-gtk2-dbg ! -type d ! -name '*.so' | xargs rm -f
find debian/python-gtk2-dbg -depth -empty -exec rmdir {} \;
- mkdir -p debian/python-glade2-dbg/usr/lib/python$*/site-packages/gtk-2.0/gtk
- mv debian/python-gtk2-dbg/usr/lib/python$*/site-packages/gtk-2.0/gtk/glade.so \
- debian/python-glade2-dbg/usr/lib/python$*/site-packages/gtk-2.0/gtk/
install: build install-clean $(PYVERS:%=install-%) $(PYVERS:%=dbg-install-%)
# check that all builds with various Python runtimes produced the same
@@ -115,12 +119,9 @@
dh_testroot
rm -Rf debian/tmp-*
rm -Rf build-* dbg-build-*
- -test -f config.sub && \
- test -r /usr/share/misc/config.sub && \
- cp -f /usr/share/misc/config.sub config.sub
- -test -f config.guess && \
- test -r /usr/share/misc/config.guess && \
- cp -f /usr/share/misc/config.guess config.guess
+ -mv config.sub.back config.sub
+ -mv config.guess.back config.guess
+ rm -f guessub-stamp
dh_clean
# Build architecture-independent files here.
@@ -136,7 +137,7 @@
dh_fixperms -i
# More permission fixing
grep -rlZ "^#\!.*python" debian/python-gtk2-dev/usr | xargs -0r chmod 755
- dh_pysupport -ppython-gtk2-doc /usr/lib/pygtk
+ dh_pysupport -ppython-gtk2-doc /usr/share/pygtk
dh_installdeb -i
dh_gencontrol -i
dh_md5sums -i
@@ -149,12 +150,9 @@
dh_installdocs -s
dh_installexamples -s
dh_installchangelogs ChangeLog -s
- dh_strip -ppython-gtk2 --dbg-package=python-gtk2-dbg
+ dh_strip -s --dbg-package=python-gtk2-dbg
rm -rf debian/python-gtk2-dbg/usr/share/doc/python-gtk2-dbg
ln -s python-gtk2 debian/python-gtk2-dbg/usr/share/doc/python-gtk2-dbg
- dh_strip -ppython-glade2 --dbg-package=python-glade2-dbg
- rm -rf debian/python-glade2-dbg/usr/share/doc/python-glade2-dbg
- ln -s python-glade2 debian/python-glade2-dbg/usr/share/doc/python-glade2-dbg
dh_link -s
dh_compress -s -X.py -X.glade
dh_fixperms -s
More information about the pkg-gnome-commits
mailing list