gnome-python r623 - trunk

[gjc svn gnome org]

Author: gjc
Date: Sun Mar  9 19:12:21 2008
New Revision: 623
URL: http://svn.gnome.org/viewvc/gnome-python?rev=623&view=rev

Log:
2.22.0

Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/NEWS
   trunk/configure.ac
   trunk/wscript

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sun Mar  9 19:12:21 2008
@@ -23,7 +23,6 @@
 
 EXTRA_DIST = \
   INSTALL.WAF \
-  waf \
   wscript \
   gnome-python.spec \
   gnome-python.spec.in \
@@ -53,3 +52,9 @@
   examples/vfs/pygvfsmethod/pyfs.conf \
   examples/vfs/pygvfsmethod/pyfs.py \
   examples/popt/popt.py
+
+
+dist-hook: dist-hook-local
+	cp `which waf` $(distdir)
+
+.PHONY : dist-hook-local

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sun Mar  9 19:12:21 2008
@@ -1,5 +1,10 @@
 Overview of Changes from gnome-python 2.21.0 to gnome-python 2.21.1
 ====================================================================
+* Cleanup link flags (Paul, #519014)
+* Fix typo in generation of the .pc file in WAF build (Gustavo)
+
+Overview of Changes from gnome-python 2.21.0 to gnome-python 2.21.1
+====================================================================
 * Remove some deprecation warnings from examples (Nishio Futoshi, Gian)
 * WAF build fixes (Gustavo)
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Mar  9 19:12:21 2008
@@ -3,8 +3,8 @@
 
 dnl the gnome-python version number
 m4_define(gnome_python_major_version, 2)
-m4_define(gnome_python_minor_version, 21)
-m4_define(gnome_python_micro_version, 1)
+m4_define(gnome_python_minor_version, 22)
+m4_define(gnome_python_micro_version, 0)
 m4_define(gnome_python_version, dnl
   gnome_python_major_version.gnome_python_minor_version.gnome_python_micro_version)
 

Modified: trunk/wscript
==============================================================================
--- trunk/wscript	(original)
+++ trunk/wscript	Sun Mar  9 19:12:21 2008
@@ -3,7 +3,7 @@
 import Params
 Params.g_autoconfig = True
 
-VERSION = '2.21.1'
+VERSION = '2.22.0'
 APPNAME = 'gnome-python'
 srcdir = '.'
 blddir = 'build'