summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--Makefile.am9
-rw-r--r--NEWS12
3 files changed, 22 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fd79802..51e69bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+=== 2.14.2 ===
+
2008-05-23 Johan Dahlin <jdahlin@async.com.br>
Merge from trunk:
diff --git a/Makefile.am b/Makefile.am
index 824027f..e1764f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,3 +77,12 @@ doc-dist:
cp -r docs/style.css pygobject
tar cfz $(PACKAGE)-docs.tar.gz pygobject
rm -fr pygobject
+
+release-tag:
+ @ROOT=`svn info --xml|egrep ^"<url>"|cut -d\> -f2|cut -d\< -f1`; \
+ SVNVERSION=`echo $(VERSION)|sed s/\\\./_/g`;\
+ echo "* Tagging $(VERSION)"; \
+ svn cp -m "Tag $(VERSION)" \
+ $$ROOT \
+ svn+ssh://svn.gnome.org/svn/pygobject/tags/PYGOBJECT_$$SVNVERSION
+
diff --git a/NEWS b/NEWS
index fdcef07..194fd7a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,14 @@
-2.14.1 03-jan-2007
+2.14.2 23-may-2008
+ - Allow gobject.property work with subclasses. (#523352, Tomeu Vizoso)
+ - Unbreak Source.prepare (#523075, Bryan Silverthorn)
+ - Never override customly set 'tp_new' and 'tp_alloc' (Paul Pogonyshev)
+ - Don't link against libffi if we cannot find libffi
+ on the system. (#496006, Ed Catmur)
+ - Dist .m4 files. (#496011, Ed Catmur)
+ - Don't return NULL after warning of enum comparsion
+ (#519631, Paul Pogonyshev)
+
+2.14.1 03-jan-2008
- Avoid wakeups when using Python trunk (Johan Dahlin, #481569)
- Add an uninstalled.pc (Damien Carbery, #486876)