r37643 - in /desktop/unstable/pygobject: ./ debian/ debian/patches/ debian/tests/

mpitt at users.alioth.debian.org mpitt at users.alioth.debian.org
Wed May 8 05:27:25 UTC 2013


Author: mpitt
Date: Wed May  8 05:27:25 2013
New Revision: 37643

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37643
Log:
merge experimental branch

Added:
    desktop/unstable/pygobject/debian/patches/01_cairo_region.patch
      - copied unchanged from r37636, desktop/experimental/pygobject/debian/patches/01_cairo_region.patch
    desktop/unstable/pygobject/debian/python-gi-cairo.install
      - copied unchanged from r37636, desktop/experimental/pygobject/debian/python-gi-cairo.install
    desktop/unstable/pygobject/debian/python-gi-dbg.install
      - copied unchanged from r37636, desktop/experimental/pygobject/debian/python-gi-dbg.install
    desktop/unstable/pygobject/debian/python-gi-dbg.lintian-overrides
      - copied unchanged from r37636, desktop/experimental/pygobject/debian/python-gi-dbg.lintian-overrides
    desktop/unstable/pygobject/debian/python-gi-dev.install
      - copied unchanged from r37636, desktop/experimental/pygobject/debian/python-gi-dev.install
    desktop/unstable/pygobject/debian/python-gi.install
      - copied unchanged from r37636, desktop/experimental/pygobject/debian/python-gi.install
    desktop/unstable/pygobject/debian/python-gi.lintian-overrides
      - copied unchanged from r37636, desktop/experimental/pygobject/debian/python-gi.lintian-overrides
    desktop/unstable/pygobject/debian/python3-gi-cairo.install
      - copied unchanged from r37636, desktop/experimental/pygobject/debian/python3-gi-cairo.install
    desktop/unstable/pygobject/debian/python3-gi-dbg.install
      - copied unchanged from r37636, desktop/experimental/pygobject/debian/python3-gi-dbg.install
    desktop/unstable/pygobject/debian/python3-gi-dbg.lintian-overrides
      - copied unchanged from r37636, desktop/experimental/pygobject/debian/python3-gi-dbg.lintian-overrides
    desktop/unstable/pygobject/debian/python3-gi.install
      - copied unchanged from r37636, desktop/experimental/pygobject/debian/python3-gi.install
    desktop/unstable/pygobject/debian/python3-gi.lintian-overrides
      - copied unchanged from r37636, desktop/experimental/pygobject/debian/python3-gi.lintian-overrides
    desktop/unstable/pygobject/debian/source.lintian-overrides
      - copied unchanged from r37636, desktop/experimental/pygobject/debian/source.lintian-overrides
    desktop/unstable/pygobject/debian/tests/
      - copied from r37636, desktop/experimental/pygobject/debian/tests/
Modified:
    desktop/unstable/pygobject/   (props changed)
    desktop/unstable/pygobject/debian/changelog
    desktop/unstable/pygobject/debian/compat
    desktop/unstable/pygobject/debian/control
    desktop/unstable/pygobject/debian/control.in
    desktop/unstable/pygobject/debian/patches/series
    desktop/unstable/pygobject/debian/rules
    desktop/unstable/pygobject/debian/watch

Propchange: desktop/unstable/pygobject/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  8 05:27:25 2013
@@ -1,1 +1,1 @@
-/desktop/experimental/pygobject:25635-27374
+/desktop/experimental/pygobject:25635-27374,34893-37636

