[gnome-python-extras] Remove pygda. It is now in a separate pygda git repository.



commit 7684237b0ba98e1890c6669646619003ccad8cd8
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun Nov 7 14:01:39 2010 +0100

    Remove pygda. It is now in a separate pygda git repository.
    
    * examples/gda/list_api.py:
    * examples/gda/list_data_sources.py:
    * examples/gda/select.py:
    * gda/.cvsignore:
    * gda/Makefile.am:
    * gda/gda-arg-types.py:
    * gda/gda.defs:
    * gda/gda.override:
    * gda/gda_defs_interface.patch:
    * gda/gdaglue.h:
    * gda/gdamodule.c:
    * gda/pygda-4.0.pc.in:
    * gda/pygdavalue_conversions.[h|cc]: Removed.
    * configure.ac:
    * Makefile.am:
    * README:
    * COPYING: Adapted.

 COPYING                           |    1 -
 ChangeLog                         |   28 +
 Makefile.am                       |    4 -
 README                            |    1 -
 configure.ac                      |   20 +-
 examples/gda/list_api.py          |   31 -
 examples/gda/list_data_sources.py |   64 -
 examples/gda/select.py            |   96 -
 gda/.cvsignore                    |    5 -
 gda/Makefile.am                   |   66 -
 gda/gda-arg-types.py              |   26 -
 gda/gda.defs                      | 6634 -------------------------------------
 gda/gda.override                  |  332 --
 gda/gda_defs_interface.patch      |   20 -
 gda/gdaglue.h                     |   11 -
 gda/gdamodule.c                   |   57 -
 gda/pygda-4.0.pc.in               |   18 -
 gda/pygdavalue_conversions.c      |  164 -
 gda/pygdavalue_conversions.h      |   17 -
 tests/common.py                   |    1 -
 20 files changed, 29 insertions(+), 7567 deletions(-)
---
diff --git a/COPYING b/COPYING
index bd470cb..e8ba6ee 100644
--- a/COPYING
+++ b/COPYING
@@ -6,7 +6,6 @@ The following table summarises the licenses of individual modules:
 
 Module name		License
 --------------------------------
-gda			LGPL
 gtkhtml2		LGPL
 egg.trayicon		LGPL
 egg.recent		GPL
diff --git a/ChangeLog b/ChangeLog
index 16699a4..68b61af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2010-11-07  Murray Cumming  <murrayc murrayc com>
+
+	Remove pygda. It is now in a separate pygda git repository.
+
+	* examples/gda/list_api.py:
+	* examples/gda/list_data_sources.py:
+	* examples/gda/select.py:
+	* gda/.cvsignore:
+	* gda/Makefile.am:
+	* gda/gda-arg-types.py:
+	* gda/gda.defs:
+	* gda/gda.override:
+	* gda/gda_defs_interface.patch:
+	* gda/gdaglue.h:
+	* gda/gdamodule.c:
+	* gda/pygda-4.0.pc.in:
+	* gda/pygdavalue_conversions.[h|cc]: Removed.
+	* configure.ac:
+	* Makefile.am:
+	* README:
+	* COPYING: Adapted.
+
+2010-09-27  Josselin Mouette <joss debian org>
+
+    Don't link gda.so with libpython
+    
+    Bug #630713
+
 2010-05-03  Murray Cumming  <murrayc murrayc com>
 
 	Gda: Regenerate .defs.
diff --git a/Makefile.am b/Makefile.am
index e3e2b4d..123ced2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,10 +34,6 @@ if BUILD_GDL
   SUBDIRS += gdl
 endif
 
-if BUILD_GDA
-  SUBDIRS += gda
-endif
-
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gnome-python-extras-2.0.pc
diff --git a/README b/README
index 5c4fac8..0a0c841 100644
--- a/README
+++ b/README
@@ -6,7 +6,6 @@ named libraries:
   - gtkmozembed
   - gtkspell
   - gdl
-  - gda
   - gksu, gksu.ui
 
 
diff --git a/configure.ac b/configure.ac
index fe2d44e..9db546b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,6 @@ m4_define(gtkhtml2_required_version,          2.3.1)
 m4_define(mozilla_required_version,           1.2b)
 m4_define(firefox_required_version,           1.0)
 m4_define(xulrunner_required_version,         1.8)
-m4_define(libgda_required_version,            3.99.11)
 m4_define(gksu_required_version,              1.2.5)
 m4_define(gksu2_required_version,             2.0.4)
 m4_define(gksuui_required_version,            1.0.3)
@@ -137,7 +136,7 @@ if test -n "$export_dynamic"; then
 fi
 
 dnl default bindings to build:
-default_bindings_on="eggtray eggrecent gda gdl gksu gksu2 gtkhtml2 gtkmozembed gtkspell"
+default_bindings_on="eggtray eggrecent gdl gksu gksu2 gtkhtml2 gtkmozembed gtkspell"
 default_bindings_off=""
 default_bindings_all="$default_bindings_on $default_bindings_off"
 
@@ -328,19 +327,6 @@ if $have_gdl07; then
   PYGOBJECT_CODEGEN_DEFINES="-DHAVE_GDL_0_7 $PYGOBJECT_CODEGEN_DEFINES";
 fi
 
-
-dnl should we buuild the gda module?
-AC_ARG_BINDING([gda], [ON])
-if $build_gda; then
-  PKG_CHECK_MODULES(GDA, [libgda-4.0 >= libgda_required_version pygtk-2.0 >= pygtk_required_version],
-    build_gda=true,
-    build_gda=false)
-fi
-AM_CONDITIONAL(BUILD_GDA, $build_gda)
-if test -n "$export_dynamic"; then
-  GDA_LIBS=`echo $GDA_LIBS | sed -e "s/$export_dynamic//"`
-fi
-
 dnl should we build the gksu2 module?
 AC_ARG_BINDING([gksu2], [ON])
 if $build_gksu2; then
@@ -398,8 +384,6 @@ AC_CONFIG_FILES(
   gtkmozembed/Makefile
   gtkspell/Makefile
   gdl/Makefile
-  gda/Makefile
-  gda/pygda-4.0.pc
   gksu2/Makefile
   gksu/Makefile
   gnome-python-extras-2.0.pc
@@ -420,7 +404,6 @@ $build_eggrecent         && echo     egg.recent
 $build_gtkmozembed       && echo     gtkmozembed	"(linking to $mozpackage)"
 $build_gtkspell          && echo     gtkspell
 $build_gdl               && echo     gdl
-$build_gda               && echo     gda
 $build_gksu2             && echo     gksu2
 $build_gksu              && echo     gksu
 $build_gksuui            && echo     gksu.ui
@@ -434,7 +417,6 @@ $build_eggrecent         || echo     egg.recent
 $build_gtkmozembed       || echo     gtkmozembed
 $build_gtkspell          || echo     gtkspell
 $build_gdl               || echo     gdl
-$build_gda               || echo     gda
 $build_gksu2             || echo     gksu2
 $build_gksu              || echo     gksu
 $build_gksuui            || echo     gksu.ui
diff --git a/tests/common.py b/tests/common.py
index 3745c29..edc5aa2 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -13,7 +13,6 @@ modules = [
     "gtkmozembed",
     "gtkspell",
     "gdl",
-    "gda",
     "gksu",
     ("gksu.ui", "gksu"),
     ]



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]