[pygobject] moved dynamic and base modules outside of gtk-2.0 directory

[John Palmieri <johnp src gnome org>]

commit 792e679c06df4357843fd310c7953a931172fc99
Author: John (J5) Palmieri <johnp redhat com>
Date:   Mon Nov 29 16:41:38 2010 -0500

    moved dynamic and base modules outside of gtk-2.0 directory
    
    * do not move header files yet as they are mostly used by static bindings
    * do not remove pygtk.pth and pygtk.py files yet - there is a debate on moving
      these back to pygtk but you might want to import gio static bindings without
      having to have pygtk installed
    * I have not tested this with pygtk, committing it so we can find out if it
      causes any issues with legacy modules and code

 gi/Makefile.am            |    2 +-
 gi/overrides/Makefile.am  |    2 +-
 gi/repository/Makefile.am |    2 +-
 glib/Makefile.am          |    2 +-
 gobject/Makefile.am       |    2 +-
 tests/test_gi.py          |    2 --
 tests/test_overrides.py   |    3 ---
 7 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/gi/Makefile.am b/gi/Makefile.am
index 2fbb4ac..8306784 100644
--- a/gi/Makefile.am
+++ b/gi/Makefile.am
@@ -1,7 +1,7 @@
 PLATFORM_VERSION = 2.0
 
 pkgincludedir = $(includedir)/pygtk-$(PLATFORM_VERSION)
-pkgpyexecdir = $(pyexecdir)/gtk-2.0
+pkgpyexecdir = $(pyexecdir)
 
 SUBDIRS = \
 	repository \
diff --git a/gi/overrides/Makefile.am b/gi/overrides/Makefile.am
index b36c7a5..424222b 100644
--- a/gi/overrides/Makefile.am
+++ b/gi/overrides/Makefile.am
@@ -1,6 +1,6 @@
 PLATFORM_VERSION = 2.0
 
-pkgpyexecdir = $(pyexecdir)/gtk-2.0/gi
+pkgpyexecdir = $(pyexecdir)/gi
 
 pygioverridesdir = $(pkgpyexecdir)/overrides
 pygioverrides_PYTHON = \
diff --git a/gi/repository/Makefile.am b/gi/repository/Makefile.am
index c9138ce..efc9c11 100644
--- a/gi/repository/Makefile.am
+++ b/gi/repository/Makefile.am
@@ -1,6 +1,6 @@
 PLATFORM_VERSION = 2.0
 
-pkgpyexecdir = $(pyexecdir)/gtk-2.0/gi
+pkgpyexecdir = $(pyexecdir)/gi
 
 pygirepositorydir = $(pkgpyexecdir)/repository
 pygirepository_PYTHON = \
diff --git a/glib/Makefile.am b/glib/Makefile.am
index f1644a1..765209a 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -6,7 +6,7 @@ pkginclude_HEADERS = pyglib.h
 
 lib_LTLIBRARIES = libpyglib-2 0- PYTHON_BASENAME@.la
 
-pkgpyexecdir = $(pyexecdir)/gtk-2.0
+pkgpyexecdir = $(pyexecdir)
 
 pyglibdir = $(pkgpyexecdir)/glib
 pyglib_PYTHON = 	\
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index f2efde1..f4038bb 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -4,7 +4,7 @@ PLATFORM_VERSION = 2.0
 pkgincludedir = $(includedir)/pygtk-$(PLATFORM_VERSION)
 pkginclude_HEADERS = pygobject.h
 
-pkgpyexecdir = $(pyexecdir)/gtk-2.0
+pkgpyexecdir = $(pyexecdir)
 
 # gobject python scripts
 pygobjectdir = $(pkgpyexecdir)/gobject
diff --git a/tests/test_gi.py b/tests/test_gi.py
index 8b9c398..66dd560 100644
--- a/tests/test_gi.py
+++ b/tests/test_gi.py
@@ -3,8 +3,6 @@
 # vim: tabstop=4 shiftwidth=4 expandtab
 
 import sys
-import pygtk
-pygtk.require("2.0")
 
 import unittest
 from gi.repository import GObject
diff --git a/tests/test_overrides.py b/tests/test_overrides.py
index e0e6630..6679623 100644
--- a/tests/test_overrides.py
+++ b/tests/test_overrides.py
@@ -1,9 +1,6 @@
 # -*- Mode: Python; py-indent-offset: 4 -*-
 # vim: tabstop=4 shiftwidth=4 expandtab
 
-import pygtk
-pygtk.require("2.0")
-
 import unittest
 
 import sys