[gnome-python-extras/pygda-separate: 3/3] Adjust the build files for separate pygda.



commit 1f7e70760aa6179beb462e6b4c02cbbe5f1a04c4
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun Nov 7 13:45:51 2010 +0100

    Adjust the build files for separate pygda.

 AUTHORS         |   11 +-
 COPYING         |  521 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 COPYING.GPL     |  340 ------------------------------------
 COPYING.LGPL    |  504 -----------------------------------------------------
 ChangeLog       |    3 +
 MAINTAINERS     |   12 --
 Makefile.am     |   66 +-------
 NEWS            |    3 +
 README          |   39 +----
 autogen.sh      |    2 +-
 configure.ac    |  303 ++-------------------------------
 gda/Makefile.am |    2 -
 pygda.doap      |   21 +++
 13 files changed, 552 insertions(+), 1275 deletions(-)
---
diff --git a/AUTHORS b/AUTHORS
index 51112fa..c3c87ba 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,10 +1 @@
-Benoît Dejean  <TazForEver dlfp org>
-Gustavo Carneiro  <gjc inescporto pt>
-James Henstridge  <james daa com au>
-Johan Dahlin  <jdahlin telia com>
-John Palmieri  <johnp martianrock com>
-Matt Wilson  <msw redhat com>
-Iñigo Serna  <inigoserna telefonica net>
-Stéphan Kochen  <stephan kochen nl>
-Tiago Cogumbreiro  <cogumbreiro users sf net>
-Raphael Slinckx <raphael slinckx net>
+Murray Cumming	<murrayc murrayc com>
diff --git a/COPYING b/COPYING
index bd470cb..b1e3f5a 100644
--- a/COPYING
+++ b/COPYING
@@ -1,19 +1,504 @@
-The kind of license that applies to gnome-python-extras varies for
-each python module.  Some are LGPL (see COPYING.LGPL), while others
-are GPL (see COPYING.GPL).
-
-The following table summarises the licenses of individual modules:
-
-Module name		License
---------------------------------
-gda			LGPL
-gtkhtml2		LGPL
-egg.trayicon		LGPL
-egg.recent		GPL
-gtkmozembed		LGPL
-gtkspell		GPL (up to gtkspell2)
-gtkspell		LGPL (since gtkspell3)
-gdl			LGPL
-gksu			LGPL
-gksu2			LGPL
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
 
diff --git a/ChangeLog b/ChangeLog
index 16699a4..3b93c31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+ChangeLog Entries from gnome-python-extras, before pygda was split into a 
+separate git/tarball module:
+
 2010-05-03  Murray Cumming  <murrayc murrayc com>
 
 	Gda: Regenerate .defs.
diff --git a/Makefile.am b/Makefile.am
index e3e2b4d..69f9bf8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,64 +1,8 @@
-SUBDIRS = tests
-
-if BUILD_EGG
-  SUBDIRS += egg
-endif
-
-if BUILD_GKSU
-  SUBDIRS += gksu
-endif
-
-if BUILD_GKSU2
-  SUBDIRS += gksu2
-endif
-
-if BUILD_GTKHTML2
-  SUBDIRS += gtkhtml2
-endif
-
-if BUILD_GTKMOZEMBED
-  SUBDIRS += gtkmozembed
-if ENABLE_DOCS
-  SUBDIRS += docs/gtkmozembed
-endif
-endif
-
-if BUILD_GTKSPELL
-  SUBDIRS += gtkspell
-if ENABLE_DOCS
-  SUBDIRS += docs/gtkspell
-endif
-endif
-
-if BUILD_GDL
-  SUBDIRS += gdl
-endif
-
-if BUILD_GDA
-  SUBDIRS += gda
-endif
-
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gnome-python-extras-2.0.pc
+SUBDIRS = tests gda
 
 EXTRA_DIST = \
-  MAINTAINERS \
-  COPYING.GPL COPYING.LGPL \
-  gnome-python-extras-2.0.pc.in \
+  COPYING \
   ltihooks.py \
