r29398 - in /desktop/experimental/pygobject/debian: ./ patches/
mpitt at users.alioth.debian.org
mpitt at users.alioth.debian.org
Wed Aug 17 09:12:00 UTC 2011
Author: mpitt
Date: Wed Aug 17 09:11:59 2011
New Revision: 29398
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29398
Log:
New upstream release 2.90.1. Update package for split build with pygobject-2.
* New upstream release:
- New rewritten invoker is twice as fast and easier to extend and debug
- Complete break from static bindings so we may improve the core without
breaking legacy APIs
- Better type handling
- Parallel installable with PyGObject 2.28 for legacy binding support
(2.28 must be compiled with –disable-introspection)
- Fixed object array handling
- Added more overrides for PyGTK API emulation
- Support for function calling using keyword arguments
- GObject and GLib symbols can now have overrides
- All static bit removed or made private
- GVariants now work from callback returns
- Note that this now enforces a consistent move to the GI bindings. I. e.
you need to change all "import gobject" statements into "from
gi.repository import GObject", same for glib.
* Drop debian/patches/00git_*.patch, all upstream.
* Drop 20_deprecated_spam.patch, obsolete.
* debian/control.in: The static bindings (glib, gobject, pygtk, gtk, etc.)
are deprecated and are now shipped in the separate packages
python-gobject-2{,-dbg}. Add a dependency to these for the time being to
not break backwards compatibility. Once all packages have been ported to
use the GI bindings, this dependency and pygobject-2 will be dropped.
* debian/control.in: Update package descriptions to point out that this is
now GI only.
* debian/control.in, debian/rules: Drop python-gobject-dev package. It's
not relevant any more for this version, and now built from the
pygobject-2 source package.
Removed:
desktop/experimental/pygobject/debian/patches/00git_cairo_init.patch
desktop/experimental/pygobject/debian/patches/00git_enum_properties.patch
desktop/experimental/pygobject/debian/patches/00git_gio_test.patch
desktop/experimental/pygobject/debian/patches/00git_messagebox_type.patch
desktop/experimental/pygobject/debian/patches/00git_python3-maketrans.patch
desktop/experimental/pygobject/debian/patches/00git_python3_build.patch
desktop/experimental/pygobject/debian/patches/00git_test_case_hang.patch
desktop/experimental/pygobject/debian/patches/00git_textiter_crash.patch
desktop/experimental/pygobject/debian/patches/20_deprecated_spam.patch
desktop/experimental/pygobject/debian/python-gobject-dev.links
Modified:
desktop/experimental/pygobject/debian/changelog
desktop/experimental/pygobject/debian/control
desktop/experimental/pygobject/debian/control.in
desktop/experimental/pygobject/debian/patches/series
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=29398&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/changelog [utf-8] (original)
+++ desktop/experimental/pygobject/debian/changelog [utf-8] Wed Aug 17 09:11:59 2011
@@ -1,8 +1,36 @@
-pygobject (2.28.6-5) UNRELEASED; urgency=low
+pygobject (2.90.1-1) UNRELEASED; urgency=low
* debian/control.in: Update Vcs-* for experimental branch.
-
- -- Martin Pitt <mpitt at debian.org> Wed, 17 Aug 2011 10:04:21 +0200
+ * New upstream release:
+ - New rewritten invoker is twice as fast and easier to extend and debug
+ - Complete break from static bindings so we may improve the core without
+ breaking legacy APIs
+ - Better type handling
+ - Parallel installable with PyGObject 2.28 for legacy binding support
+ (2.28 must be compiled with –disable-introspection)
+ - Fixed object array handling
+ - Added more overrides for PyGTK API emulation
+ - Support for function calling using keyword arguments
+ - GObject and GLib symbols can now have overrides
+ - All static bit removed or made private
+ - GVariants now work from callback returns
+ - Note that this now enforces a consistent move to the GI bindings. I. e.
+ you need to change all "import gobject" statements into "from
+ gi.repository import GObject", same for glib.
+ * Drop debian/patches/00git_*.patch, all upstream.
+ * Drop 20_deprecated_spam.patch, obsolete.
+ * debian/control.in: The static bindings (glib, gobject, pygtk, gtk, etc.)
+ are deprecated and are now shipped in the separate packages
+ python-gobject-2{,-dbg}. Add a dependency to these for the time being to
+ not break backwards compatibility. Once all packages have been ported to
+ use the GI bindings, this dependency and pygobject-2 will be dropped.
+ * debian/control.in: Update package descriptions to point out that this is
+ now GI only.
+ * debian/control.in, debian/rules: Drop python-gobject-dev package. It's
+ not relevant any more for this version, and now built from the
+ pygobject-2 source package.
+
+ -- Martin Pitt <mpitt at debian.org> Wed, 17 Aug 2011 09:53:22 +0200
pygobject (2.28.6-4) unstable; urgency=low
Modified: desktop/experimental/pygobject/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/control?rev=29398&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/control [utf-8] (original)
+++ desktop/experimental/pygobject/debian/control [utf-8] Wed Aug 17 09:11:59 2011
@@ -44,19 +44,21 @@
Depends: ${python:Depends},
${shlibs:Depends},
${misc:Depends},
- gir1.2-glib-2.0
+ gir1.2-glib-2.0,
+ python-gobject-2
Provides: ${python:Provides}, python-gi
Recommends: python-gobject-cairo
Suggests: python-gobject-dbg
Conflicts: python-gi
Replaces: python-gi
-Description: Python bindings for the GObject library
+Description: Python 2.x bindings for gobject-introspection libraries
GObject is an abstraction layer that allows programming with an object
paradigm that is compatible with many languages. It is a part of Glib,
the core library used to build GTK+ and GNOME.
.
- This package contains the Python bindings for GObject. It is mostly
- used by other bindings to map their GObjects to Python objects.
+ This package contains the Python 2.x binding generator for libraries that
+ support gobject-introspection, i. e. which ship a gir1.2-<name>-<version>
+ package. With these packages, the libraries can be used from Python.
Package: python3-gobject
Architecture: any
@@ -65,13 +67,14 @@
${misc:Depends},
gir1.2-glib-2.0
Suggests: python3-gobject-dbg
-Description: Python 3 bindings for the GObject library
+Description: Python 3 bindings for gobject-introspection libraries
GObject is an abstraction layer that allows programming with an object
paradigm that is compatible with many languages. It is a part of Glib,
the core library used to build GTK+ and GNOME.
.
- This package contains the Python 3 bindings for GObject. It is mostly
- used by other bindings to map their GObjects to Python 3 objects.
+ This package contains the Python 3 binding generator for libraries that
+ support gobject-introspection, i. e. which ship a gir1.2-<name>-<version>
+ package. With these packages, the libraries can be used from Python 3.
Package: python-gobject-cairo
Architecture: any
@@ -87,28 +90,15 @@
This package contains the Python Cairo bindings for GObject. It is mostly
used by other bindings to map their GObjects to Python objects.
-Package: python-gobject-dev
-Architecture: all
-Depends: ${python:Depends},
- ${misc:Depends},
- python-gobject (>= ${source:Version}),
- python-dev,
- libglib2.0-dev (>= 2.24.0),
- libffi-dev (>= 3.0.5)
-Recommends: docbook-xsl
-Description: Development headers for the GObject Python bindings
- GObject is an abstraction layer that allows programming with an object
- paradigm that is compatible with many languages. It is a part of Glib,
- the core library used to build GTK+ and GNOME.
- .
- This package contains the development headers needed to build
- other Python bindings relying on pygobject.
-
Package: python-gobject-dbg
Section: debug
Priority: extra
Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-gobject (= ${binary:Version})
+Depends: ${python:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends},
+ python-gobject (= ${binary:Version}),
+ python-gobject-2-dbg
Description: Python bindings for the GObject library (debug extension)
GObject is an abstraction layer that allows programming with an object
paradigm that is compatible with many languages. It is a part of Glib,
@@ -124,12 +114,13 @@
Priority: extra
Architecture: any
Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}, python3-gobject (= ${binary:Version})
-Description: Python 3 bindings for the GObject library (debug extension)
+Description: Python 3 bindings for gobject-introspection libraries (debug extension)
GObject is an abstraction layer that allows programming with an object
paradigm that is compatible with many languages. It is a part of Glib,
the core library used to build GTK+ and GNOME.
.
- This package contains the Python 3 bindings for GObject. It is mostly
- used by other bindings to map their GObjects to Python 3 objects.
+ This package contains the Python 3 binding generator for libraries that
+ support gobject-introspection, i. e. which ship a gir1.2-<name>-<version>
+ package. With these packages, the libraries can be used from Python 3.
.
This package contains the extensions built for the Python 3 debug interpreter.
Modified: desktop/experimental/pygobject/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/control.in?rev=29398&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/control.in [utf-8] (original)
+++ desktop/experimental/pygobject/debian/control.in [utf-8] Wed Aug 17 09:11:59 2011
@@ -39,19 +39,21 @@
Depends: ${python:Depends},
${shlibs:Depends},
${misc:Depends},
- gir1.2-glib-2.0
+ gir1.2-glib-2.0,
+ python-gobject-2
Provides: ${python:Provides}, python-gi
Recommends: python-gobject-cairo
Suggests: python-gobject-dbg
Conflicts: python-gi
Replaces: python-gi
-Description: Python bindings for the GObject library
+Description: Python 2.x bindings for gobject-introspection libraries
GObject is an abstraction layer that allows programming with an object
paradigm that is compatible with many languages. It is a part of Glib,
the core library used to build GTK+ and GNOME.
.
- This package contains the Python bindings for GObject. It is mostly
- used by other bindings to map their GObjects to Python objects.
+ This package contains the Python 2.x binding generator for libraries that
+ support gobject-introspection, i. e. which ship a gir1.2-<name>-<version>
+ package. With these packages, the libraries can be used from Python.
Package: python3-gobject
Architecture: any
@@ -60,13 +62,14 @@
${misc:Depends},
gir1.2-glib-2.0
Suggests: python3-gobject-dbg
-Description: Python 3 bindings for the GObject library
+Description: Python 3 bindings for gobject-introspection libraries
GObject is an abstraction layer that allows programming with an object
paradigm that is compatible with many languages. It is a part of Glib,
the core library used to build GTK+ and GNOME.
.
- This package contains the Python 3 bindings for GObject. It is mostly
- used by other bindings to map their GObjects to Python 3 objects.
+ This package contains the Python 3 binding generator for libraries that
+ support gobject-introspection, i. e. which ship a gir1.2-<name>-<version>
+ package. With these packages, the libraries can be used from Python 3.
Package: python-gobject-cairo
Architecture: any
@@ -82,28 +85,15 @@
This package contains the Python Cairo bindings for GObject. It is mostly
used by other bindings to map their GObjects to Python objects.
-Package: python-gobject-dev
-Architecture: all
-Depends: ${python:Depends},
- ${misc:Depends},
- python-gobject (>= ${source:Version}),
- python-dev,
- libglib2.0-dev (>= 2.24.0),
- libffi-dev (>= 3.0.5)
-Recommends: docbook-xsl
-Description: Development headers for the GObject Python bindings
- GObject is an abstraction layer that allows programming with an object
- paradigm that is compatible with many languages. It is a part of Glib,
- the core library used to build GTK+ and GNOME.
- .
- This package contains the development headers needed to build
- other Python bindings relying on pygobject.
-
Package: python-gobject-dbg
Section: debug
Priority: extra
Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-gobject (= ${binary:Version})
+Depends: ${python:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends},
+ python-gobject (= ${binary:Version}),
+ python-gobject-2-dbg
Description: Python bindings for the GObject library (debug extension)
GObject is an abstraction layer that allows programming with an object
paradigm that is compatible with many languages. It is a part of Glib,
@@ -119,12 +109,13 @@
Priority: extra
Architecture: any
Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}, python3-gobject (= ${binary:Version})
-Description: Python 3 bindings for the GObject library (debug extension)
+Description: Python 3 bindings for gobject-introspection libraries (debug extension)
GObject is an abstraction layer that allows programming with an object
paradigm that is compatible with many languages. It is a part of Glib,
the core library used to build GTK+ and GNOME.
.
- This package contains the Python 3 bindings for GObject. It is mostly
- used by other bindings to map their GObjects to Python 3 objects.
+ This package contains the Python 3 binding generator for libraries that
+ support gobject-introspection, i. e. which ship a gir1.2-<name>-<version>
+ package. With these packages, the libraries can be used from Python 3.
.
This package contains the extensions built for the Python 3 debug interpreter.
Modified: desktop/experimental/pygobject/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/patches/series?rev=29398&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/patches/series [utf-8] (original)
+++ desktop/experimental/pygobject/debian/patches/series [utf-8] Wed Aug 17 09:11:59 2011
@@ -1,9 +1,0 @@
-00git_enum_properties.patch
-00git_cairo_init.patch
-00git_textiter_crash.patch
-00git_test_case_hang.patch
-00git_gio_test.patch
-00git_messagebox_type.patch
-00git_python3_build.patch
-00git_python3-maketrans.patch
-20_deprecated_spam.patch
Modified: desktop/experimental/pygobject/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pygobject/debian/rules?rev=29398&op=diff
==============================================================================
--- desktop/experimental/pygobject/debian/rules [utf-8] (original)
+++ desktop/experimental/pygobject/debian/rules [utf-8] Wed Aug 17 09:11:59 2011
@@ -80,14 +80,14 @@
build: $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp)
build-%/check-stamp: build-%/build-stamp
- find gi glib gobject gio -name '*.py' -exec cp '$(CURDIR)/{}' build-$*/'{}' \;
+ find gi -name '*.py' -exec cp '$(CURDIR)/{}' build-$*/'{}' \;
# don't run the tests under fakeroot, otherwise they will try to
# connect to root's session D-BUS
-PYTHON=/usr/bin/python$* LD_PRELOAD= xvfb-run $(MAKE) -C build-$* check
touch $@
dbg-build-%/check-stamp: dbg-build-%/build-stamp
- find gi glib gobject gio -name '*.py' -exec cp '$(CURDIR)/{}' dbg-build-$*/'{}' \;
+ find gi -name '*.py' -exec cp '$(CURDIR)/{}' dbg-build-$*/'{}' \;
# don't run the tests under fakeroot, otherwise they will try to
# connect to root's session D-BUS
-PYTHON=/usr/bin/python$*-dbg LD_PRELOAD= xvfb-run $(MAKE) -C dbg-build-$* check
@@ -98,14 +98,14 @@
build-2.%/install-stamp: build-2.%/build-stamp
dh_testdir
dh_testroot
- PYTHON=/usr/bin/python2.$* $(MAKE) -C build-2.$* install DESTDIR=$(CURDIR)/debian/python-gobject-dev pyexecdir=$(call py_libdir_sh, 2.$*)
+ PYTHON=/usr/bin/python2.$* $(MAKE) -C build-2.$* install DESTDIR=$(CURDIR)/debian/python-gobject pyexecdir=$(call py_libdir_sh, 2.$*)
+ -find debian/python-gobject/ ! -path '*/usr/lib/*' -delete
+ find debian/python-gobject/ \( -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
- -rmdir debian/python-gobject-dev/usr/lib/python2.$*/site-packages
- # until all reverse dependencies of pygobject have been converted to
- # dh_python2, install a library search path which is backwards
- # compatible to pysupport (see Debian#614764)
- echo "/usr/lib/pymodules/python2.$*/gtk-2.0/" > $(CURDIR)/debian/python-gobject-dev/$(call py_libdir_sh, 2.$*)/gtk-2.0-pysupport-compat.pth
- touch $@
+ rmdir debian/python-gobject/usr/lib/python2.$*/site-packages
+ rm -r debian/python-gobject/usr/lib/pkgconfig
+ # leftover from old static bindings
+ rm -r debian/python-gobject/usr/lib/python2.$*/dist-packages/gtk-2.0
build-3.%/install-stamp: build-3.%/build-stamp
dh_testdir
@@ -156,17 +156,12 @@
dh_prep
rm -f $(PYVERS:%=build-%/install-stamp) $(PYVERS:%=dbg-build-%/install-stamp)
$(MAKE) -f debian/rules $(PYVERS:%=build-%/install-stamp) $(PYVERS:%=dbg-build-%/install-stamp)
- find debian/python-gobject-dev -name \*.la -delete
for i in $(PYVERS); do \
[ "$${i#3.}" = "$$i" ] || continue; \
mkdir -p debian/python-gobject-cairo/$(call py_libdir_sh, $$i)/gi; \
- mv debian/python-gobject-dev/$(call py_libdir_sh, $$i)/gi/_gi_cairo.so debian/python-gobject-cairo/$(call py_libdir_sh, $$i)/gi; \
+ mv debian/python-gobject/$(call py_libdir_sh, $$i)/gi/_gi_cairo.so debian/python-gobject-cairo/$(call py_libdir_sh, $$i)/gi; \
done
mkdir -p debian/python-gobject/usr/lib
- mv debian/python-gobject-dev/usr/lib/python* debian/python-gobject/usr/lib/
- mv debian/python-gobject-dev/usr/lib/libpyglib-*so.* \
- debian/python-gobject/usr/lib
- rm -rf debian/python-gobject-dev/usr/lib/python*
for i in $$(find debian/python-gobject-dbg -name '*.so' -path 'debian/python-gobject-dbg/usr/lib/python*/*-packages/*'); do \
b=$$(basename $$i .so); \
mv $$i $$(dirname $$i)/$${b}_d.so; \
@@ -197,7 +192,7 @@
dh_compress -i -X.py
dh_fixperms -i
# More permission fixing
- chmod 755 `grep -rl "^#\!.*python" debian/python-gobject-dev/usr`
+ chmod 755 `grep -rl "^#\!.*python" debian/python-gobject/usr`
dh_python2 -i /usr/share/pygobject
dh_installdeb -i
dh_gencontrol -i
More information about the pkg-gnome-commits
mailing list