[jhbuild] *-3.*: Switch pygobject deps to pygobject-python2
- From: Martin Pitt <martinpitt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [jhbuild] *-3.*: Switch pygobject deps to pygobject-python2
- Date: Wed, 7 Nov 2012 07:25:37 +0000 (UTC)
commit 062c028c48603d4f1a449dbd41b56ed44120c675
Author: Martin Pitt <martinpitt gnome org>
Date: Wed Nov 7 08:24:04 2012 +0100
*-3.*: Switch pygobject deps to pygobject-python2
The previous commit switched pygobject to Python 3 by default. As our current
modules expect Python 2, switch all dependencies to pygobject-python2 for now.
As modules get ported to Python 3, they should switch their dependency back to
pygobject.
https://bugzilla.gnome.org/show_bug.cgi?id=687743
modulesets/gnome-apps-3.8.modules | 16 ++++++++--------
modulesets/gnome-suites-core-3.8.modules | 2 +-
modulesets/gnome-suites-core-deps-3.8.modules | 4 ++--
modulesets/gnome-suites-core-deps-base-3.8.modules | 2 +-
modulesets/gnome-world-3.8.modules | 10 +++++-----
5 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.8.modules b/modulesets/gnome-apps-3.8.modules
index a7bd0b0..1e41464 100644
--- a/modulesets/gnome-apps-3.8.modules
+++ b/modulesets/gnome-apps-3.8.modules
@@ -476,7 +476,7 @@
<autotools id="pyatspi2">
<branch/>
<dependencies>
- <dep package="pygobject"/>
+ <dep package="pygobject-python2"/>
</dependencies>
<suggests>
<dep package="at-spi2-core"/>
@@ -612,7 +612,7 @@
<dependencies>
<dep package="at-spi2-atk"/> <!-- to make accerciser's gui accessible -->
<dep package="intltool"/>
- <dep package="pygobject"/>
+ <dep package="pygobject-python2"/>
<dep package="pyatspi2"/>
<dep package="yelp-tools"/>
<dep package="gtk+"/>
@@ -740,7 +740,7 @@
<branch/>
<dependencies>
<dep package="gtk+"/>
- <dep package="pygobject"/>
+ <dep package="pygobject-python2"/>
<dep package="gsettings-desktop-schemas"/>
</dependencies>
</autotools>
@@ -765,7 +765,7 @@
<dep package="gtk+"/>
<dep package="libgsf"/>
<dep package="libxml2"/>
- <dep package="pygobject"/>
+ <dep package="pygobject-python2"/>
<dep package="pango"/>
</dependencies>
</autotools>
@@ -1034,7 +1034,7 @@
<distutils id="gnome-clocks">
<branch/>
<dependencies>
- <dep package="pygobject"/>
+ <dep package="pygobject-python2"/>
<dep package="gtk+"/>
<dep package="libcanberra"/>
<dep package="clutter-gtk"/>
@@ -1178,7 +1178,7 @@
<dependencies>
<dep package="intltool"/>
<dep package="gtk+"/>
- <dep package="pygobject"/>
+ <dep package="pygobject-python2"/>
<dep package="yelp-tools"/>
</dependencies>
</autotools>
@@ -1348,7 +1348,7 @@
<dep package="intltool"/>
<dep package="pyatspi2"/>
<dep package="py2cairo"/>
- <dep package="pygobject"/>
+ <dep package="pygobject-python2"/>
<dep package="yelp-tools"/>
</dependencies>
</autotools>
@@ -1369,7 +1369,7 @@
<dep package="libpeas"/>
<dep package="libsoup"/>
<dep package="libxml2"/>
- <dep package="pygobject"/>
+ <dep package="pygobject-python2"/>
<dep package="totem-pl-parser"/>
</dependencies>
<suggests>
diff --git a/modulesets/gnome-suites-core-3.8.modules b/modulesets/gnome-suites-core-3.8.modules
index bbf9fcb..26b1ca8 100644
--- a/modulesets/gnome-suites-core-3.8.modules
+++ b/modulesets/gnome-suites-core-3.8.modules
@@ -581,7 +581,7 @@
<suggests>
<dep package="lcms2"/>
<dep package="librsvg"/>
- <dep package="pygobject"/>
+ <dep package="pygobject-python2"/>
</suggests>
</autotools>
diff --git a/modulesets/gnome-suites-core-deps-3.8.modules b/modulesets/gnome-suites-core-deps-3.8.modules
index 5f50db9..c96918e 100644
--- a/modulesets/gnome-suites-core-deps-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-3.8.modules
@@ -275,7 +275,7 @@
<autotools id="caribou" autogenargs="--disable-gtk2-module">
<branch/>
<dependencies>
- <dep package="pygobject"/>
+ <dep package="pygobject-python2"/>
<dep package="gtk+"/>
<dep package="clutter"/>
<dep package="libgee"/>
@@ -747,7 +747,7 @@
<suggests>
<dep package="gjs"/>
<dep package="glade"/>
- <dep package="pygobject"/>
+ <dep package="pygobject-python2"/>
<dep package="seed"/>
</suggests>
</autotools>
diff --git a/modulesets/gnome-suites-core-deps-base-3.8.modules b/modulesets/gnome-suites-core-deps-base-3.8.modules
index af5a902..0e48621 100644
--- a/modulesets/gnome-suites-core-deps-base-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-base-3.8.modules
@@ -100,7 +100,7 @@
<dep package="dbus-glib"/>
</dependencies>
<suggests>
- <dep package="pygobject"/>
+ <dep package="pygobject-python2"/>
</suggests>
</autotools>
diff --git a/modulesets/gnome-world-3.8.modules b/modulesets/gnome-world-3.8.modules
index 9396f3a..730019d 100644
--- a/modulesets/gnome-world-3.8.modules
+++ b/modulesets/gnome-world-3.8.modules
@@ -601,7 +601,7 @@
<dependencies>
<dep package="py2cairo"/>
<dep package="pyatspi2"/>
- <dep package="pygobject"/>
+ <dep package="pygobject-python2"/>
<dep package="pygtk"/>
</dependencies>
</distutils>
@@ -944,7 +944,7 @@
<dep package="goocanvasmm"/>
<dep package="libepc"/>
<dep package="evince"/>
- <dep package="pygobject"/>
+ <dep package="pygobject-python2"/>
</dependencies>
</autotools>
@@ -1022,7 +1022,7 @@
<dep package="gst-editing-services"/>
<dep package="gst-plugins-base"/>
<dep package="gst-plugins-good"/>
- <dep package="pygobject"/>
+ <dep package="pygobject-python2"/>
<dep package="py2cairo"/>
</dependencies>
</autotools>
@@ -1363,7 +1363,7 @@
<dep package="gsettings-desktop-schemas"/>
<dep package="libchamplain"/>
<dep package="libgdata"/>
- <dep package="pygobject"/>
+ <dep package="pygobject-python2"/>
</suggests>
</autotools>
@@ -1642,7 +1642,7 @@
<dep package="libgee-0.6"/>
<dep package="libnotify"/>
<dep package="libsoup"/>
- <dep package="pygobject"/>
+ <dep package="pygobject-python2"/>
<dep package="vala"/>
</dependencies>
</autotools>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]