-  examples/egg/trayicon.py \
-  examples/egg/recent/populate-recent.py \
-  examples/egg/recent/gtk-view.py \
-  examples/egg/recent/bonobo-view.py \
-  examples/egg/recent/Bonobo_Sample_Hello.xml \
-  examples/gksu2/simple.py \
-  examples/gtkhtml2/simple-browser.py \
-  examples/gtkspell/test.py \
-  examples/gtkspell/spell.py \
-  examples/gdl/gdl_test.py \
-  examples/gdl/gdl_combo_button.py \
-  examples/gdl/gdl_dock.py
-
-
-dist-hook: docs/gtkspell/build_stamp docs/gtkmozembed/build_stamp
+  examples/gda/list_api.py \
+  examples/gda/list_data_sources.py \
+  examples/gda/select.py
diff --git a/NEWS b/NEWS
index 9383763..7650c9b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+NEWS entries from gnome-python-extras, before pygda was split into a separate 
+git/tarball module.
+
 Overview of Changes from 2.25.2 to 2.25.3
 ==============================================================================
 
diff --git a/README b/README
index 5c4fac8..d0adc29 100644
--- a/README
+++ b/README
@@ -1,41 +1,6 @@
-This package contains the following python modules, wrapping similarly
-named libraries:
+This is the gda python module, wrapping libgda.
 
-  - gtkhtml2
-  - egg.trayicon, egg.recent (these are now deprecated)
-  - gtkmozembed
-  - gtkspell
-  - gdl
-  - gda
-  - gksu, gksu.ui
-
-
-If you're looking for one of the following python modules, they moved
-to the package gnome-python-desktop:
-
-  - gnomeapplet
-  - gnomeprint, gnomeprint.ui
-  - gtksourceview
-  - wnck
-  - totem.plparser
-  - gtop
-  - nautilusburn
-  - mediaprofiles
-
-== Installation Hints ==
-
-  When you run ./configure, the libraries available on the system
-(with respective header files) are automatically detected.  If one
-module was not enabled while you expected it to be, try looking at the
-file config.log; it may provide some useful clues as to why detection
-failed.
-
-  All the modules for which the corresponding libraries are available
-are going to be compiled when you type 'make'.  It is, however,
-possible to only build/install a specific module, by changing into the
-appropriate subdirectory.  For instance, to build only gtkspell, do
-this:
+== Build and Installation ==
 
   $ ./configure
-  $ cd gtkspell
   $ make && make install
diff --git a/autogen.sh b/autogen.sh
index 260f4ee..3af7cbb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="gnome-python-extras"
+PKG_NAME="pygda"
 REQUIRED_AUTOCONF_VERSION=2.59
 REQUIRED_AUTOMAKE_VERSION=1.7
 
diff --git a/configure.ac b/configure.ac
index fe2d44e..874e47e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,41 +2,31 @@ dnl -*- mode: autoconf -*-
 AC_PREREQ(2.52)
 
 dnl the gnome-python version number
-m4_define(gnome_python_extras_major_version, 2)
-m4_define(gnome_python_extras_minor_version, 25)
-m4_define(gnome_python_extras_micro_version, 3)
-m4_define(gnome_python_extras_version, gnome_python_extras_major_version.gnome_python_extras_minor_version.gnome_python_extras_micro_version)
+m4_define(pygda_major_version, 2)
+m4_define(pygda_minor_version, 25)
+m4_define(pygda_micro_version, 3)
+m4_define(pygda_version, pygda_major_version.pygda_minor_version.pygda_micro_version)
 
 dnl required versions of other packages
 m4_define(pygtk_required_major_version, 2)
 m4_define(pygtk_required_minor_version, 4)
 m4_define(pygtk_required_micro_version, 0)
 m4_define(pygtk_required_version, pygtk_required_major_version.pygtk_required_minor_version.pygtk_required_micro_version)
-m4_define(glib_required_version,              2.6.0)
-m4_define(gtk_required_version,               2.4.0)
-m4_define(gnome_python_required_version,      2.10.0)
-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)
+m4_define(libgda_required_version,            4.0.0)
 