Modified: desktop/unstable/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/changelog?rev=37643&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/changelog [utf-8] (original)
+++ desktop/unstable/pygobject/debian/changelog [utf-8] Wed May  8 05:27:25 2013
@@ -1,3 +1,226 @@
+pygobject (3.8.1-2) UNRELEASED; urgency=low
+
+  * Merge experimental branch, upload to unstable.
+  * Disable FTBFS on test failures on kfreebsd-*.
+
+ -- Martin Pitt <mpitt at debian.org>  Tue, 07 May 2013 07:40:50 +0200
+
+pygobject (3.8.1-1) experimental; urgency=low
+
+  * New upstream bug fix release.
+
+ -- Martin Pitt <mpitt at debian.org>  Tue, 16 Apr 2013 10:26:54 +0200
+
+pygobject (3.8.0-2) experimental; urgency=low
+
+  * debian/tests/python[23]-dbg: Redirect stderr to stdout, to avoid the
+    "[xxx refs]" error message failing the tests.
+  * Bump Standards-Version to 3.9.4. No changes necessary.
+  * Have failing tests fail the build except on s390x and mipsel, where they
+    currently fail.
+  * debian/control.in: Add explicit python3-dbg dependency to python3-gi-dbg,
+    to work around dh_python3 bug #704579.
+
+ -- Martin Pitt <mpitt at debian.org>  Wed, 03 Apr 2013 10:04:37 +0200
+
+pygobject (3.8.0-1) experimental; urgency=low
+
+  [ Emilio Pozuelo Monfort ]
+  * New upstream release.
+  * debian/rules:
+    + Unconditionally run the tests again, since the problem is not
+      kernel related.
+  * debian/patches/01_cairo_region.patch,
+    debian/control.in:
+    + Add a foreign type for cairo_region_t. Bump py3cairo build/binary
+      dependencies. (LP: #1028115, bgo #667959). Thanks to Martin Pitt
+      for this change.
+
+  [ Martin Pitt ]
+  * debian/rules: Set $HOME to debian/tmp/home, so that the testsuite has a
+    writeable home directory for D-BUS sockets and XDG data. This fixes the
+    eternal hangs in sbuild.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 26 Mar 2013 10:15:24 +0100
+
+pygobject (3.7.92-3) experimental; urgency=low
+
+  [ Martin Pitt ]
+  * debian/rules: The test suite causes an eternal hang on Debian's buildds,
+    presumably due to running on very old kernels (2.6.32). This needs more
+    debugging, but skip the tests for kernels < 3.4 for now.
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 24 Mar 2013 09:01:32 +0100
+
+pygobject (3.7.92-2) experimental; urgency=low
+
+  * debian/control.in:
+    + Bump gobject-introspection packages minimum build dependency
+      in an attempt to fix the test suite in the buildds where it's
+      currently hanging.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 19 Mar 2013 14:06:39 +0100
+
+pygobject (3.7.92-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 18 Mar 2013 20:59:27 +0100
+
+pygobject (3.7.91.1-1) experimental; urgency=low
+
+  * New upstream release.
+    - Works nicely with GLib >= 2.35.4. Closes: #702603.
+    - debian/control.in:
+      + Update build dependencies.
+  * debian/python3-gi.lintian-overrides:
+    - Also override dev-pkg-without-shlib-symlink for python3-gi.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 12 Mar 2013 14:30:53 +0100
+
+pygobject (3.4.2-3) experimental; urgency=low
+
+  [ Martin Pitt ]
+  * debian/control.in: Make python-gi-dev Arch: any, as it now uses multiarch
+    paths for the pkg-config file.
+  * debian/control.in: Put transitional packages into section oldlibs, and
+    priority extra. Thanks lintian.
+  * debian/control.in: Fix non-bin-NMUable dependency of python-gobject-dev.
+  * Add lintian overrides to suppress the package-name-doesnt-match-sonames
+    warnings.
+  * Add lintian override for "dbg-package-missing-depends python-gobject-dbg";
+    this is a transitional package only.
+  * Bump g-i build dependency to >= 1.34.2 to ensure the tests are working.
+  * Add autopkgtests for the -dbg flavours of Python 2 and 3.
+  * debian/control.in: Have python-gi-dev depend on python3-gi, too.
+    (LP: #1101683)
+
+  [ Josselin Mouette ]
+  * Enable again gtk3 on m68k.
+  * Add missing dependency python3-gi-cairo → python3-gi. (Closes: #673213)
+
+  [ Michael Biebl ]
+  * Stop using a doc symlink for the dbg package. The space savings are
+    negligible and they are prone to cause problems. In case of
+    python-gobject-dbg, which was converted to a transitional package, the
+    symlink was mistakenly converted to a real directory which isn't handled
+    nicely by dpkg. (Closes: #700779)
+  * Use strict dependencies in python-gi-dev as the package is now
+    Architecture: any
+  * Tighten the dependency on python-gi-dev for python-gobject-dev.
+
+ -- Michael Biebl <biebl at debian.org>  Thu, 21 Feb 2013 23:48:57 +0100
+
+pygobject (3.4.2-2) experimental; urgency=low
+
+  * Drop quilt (not necessary, we are using 3.0 (quilt) source format), and
+    dh_autoreconf (we have no patches).
+  * Greatly simplify debian/rules, by switching to dh7 build system and
+    factorizing the per-flavor rules in a simpler and better way. Also move to
+    dh compat 9 to get multiarch compatible library directories.
+  * debian/control.in: Bump g-i requirement according to upstream
+    configure.ac.
+  * debian/control.in: Drop support for Python 2.6. It's going to be dropped
+    after Wheezy anyway, it receives zero testing by upstream and will soon be
+    dropped upstream anyway.
+  * debian/rules: Use py3versions --supported instead of --requested; the
+    former is broken right now and we don't request particular versions anyway.
+  * debian/control.in: Add missing ${misc:Pre-Depends} and versioned dpkg-dev
+    build dependency.
+
+ -- Martin Pitt <mpitt at debian.org>  Tue, 27 Nov 2012 16:15:23 +0100
+
+pygobject (3.4.2-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Martin Pitt <mpitt at debian.org>  Tue, 13 Nov 2012 05:57:56 +0100
+
+pygobject (3.4.1.1-1) experimental; urgency=low
+
+  [ Martin Pitt ]
+  * New upstream release.
+  * debian/control.in: Bump g-i dependencies according to configure.ac.
+  * debian/rules: Remove moving of site-packages, this was fixed upstream now.
+
+  [ Matthias Klose ]
+  * Fix renaming of python3 extensions.
+  * Configure with --disable-silent-rules.
+  * debian/rules (clean): Remove __pycache__ directories.
+
+ -- Martin Pitt <mpitt at debian.org>  Mon, 22 Oct 2012 12:23:17 +0200
+
+pygobject (3.4.1-1) experimental; urgency=low
+
+  * New upstream bug fix release.
+  * debian/rules: Update handling of site-packages directory, as this version
+    now ships an .egg-info.
+
+ -- Martin Pitt <mpitt at debian.org>  Tue, 16 Oct 2012 07:18:20 +0200
+
+pygobject (3.4.0-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Martin Pitt <mpitt at debian.org>  Mon, 24 Sep 2012 09:43:47 +0200
+
+pygobject (3.3.92-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Martin Pitt <mpitt at debian.org>  Mon, 17 Sep 2012 23:07:55 +0200
+
+pygobject (3.3.91-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control.in: Bump g-i build dependencies as per configure.ac.
+  * debian/control.in: Bump X-Python-Version to >= 2.6. pygobject hasn't
+    worked with 2.5 for quite a while.
+
+ -- Martin Pitt <mpitt at debian.org>  Tue, 04 Sep 2012 12:47:21 +0200
+
+pygobject (3.3.90-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Martin Pitt <mpitt at debian.org>  Mon, 20 Aug 2012 23:23:43 +0200
+
+pygobject (3.3.4-1) experimental; urgency=low
+
+  * New upstream release.
+  * Add debian/tests/: autopkgtest for using GI modules with Python 2 and 3.
+  * debian/control.in: Add XS-Testsuite header as per current DEP-8.
+  * Add debian/tests/build: Build and run a program against pygobject, to
+    verify that the headers and pkg-config file are installed correctly.
+  * debian/watch: Look for unstable versions in experimental branch.
+
+ -- Martin Pitt <mpitt at debian.org>  Sun, 22 Jul 2012 11:13:46 +0200
+
+pygobject (3.3.3.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Martin Pitt <mpitt at debian.org>  Mon, 25 Jun 2012 16:42:57 +0200
+
+pygobject (3.3.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control.in: Bump gobject-introspection build dep to >= 1.33.2 to
+    ensure we have the necessary API for the tests.
+
+ -- Martin Pitt <mpitt at debian.org>  Mon, 11 Jun 2012 16:30:43 +0200
+
+pygobject (3.3.1-1) experimental; urgency=low
+
+  * debian/control.in: Update Vcs-* for experimental branch.
+  * New upstream release. The 3.3.x series is targetted at GNOME 3.6, but will
+    also work with GNOME 3.4. There are a few small API changes/fixes, though.
+  * debian/rules: Bump shlib version.
+  * debian/control.in: Add pep8 and pyflakes build dependencies, now used by
+    the test suite.
+
+ -- Martin Pitt <mpitt at debian.org>  Tue, 15 May 2012 16:00:59 +0200
+
 pygobject (3.2.2-2) unstable; urgency=low
 
   [ Josselin Mouette ]

Modified: desktop/unstable/pygobject/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/compat?rev=37643&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/compat [utf-8] (original)
+++ desktop/unstable/pygobject/debian/compat [utf-8] Wed May  8 05:27:25 2013
@@ -1,1 +1,1 @@
-7
+9

Modified: desktop/unstable/pygobject/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/control?rev=37643&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/control [utf-8] (original)
+++ desktop/unstable/pygobject/debian/control [utf-8] Wed May  8 05:27:25 2013
@@ -2,50 +2,51 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
-
 Source: pygobject
 Section: python
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Martin Pitt <mpitt at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: debhelper (>= 7),
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Martin Pitt <mpitt at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Build-Depends: debhelper (>= 9),
+               dpkg-dev (>= 1.16.1~),
                gnome-pkg-tools (>= 0.10),
-               dh-autoreconf,
-               quilt,
                python-all-dev (>= 2.6.6-3~),
                python3-all-dev,
-               libglib2.0-dev (>= 2.31.0),
+               libglib2.0-dev (>= 2.34.2),
                libcairo2-dev,
                libffi-dev (>= 3.0.5),
-               gobject-introspection (>= 1.31.0),
-               libgirepository1.0-dev (>= 1.31.0),
+               gobject-introspection (>= 1.35.8),
+               libgirepository1.0-dev (>= 1.35.8),
                python-cairo-dev (>= 1.2.0),
-               python3-cairo-dev (>= 1.10.0),
+               python3-cairo-dev (>= 1.10.0+dfsg-3~exp2),
                xsltproc,
                xvfb,
                xauth,
                dbus-x11,
                locales,
                docbook-xsl,
-               autotools-dev,
+               pep8,
+               pyflakes,
                python-all-dbg,
                python3-all-dbg,
                python-apt-dbg,
                python-cairo-dbg,
-               gir1.2-glib-2.0,
-               gir1.2-gtk-3.0,
-               gir1.2-freedesktop
-X-Python-Version: >= 2.5
-Standards-Version: 3.9.3
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/pygobject
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/pygobject
+               gir1.2-glib-2.0 (>= 1.35.8),
+               gir1.2-freedesktop (>= 1.35.8),
+               gir1.2-gtk-3.0
+X-Python-Version: >= 2.7
+Standards-Version: 3.9.4
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/pygobject
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/experimental/pygobject
+XS-Testsuite: autopkgtest
 
 Package: python-gi
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${python:Depends},
          ${shlibs:Depends},
          ${misc:Depends},
-         gir1.2-glib-2.0 (>= 1.31.0)
+         gir1.2-glib-2.0 (>= 1.34.2)
 Provides: ${python:Provides}
 Suggests: python-gi-cairo
 Breaks: python-gobject (<< 3.0.2-4),
@@ -62,10 +63,11 @@
 
 Package: python3-gi
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${python3:Depends},
          ${shlibs:Depends},
          ${misc:Depends},
-         gir1.2-glib-2.0 (>= 1.31.0)
+         gir1.2-glib-2.0 (>= 1.34.2)
 Conflicts: python3-gobject
 Provides: python3-gobject
 Replaces: python3-gobject
@@ -80,6 +82,7 @@
 
 Package: python-gi-cairo
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${python:Depends},
          ${shlibs:Depends},
          ${misc:Depends},
@@ -100,6 +103,7 @@
 Section: debug
 Priority: extra
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${python:Depends},
          ${shlibs:Depends},
          ${misc:Depends},
@@ -120,7 +124,9 @@
 Section: debug
 Priority: extra
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${python3:Depends},
+         python3-dbg (>= 3.2),
          ${shlibs:Depends},
          ${misc:Depends},
          python3-gi (= ${binary:Version})
@@ -139,11 +145,12 @@
  This package contains the extensions built for the Python 3 debug interpreter.
 
 Package: python-gi-dev
-Architecture: all
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         python-gi (>= ${source:Version}),
-         python-gi (<< ${source:Version}.1~),
+         python-gi (= ${binary:Version}),
+         python3-gi (= ${binary:Version}),
          libglib2.0-dev (>= 2.24.0),
          libffi-dev (>= 3.0.5)
 Breaks: python-gobject-dev (<< 3.0.2-4)
@@ -156,10 +163,27 @@
  This package contains the development headers needed to build C extensions
  which use pygobject.
 
+Package: python3-gi-cairo
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${python3:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends},
+         python3-gi (= ${binary:Version}),
+         python3-cairo (>= 1.10.0+dfsg-3~exp2)
+Description: Python 3 Cairo bindings for the GObject library
+ 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 Cairo bindings for GObject. It is mostly
+ used by other bindings to map their GObjects to Python objects.
+
 Package: python-gobject
 Section: oldlibs
 Priority: extra
 Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          python-gi (>= ${source:Version}),
          python-gobject-2
@@ -169,25 +193,11 @@
  is here for upgrade purposes only. You can remove it safely when 
  nothing else depends on it.
 
-Package: python3-gi-cairo
-Architecture: any
-Depends: ${python3:Depends},
-         ${shlibs:Depends},
-         ${misc:Depends},
-         python3-gi (= ${binary:Version}),
-         python3-cairo
-Description: Python 3 Cairo bindings for the GObject library
- 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 Cairo bindings for GObject. It is mostly
- used by other bindings to map their GObjects to Python objects.
-
 Package: python-gobject-dbg
 Section: oldlibs
 Priority: extra
 Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          python-gi-dbg (>= ${source:Version}),
          python-gobject-2-dbg
@@ -201,8 +211,10 @@
 Section: oldlibs
 Priority: extra
 Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
-         python-gi-dev (= ${source:Version}),
+         python-gi-dev (>= ${source:Version}),
+         python-gi-dev (<< ${source:Version}.1~),
          python-gobject-2-dev
 Description: Python 2.x development headers for GObject - transitional package 
  This package will bring development headers for the two versions of 

Modified: desktop/unstable/pygobject/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/control.in?rev=37643&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/control.in [utf-8] (original)
+++ desktop/unstable/pygobject/debian/control.in [utf-8] Wed May  8 05:27:25 2013
@@ -3,44 +3,46 @@
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 9),
+               dpkg-dev (>= 1.16.1~),
                gnome-pkg-tools (>= 0.10),
-               dh-autoreconf,
-               quilt,
                python-all-dev (>= 2.6.6-3~),
                python3-all-dev,
-               libglib2.0-dev (>= 2.31.0),
+               libglib2.0-dev (>= 2.34.2),
                libcairo2-dev,
                libffi-dev (>= 3.0.5),
-               gobject-introspection (>= 1.31.0),
-               libgirepository1.0-dev (>= 1.31.0),
+               gobject-introspection (>= 1.35.8),
+               libgirepository1.0-dev (>= 1.35.8),
                python-cairo-dev (>= 1.2.0),
-               python3-cairo-dev (>= 1.10.0),
+               python3-cairo-dev (>= 1.10.0+dfsg-3~exp2),
                xsltproc,
                xvfb,
                xauth,
                dbus-x11,
                locales,
                docbook-xsl,
-               autotools-dev,
+               pep8,
+               pyflakes,
                python-all-dbg,
                python3-all-dbg,
                python-apt-dbg,
                python-cairo-dbg,
-               gir1.2-glib-2.0,
-               gir1.2-gtk-3.0,
-               gir1.2-freedesktop
-X-Python-Version: >= 2.5
-Standards-Version: 3.9.3
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/pygobject
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/unstable/pygobject
+               gir1.2-glib-2.0 (>= 1.35.8),
+               gir1.2-freedesktop (>= 1.35.8),
+               gir1.2-gtk-3.0
+X-Python-Version: >= 2.7
+Standards-Version: 3.9.4
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/pygobject
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/desktop/experimental/pygobject
+XS-Testsuite: autopkgtest
 
 Package: python-gi
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${python:Depends},
          ${shlibs:Depends},
          ${misc:Depends},
-         gir1.2-glib-2.0 (>= 1.31.0)
+         gir1.2-glib-2.0 (>= 1.34.2)
 Provides: ${python:Provides}
 Suggests: python-gi-cairo
 Breaks: python-gobject (<< 3.0.2-4),
@@ -57,10 +59,11 @@
 
 Package: python3-gi
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${python3:Depends},
          ${shlibs:Depends},
          ${misc:Depends},
-         gir1.2-glib-2.0 (>= 1.31.0)
+         gir1.2-glib-2.0 (>= 1.34.2)
 Conflicts: python3-gobject
 Provides: python3-gobject
 Replaces: python3-gobject
@@ -75,6 +78,7 @@
 
 Package: python-gi-cairo
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${python:Depends},
          ${shlibs:Depends},
          ${misc:Depends},
@@ -95,6 +99,7 @@
 Section: debug
 Priority: extra
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${python:Depends},
          ${shlibs:Depends},
          ${misc:Depends},
@@ -115,7 +120,9 @@
 Section: debug
 Priority: extra
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${python3:Depends},
+         python3-dbg (>= 3.2),
          ${shlibs:Depends},
          ${misc:Depends},
          python3-gi (= ${binary:Version})
@@ -134,11 +141,12 @@
  This package contains the extensions built for the Python 3 debug interpreter.
 
 Package: python-gi-dev
-Architecture: all
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         python-gi (>= ${source:Version}),
-         python-gi (<< ${source:Version}.1~),
+         python-gi (= ${binary:Version}),
+         python3-gi (= ${binary:Version}),
          libglib2.0-dev (>= 2.24.0),
          libffi-dev (>= 3.0.5)
 Breaks: python-gobject-dev (<< 3.0.2-4)
@@ -151,10 +159,27 @@
  This package contains the development headers needed to build C extensions
  which use pygobject.
 
+Package: python3-gi-cairo
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${python3:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends},
+         python3-gi (= ${binary:Version}),
+         python3-cairo (>= 1.10.0+dfsg-3~exp2)
+Description: Python 3 Cairo bindings for the GObject library
+ 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 Cairo bindings for GObject. It is mostly
+ used by other bindings to map their GObjects to Python objects.
+
 Package: python-gobject
 Section: oldlibs
 Priority: extra
 Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          python-gi (>= ${source:Version}),
          python-gobject-2
@@ -164,25 +189,11 @@
  is here for upgrade purposes only. You can remove it safely when 
  nothing else depends on it.
 
-Package: python3-gi-cairo
-Architecture: any
-Depends: ${python3:Depends},
-         ${shlibs:Depends},
-         ${misc:Depends},
-         python3-gi (= ${binary:Version}),
-         python3-cairo
-Description: Python 3 Cairo bindings for the GObject library
- 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 Cairo bindings for GObject. It is mostly
- used by other bindings to map their GObjects to Python objects.
-
 Package: python-gobject-dbg
 Section: oldlibs
 Priority: extra
 Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          python-gi-dbg (>= ${source:Version}),
          python-gobject-2-dbg
@@ -196,8 +207,10 @@
 Section: oldlibs
 Priority: extra
 Architecture: all
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
-         python-gi-dev (= ${source:Version}),
+         python-gi-dev (>= ${source:Version}),
+         python-gi-dev (<< ${source:Version}.1~),
          python-gobject-2-dev
 Description: Python 2.x development headers for GObject - transitional package 
  This package will bring development headers for the two versions of 

Modified: desktop/unstable/pygobject/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/series?rev=37643&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/patches/series [utf-8] (original)
+++ desktop/unstable/pygobject/debian/patches/series [utf-8] Wed May  8 05:27:25 2013
@@ -1,0 +1,1 @@
+01_cairo_region.patch

Modified: desktop/unstable/pygobject/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/rules?rev=37643&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/rules [utf-8] (original)
+++ desktop/unstable/pygobject/debian/rules [utf-8] Wed May  8 05:27:25 2013
@@ -1,215 +1,94 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/default.mk
+include /usr/share/python/python.mk
+# breaks debclean, need to do this manually
+DISABLE_UPDATE_UPLOADERS=1
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-include /usr/share/python/python.mk
+PYVERS := $(shell pyversions --requested -v debian/control) $(shell py3versions --supported -v)
+FLAVOURS := $(PYVERS) $(patsubst %,%-dbg,$(PYVERS))
 
-CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
-
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-export echo=/bin/echo
+TESTSUITE_FAIL_CMD=exit 1
+ifneq ($(findstring $(DEB_BUILD_ARCH), s390x mipsel kfreebsd-amd64 kfreebsd-i386),)
+# tests currently fail on these architectures
+    TESTSUITE_FAIL_CMD=true
+endif
 
 configure_flags += \
-		--prefix=/usr \
-		--enable-thread \
-		--build=$(DEB_BUILD_GNU_TYPE) \
-		--disable-maintainer-mode
+		--disable-silent-rules \
+		$(NULL)
 
-ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-	configure_flags += --host=$(DEB_HOST_GNU_TYPE)
-endif
+%:
+	dh $@ --with python2,python3
 
-PYDEFAULTVER := $(shell pyversions --default --version)
-PYVERS := $(shell pyversions --requested --version debian/control)
-PYVERS := $(filter-out $(PYDEFAULTVER), $(PYVERS)) $(PYDEFAULTVER) $(shell py3versions --supported --version)
+override_dh_auto_configure:
+	set -e && for x in $(FLAVOURS); do \
+	    dh_auto_configure --builddirectory=build-$$x -- PYTHON=/usr/bin/python$$x $(configure_flags); \
+	done
 
-patch-stamp:
-	dh_testdir
-	dh_autoreconf
-	touch $@
+override_dh_auto_build:
+	set -e && for x in $(FLAVOURS); do \
+	    dh_auto_build --builddirectory=build-$$x; \
+	done
 
-patch: patch-stamp
+# don't run the tests under fakeroot, otherwise they will try to connect to
+# root's session D-BUS
+override_dh_auto_test:
+	set -e; export HOME=$(CURDIR)/debian/tmp/home; mkdir -p $$HOME/.local/share; unset LD_PRELOAD; \
+	for x in $(FLAVOURS); do \
+	        xvfb-run dh_auto_test --builddirectory=build-$$x || $(TESTSUITE_FAIL_CMD); \
+	        while [ -e /tmp/.X99-lock ]; do echo "Waiting for xvfb to finish..."; sleep 0.5; done; \
+	done; \
 
-build-%/configure-stamp: patch-stamp
-	dh_testdir
-	mkdir -p build-$*
-	cd build-$* && \
-		PYTHON=/usr/bin/python$* CFLAGS="$(CFLAGS)" \
-			$(CURDIR)/configure $(configure_flags)
-	touch $@
+# we remove stuff that we do not need, and rename the *.so modules to what
+# Python expects for that flavor (http://www.python.org/dev/peps/pep-3149/)
+# group the install directory by major Python version and dbg/non-dbg
+override_dh_auto_install:
+	set -e && for x in $(FLAVOURS); do \
+	    INST=debian/install-`echo $$x | sed 's/\.[0-9]*//'`; \
+	    rm -rf $$INST; \
+	    dh_auto_install --builddirectory=build-$$x --destdir=$$INST; \
+	    find $$INST \( -name '*.pyc' -o -name '*.pyo' -o -name '*.la' \) -delete; \
+	    SO=`python$$x -c "import sysconfig; print(sysconfig.get_config_var('SO'))"`; \
+	    [ "$$SO" = .so ] || for f in `find $$INST/usr/lib/python* -name '*.so'`; do \
+		mv $$f $${f%.so}$$SO; \
+	    done; \
+	done
 
-dbg-build-%/configure-stamp: patch-stamp
-	dh_testdir
-	mkdir -p dbg-build-$*
-	cd dbg-build-$* && \
-		PYTHON=/usr/bin/python$*-dbg CFLAGS="$(CFLAGS) -O0" \
-			$(CURDIR)/configure $(configure_flags)
-	touch $@
+override_dh_auto_clean:
+	rm -rf build-*
+	dh_auto_clean
 
-build-%/build-stamp: build-%/configure-stamp
-	dh_testdir
-	PYTHON=/usr/bin/python$* $(MAKE) -C build-$* pyexecdir=$(call py_libdir_sh, $*)
-	touch $@
+override_dh_install:
+	dh_install -ppython-gi -ppython-gi-cairo --sourcedir=debian/install-2
+	dh_install -ppython-gi-dbg --sourcedir=debian/install-2-dbg
+	dh_install -ppython3-gi -ppython3-gi-cairo -ppython-gi-dev --sourcedir=debian/install-3
+	dh_install -ppython3-gi-dbg --sourcedir=debian/install-3-dbg
+	# for transitional packages; this is not expected to install any files
+	dh_install --remaining-packages --sourcedir=/nonexisting
+	# cairo.so is installed into a separate package; modelling this with
+	# *.install files is a pain, so just remove it manually
+	rm debian/python*-gi/usr/lib/python*/*-packages/gi/*cairo*
 
-dbg-build-%/build-stamp: dbg-build-%/configure-stamp
-	dh_testdir
-	PYTHON=/usr/bin/python$*-dbg $(MAKE) -C dbg-build-$* pyexecdir=$(call py_libdir_sh, $*)
-	touch $@
-
-build: $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp)
-
-build-%/check-stamp: build-%/build-stamp
-	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 -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
-	touch $@
-
-check: $(PYVERS:%=build-%/check-stamp) $(PYVERS:%=dbg-build-%/check-stamp)
-
-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-gi pyexecdir=$(call py_libdir_sh, 2.$*)
-	# install development parts
-	mkdir -p debian/python-gi-dev/usr/lib
-	cp -r debian/python-gi/usr/include debian/python-gi-dev/usr/
-	cp -r debian/python-gi/usr/lib/pkgconfig debian/python-gi-dev/usr/lib
-	# remove stuff that we do not need in python-gi
-	-find debian/python-gi/ ! -path '*/usr/lib/*' -delete
-	find debian/python-gi/ \( -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-gi/usr/lib/python2.$*/site-packages
-	rm -r debian/python-gi/usr/lib/pkgconfig
-
-build-3.%/install-stamp: build-3.%/build-stamp
-	dh_testdir
-	dh_testroot
-	PYTHON=/usr/bin/python3.$* $(MAKE) -C build-3.$* install DESTDIR=$(CURDIR)/debian/python3-gi pyexecdir=$(call py_libdir_sh, 3.$*)
-	-find debian/python3-gi/ ! -path '*/usr/lib/*' -delete
-	find debian/python3-gi/ \( -name '*.pyc' -o -name '*.pyo' -o -name '*.la' \) -delete
-	rm -r debian/python3-gi/usr/lib/pkgconfig
-	
-	# tag the Python extensions like distutils, as upstream build system
-	# uses autotools and does not know about http://www.python.org/dev/peps/pep-3149/
-	ABITAG=`python3.$* -c "import sysconfig; print(sysconfig.get_config_var('SOABI'))"`; \
-	for f in `find debian/python3-gi/usr/lib/python* -name '*.so'`; do \
-	    mv $$f $${f%.so}.$$ABITAG.so; \
-	done
-	
-	touch $@
-
-dbg-build-2.%/install-stamp: dbg-build-2.%/build-stamp
-	dh_testdir
-	dh_testroot
-	PYTHON=/usr/bin/python2.$*-dbg $(MAKE) -C dbg-build-2.$* install DESTDIR=$(CURDIR)/debian/python-gi-dbg pyexecdir=$(call py_libdir_sh, 2.$*)
-	find debian/python-gi-dbg ! -type d ! \( -name '*.so' -o -name '*.so.*' \) -delete
-	find debian/python-gi-dbg -type d -empty -delete
-	touch $@
-
-dbg-build-3.%/install-stamp: dbg-build-3.%/build-stamp
-	dh_testdir
-	dh_testroot
-	PYTHON=/usr/bin/python3.$*-dbg $(MAKE) -C dbg-build-3.$* install DESTDIR=$(CURDIR)/debian/python3-gi-dbg pyexecdir=$(call py_libdir_sh, 3.$*)
-	find debian/python3-gi-dbg ! -type d ! \( -name '*.so' -o -name '*.so.*' \) -delete
-	find debian/python3-gi-dbg -type d -empty -delete
-	
-	# tag the Python extensions like distutils, as upstream build system
-	# uses autotools and does not know about http://www.python.org/dev/peps/pep-3149/
-	ABITAG=`python3.$*-dbg -c "import sysconfig; print(sysconfig.get_config_var('SOABI'))"`; \
-	for f in `find debian/python3-gi-dbg/usr/lib/python* -name '*.so'`; do \
-	    mv $$f $${f%.so}.$$ABITAG.so; \
-	done
-	
-	touch $@
-
-install-stamp: $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp)
-	dh_testdir
-	dh_testroot
-	# remove the install stamps to force a reinstall (since dh_clean is
-	# removing the package dirs)
-	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)
-	for i in $(PYVERS); do \
-		if [ "$${i#3.}" = "$$i" ]; then \
-			mkdir -p debian/python-gi-cairo/$(call py_libdir_sh, $$i)/gi; \
-			mv debian/python-gi/$(call py_libdir_sh, $$i)/gi/_gi_cairo.so debian/python-gi-cairo/$(call py_libdir_sh, $$i)/gi; \
-		else \
-			ABITAG=`python$$i -c "import sysconfig; print(sysconfig.get_config_var('SOABI'))"`; \
-			mkdir -p debian/python3-gi-cairo/$(call py_libdir_sh, $$i)/gi; \
-			mv debian/python3-gi/$(call py_libdir_sh, $$i)/gi/_gi_cairo.$$ABITAG.so debian/python3-gi-cairo/$(call py_libdir_sh, $$i)/gi; \
-		fi \
-	done
-	mkdir -p debian/python-gi/usr/lib
-	for i in $$(find debian/python-gi-dbg -name '*.so' -path 'debian/python-gi-dbg/usr/lib/python*/*-packages/*'); do \
-		b=$$(basename $$i .so); \
-		mv $$i $$(dirname $$i)/$${b}_d.so; \
-	done
-	
-	touch $@
-
-install: install-stamp
-
-clean::
-	dh_testdir
-	dh_testroot
-	rm -f install-stamp
-	rm -f patch-stamp
-	rm -rf build-* dbg-build-*
-	dh_autoreconf_clean
-	dh_clean *.pyc */*.pyc
-
-maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check)
-
-binary-indep: install $(maybe_check)
-	dh_testdir
-	dh_testroot
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installchangelogs ChangeLog -i
-	dh_link -i
-	dh_compress -i -X.py
-	dh_fixperms -i
-	dh_python2 -i /usr/share/pygobject
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary-arch: install $(maybe_check)
-	dh_testdir
-	dh_testroot
-	dh_installdocs -s
-	dh_installexamples -s
-	dh_installchangelogs -s ChangeLog
+override_dh_strip:
 	dh_strip -ppython-gi --dbg-package=python-gi-dbg
 	dh_strip -ppython-gi-cairo --dbg-package=python-gi-dbg
 	dh_strip -ppython3-gi --dbg-package=python3-gi-dbg
-	dh_link -s
-	dh_compress -s -X.py
-	dh_fixperms -s
-	dh_python2 -a
-	dh_python3 -a
-	dh_makeshlibs -ppython-gi      -V'python-gi (>= 2.90.1)'
-	dh_makeshlibs -ppython-gi-dbg  -V'python-gi-dbg (>= 2.90.1)'
-	dh_makeshlibs -ppython3-gi     -V'python3-gi (>= 2.90.1)'
-	dh_makeshlibs -ppython3-gi-dbg -V'python3-gi-dbg (>= 2.90.1)'
-	dh_installdeb -s
-	dh_shlibdeps -s
-	dh_gencontrol -s
-	dh_md5sums -s
-	dh_builddeb -s
+	dh_strip --remaining-packages
 
-binary: binary-arch binary-indep
-.PHONY: patch build check install clean binary-indep binary-arch binary
+override_dh_makeshlibs:
+	dh_makeshlibs -ppython-gi  -V'python-gi (>= 3.4)'
+	dh_makeshlibs -ppython3-gi -V'python3-gi (>= 3.4)'
+	dh_makeshlibs --remaining-packages
+
+# without this, dh_python2 insists on 2.6 modules
+override_dh_python2:
+	dh_python2 --no-guessing-versions
+
+override_dh_clean:
+	# from uploaders.mk; this uses cdbs-style clean:: which breaks dh clean
+	{ cat $(CONTROL_HEADER) ; sed "s/@GNOME_TEAM@/$(UPLOADERS)/" debian/control.in ; } > debian/control
+	rm -rf debian/install-*
+	dh_clean

Modified: desktop/unstable/pygobject/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/watch?rev=37643&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/watch [utf-8] (original)
+++ desktop/unstable/pygobject/debian/watch [utf-8] Wed May  8 05:27:25 2013
@@ -1,2 +1,2 @@
 version=3
-http://ftp.gnome.org/pub/GNOME/sources/pygobject/([\d\.]+[02468])/pygobject-([\d\.]+)\.tar\.xz
+http://ftp.gnome.org/pub/GNOME/sources/pygobject/([\d\.]+)/pygobject-([\d\.]+)\.tar\.xz




More information about the pkg-gnome-commits mailing list