-AC_INIT(gnome-python-extras, gnome_python_extras_version,
+AC_INIT(gnome-python-extras, pygda_version,
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-python])
 dnl AC_CONFIG_SRCDIR([gnome/uimodule.c])
 AM_CONFIG_HEADER(config.h)
 
 AM_INIT_AUTOMAKE
 
-AC_DEFINE(GNOME_PYTHON_EXTRAS_MAJOR_VERSION, gnome_python_extras_major_version,
-                                            [Gnome-Python-Extras major version])
-AC_DEFINE(GNOME_PYTHON_EXTRAS_MINOR_VERSION, gnome_python_extras_minor_version,
-                                            [Gnome-Python-Extras minor version])
-AC_DEFINE(GNOME_PYTHON_EXTRAS_MICRO_VERSION, gnome_python_extras_micro_version,
-                                            [Gnome-Python-Extras macro version])
+AC_DEFINE(GNOME_PYTHON_EXTRAS_MAJOR_VERSION, pygda_major_version,
+                                            [PyGDA major version])
+AC_DEFINE(GNOME_PYTHON_EXTRAS_MINOR_VERSION, pygda_minor_version,
+                                            [PyGDA minor version])
+AC_DEFINE(GNOME_PYTHON_EXTRAS_MICRO_VERSION, pygda_micro_version,
+                                            [PyGDA macro version])
 
 dnl AC_ARG_BINDING(NAME, DEFAULT [, MODULENAME])
 AC_DEFUN([AC_ARG_BINDING],
@@ -124,40 +114,6 @@ AC_MSG_RESULT($GNOME_PYTHON_ARGTYPES_DIR)
 dnl get rid of the -export-dynamic stuff from the configure flags ...
 export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
 
-dnl check for glib
-AM_PATH_GLIB_2_0(glib_required_version,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)],$extras_mods)
-if test -n "$export_dynamic"; then
-  GLIB_LIBS=`echo $GLIB_LIBS | sed -e "s/$export_dynamic//"`
-fi
-
-dnl check to make sure we can find gtk
-AM_PATH_GTK_2_0(gtk_required_version,,[AC_MSG_ERROR(maybe you want the gtk-gnome-1-2 branch?)],$extras_mods)
-if test -n "$export_dynamic"; then
-  GTK_LIBS=`echo $GTK_LIBS | sed -e "s/$export_dynamic//"`
-fi
-
-dnl default bindings to build:
-default_bindings_on="eggtray eggrecent gda gdl gksu gksu2 gtkhtml2 gtkmozembed gtkspell"
-default_bindings_off=""
-default_bindings_all="$default_bindings_on $default_bindings_off"
-
-AC_ARG_ENABLE([allbindings],
-             AC_HELP_STRING([--disable-allbindings],
-                            [Changes all the bindings default values to be either enabled or disabled, overridden by any explicit bindings on the commandline.]),
-             [if test "$enable_allbindings" = "no"; then
-			   default_bindings_off="$default_bindings_all"
-			   default_bindings_on=""
-		  	 else
-			   default_bindings_off=""
-			   default_bindings_on="$default_bindings_all"
-		     fi])
-for binding in $default_bindings_on; do
-	eval build_$binding=true
-done
-for binding in $default_bindings_off; do
-	eval build_$binding=false
-done
-
 dnl Building documentation
 AC_ARG_ENABLE(docs,
   AC_HELP_STRING([--enable-docs], [Enable documentation building]),enable_docs=$enableval,
@@ -184,204 +140,13 @@ AC_SUBST(PYGOBJECT_FIXXREF)
 PYGOBJECT_PYGDOCS="`$PKG_CONFIG --variable=pygdocs pygobject-2.0`"
 AC_SUBST(PYGOBJECT_PYGDOCS)
 
-dnl should we build the gtkhtml2 module?
-AC_ARG_BINDING([gtkhtml2], [ON])
-if $build_gtkhtml2; then
-  PKG_CHECK_MODULES(GTKHTML2, libgtkhtml-2.0 >= gtkhtml2_required_version,
-    build_gtkhtml2=true,
-    build_gtkhtml2=false)
-fi
-AC_SUBST(GTKHTML2_CFLAGS)
-AC_SUBST(GTKHTML2_LIBS)
-AM_CONDITIONAL(BUILD_GTKHTML2, $build_gtkhtml2)
-if test -n "$export_dynamic"; then
-  GTKHTML2_LIBS=`echo $GTKHTML2_LIBS | sed -e "s/$export_dynamic//"`
-fi
-
-
-dnl should we build the egg.trayicon module?
-AC_ARG_BINDING([eggtray], [ON], [egg.tray])
-if $build_eggtray; then
-  PKG_CHECK_MODULES(EGGTRAY, [gtk+-2.0 >= 2.2.0],
-    build_eggtray=true,
-    build_eggtray=false)
-fi
-AM_CONDITIONAL(BUILD_EGGTRAY, $build_eggtray)
-if test -n "$export_dynamic"; then
-  EGGTRAY_LIBS=`echo $EGGTRAY_LIBS | sed -e "s/$export_dynamic//"`
-fi
-
-dnl should we build the egg.recent module?
-AC_ARG_BINDING([eggrecent], [ON], [egg.recent])
-if $build_eggrecent; then
-  PKG_CHECK_MODULES(EGG_RECENT, [gtk+-2.0 >= 2.0.0 gnome-vfs-2.0
-                                 libbonoboui-2.0 libgnomeui-2.0
-                                 gnome-python-2.0 >= gnome_python_required_version],
-    build_eggrecent=true,
-    build_eggrecent=false)
-fi
-AM_CONDITIONAL(BUILD_EGGRECENT, $build_eggrecent)
-if test -n "$export_dynamic"; then
-  EGGRECENT_LIBS=`echo $EGGRECENT_LIBS | sed -e "s/$export_dynamic//"`
-fi
-
-AM_CONDITIONAL(BUILD_EGG, $build_eggrecent || $build_eggtray)
-
-dnl should we build the gtkmozembed module?
-AC_ARG_BINDING([gtkmozembed], [ON], [gtkmozembed])
-AC_ARG_WITH(gtkmozembed, AS_HELP_STRING(
-                         [--with-gtkmozembed=mozilla|firefox|xulrunner],
-                         [package that provides libgtkmozembed]),
-            [mozpackage=$withval], [mozpackage=any])
-
-if "$build_gtkmozembed"; then
-if test $mozpackage = any ; then
-
-PKG_CHECK_MODULES(GTKMOZEMBED, [xulrunner-gtkmozembed >= xulrunner_required_version
-                                gtk+-2.0              >= gtk_required_version],
-  [build_gtkmozembed=true; mozpackage=xulrunner],
-  [
-PKG_CHECK_MODULES(GTKMOZEMBED, [firefox-gtkmozembed >= firefox_required_version
-                                gtk+-2.0            >= gtk_required_version],
-  [build_gtkmozembed=true; mozpackage=firefox],
-  [
-PKG_CHECK_MODULES(GTKMOZEMBED, [mozilla-gtkmozembed >= mozilla_required_version
-                                gtk+-2.0            >= gtk_required_version],
-  [build_gtkmozembed=true; mozpackage=mozilla],
-  build_gtkmozembed=false)
-  ])
-  ])
-
-else
-
-case $mozpackage in
-     xulrunner) mozpackage_required_version=xulrunner_required_version ;;
-     firefox) mozpackage_required_version=firefox_required_version ;;
-     mozilla)
-         mozpackage_required_version=mozilla_required_version
-         AC_MSG_CHECKING([for extra gtkmozembed code generation flags])
-         PKG_CHECK_MODULES(XUL19, mozilla-gtkmozembed >= 0.21 gtk+-2.0,
-                           GTKMOZEMBED_CODEGEN_DEFINES="-DHAVE_XUL19",
-                           GTKMOZEMBED_CODEGEN_DEFINES="")
-         AC_MSG_RESULT([$GTKMOZEMBED_CODEGEN_DEFINES])
-         ;;
-     *) AC_MSG_ERROR([--with-gtkmozembed argument must be either 'mozilla', 'firefox', or 'xulrunner'])
-esac
-AC_SUBST(GTKMOZEMBED_CODEGEN_DEFINES)
-
-PKG_CHECK_MODULES(GTKMOZEMBED, [$mozpackage-gtkmozembed >= $mozpackage_required_version,
-                                gtk+-2.0                >= gtk_required_version],
-  build_gtkmozembed=true,
-  build_gtkmozembed=false)
-
-fi
-
-AM_CONDITIONAL(BUILD_GTKMOZEMBED, $build_gtkmozembed)
-if test -n "$export_dynamic"; then
-  GTKMOZEMBED_LIBS=`echo $GTKMOZEMBED_LIBS | sed -e "s/$export_dynamic//"`
-fi
-MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
-if test -z "$MOZILLA_HOME"; then
-   MOZILLA_HOME="`$PKG_CONFIG --variable=sdkdir $mozpackage-gtkmozembed`/lib"
-fi
-AC_SUBST(MOZILLA_HOME)
-
-fi # if build_gtkmozembed
-
-AM_CONDITIONAL(BUILD_GTKMOZEMBED, $build_gtkmozembed)
-if test -n "$export_dynamic"; then
-  GTKMOZEMBED_LIBS=`echo $GTKMOZEMBED_LIBS | sed -e "s/$export_dynamic//"`
-fi
-
-
-dnl should we build the gtkspell module?
-AC_ARG_BINDING([gtkspell], [ON])
-if $build_gtkspell; then
-  PKG_CHECK_MODULES(GTKSPELL, [gtkspell-2.0 >= 2.0.0 pygtk-2.0 >= pygtk_required_version],
-    build_gtkspell=true,
-    build_gtkspell=false)
-fi
-AM_CONDITIONAL(BUILD_GTKSPELL, $build_gtkspell)
-if test -n "$export_dynamic"; then
-  GTKSPELL_LIBS=`echo $GTKSPELL_LIBS | sed -e "s/$export_dynamic//"`
-fi
-
-dnl should we build the gdl module?
-AC_ARG_BINDING([gdl], [ON])
-if $build_gdl; then
-  have_gdl07=false
-  PKG_CHECK_MODULES(GDL, [gdl-1.0 >= 2.27.92 pygtk-2.0 >= pygtk_required_version], dnl
-                    [build_gdl=true; have_gdl07=true], build_gdl=false)
-fi
-
-AM_CONDITIONAL(BUILD_GDL, $build_gdl)
-if test -n "$export_dynamic"; then
-  GDL_LIBS=`echo $GDL_LIBS | sed -e "s/$export_dynamic//"`
-fi
-
-if $have_gdl07; then
-  AC_DEFINE([HAVE_GDL_0_7], [], [If GDL >= 0.7 was found])
-fi
-
-AC_SUBST([PYGOBJECT_CODEGEN_DEFINES])
-if $have_gdl07; then
-  PYGOBJECT_CODEGEN_DEFINES="-DHAVE_GDL_0_7 $PYGOBJECT_CODEGEN_DEFINES";
-fi
 
+PKG_CHECK_MODULES(GDA, [libgda-4.0 >= libgda_required_version pygtk-2.0 >= pygtk_required_version])
 
-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
-  PKG_CHECK_MODULES(GKSU2, [libgksu2 >= gksu2_required_version
-                           pygtk-2.0 >= pygtk_required_version
-                           gtk+-2.0  >= gtk_required_version],
-    build_gksu2=true,
-    build_gksu2=false)
-fi
-AM_CONDITIONAL(BUILD_GKSU2, $build_gksu2)
-if test -n "$export_dynamic"; then
-  GKSU2_LIBS=`echo $GKSU2_LIBS | sed -e "s/$export_dynamic//"`
-fi
-
-dnl should we build the gksu module?
-AC_ARG_BINDING([gksu], [ON])
-if $build_gksu; then
-  PKG_CHECK_MODULES(GKSU, [libgksu1.2 >= gksu_required_version
-                           pygtk-2.0 >= pygtk_required_version],
-    build_gksu=true,
-    build_gksu=false)
-fi
-AM_CONDITIONAL(BUILD_GKSU, $build_gksu)
-if test -n "$export_dynamic"; then
-  GKSU_LIBS=`echo $GKSU_LIBS | sed -e "s/$export_dynamic//"`
-fi
-
-dnl should we build the gksu.ui module?
-AC_ARG_BINDING([gksuui], [ON], [gksu.ui])
-if $build_gksuui; then
-  PKG_CHECK_MODULES(GKSUUI, [libgksuui1.0 >= gksuui_required_version
-                             pygtk-2.0 >= pygtk_required_version],
-    build_gksuui=true,
-    build_gksuui=false)
-fi
-AM_CONDITIONAL(BUILD_GKSUUI, $build_gksuui)
-if test -n "$export_dynamic"; then
-  GKSUUI_LIBS=`echo $GKSUUI_LIBS | sed -e "s/$export_dynamic//"`
-fi
-
-
 dnl add required cflags ...
 JH_ADD_CFLAG([-Wall])
 dnl commented because it causes compilation problems in egg/recent
@@ -391,50 +156,8 @@ JH_ADD_CFLAG([-fno-strict-aliasing])
 
 AC_CONFIG_FILES(
   Makefile
-  gtkhtml2/Makefile
-  egg/Makefile
-  egg/tray/Makefile
-  egg/recent/Makefile
-  gtkmozembed/Makefile
-  gtkspell/Makefile
-  gdl/Makefile
   gda/Makefile
   gda/pygda-4.0.pc
-  gksu2/Makefile
-  gksu/Makefile
-  gnome-python-extras-2.0.pc
   tests/Makefile
-  docs/gtkmozembed/Makefile
-  docs/gtkspell/Makefile
-  docs/gtkmozembed/entities.docbook
-  docs/gtkspell/entities.docbook
 )
 AC_OUTPUT
-
-echo
-echo "The following modules will be built:"
-echo
-$build_gtkhtml2          && echo     gtkhtml2
-$build_eggtray           && echo     egg.trayicon
-$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
-echo
-
-echo "The following modules will NOT be built:"
-echo
-$build_gtkhtml2          || echo     gtkhtml2
-$build_eggtray           || echo     egg.trayicon
-$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/gda/Makefile.am b/gda/Makefile.am
index 8ac68ef..debe7fe 100644
--- a/gda/Makefile.am
+++ b/gda/Makefile.am
@@ -24,9 +24,7 @@ pkgpyexecdir = $(pyexecdir)/gtk-2.0
 #common_ldflags = -module -avoid-version
 
 # libgda binding
-if BUILD_GDA
 pkgpyexec_LTLIBRARIES = gda.la
-endif
 
 gda_la_CFLAGS = $(GDA_CFLAGS)
 
diff --git a/pygda.doap b/pygda.doap
new file mode 100644
index 0000000..b404a53
--- /dev/null
+++ b/pygda.doap
@@ -0,0 +1,21 @@
+<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+         xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#";
+         xmlns:foaf="http://xmlns.com/foaf/0.1/";
+         xmlns:gnome="http://api.gnome.org/doap-extensions#";
+         xmlns="http://usefulinc.com/ns/doap#";>
+
+  <name xml:lang="en">pygda</name>
+  <shortdesc xml:lang="en">Python bindings for libgda</shortdesc>
+  <homepage rdf:resource="http://live.gnome.org/PyGDA"; />
+  <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=pygda"; />
+  <category rdf:resource="http://api.gnome.org/doap-extensions#bindings"; />
+
+
+  <maintainer>
+    <foaf:Person>
+      <foaf:name>Murray Cumming</foaf:name>
+      <foaf:mbox rdf:resource="mailto:murrayc murrayc com" />
+      <gnome:userid>murrayc</gnome:userid>
+    </foaf:Person>
+  </maintainer>
+</Project>



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