release: update news and date in manualGTK_DOC_1_15

4 files changed, 32 insertions, 6 deletions

diff --git a/HACKING b/HACKING
index d4b896a..3a8d604 100644
--- a/HACKING
+++ b/HACKING
@@ -13,12 +13,18 @@ http://live.gnome.org/MaintainersCorner/Releasing
 
 - bump release date in:
   help/manual/C/gtk-doc-manual.xml
+- bump version in (1.14.1 -> 1.15)
+  configure.ac
 
 - update NEWS
   ./bugzilla.py general 1.12 gtk-doc >RELNOTES.txt
   git log --summary --format=short GTK_DOC_1_11.. >ChangeLog-1.12
   grep "Author:" ChangeLog-1.12 | sed 's/Author:\(.*\)\ <.*>/\1/' | sort | uniq >>RELNOTES.txt
-  add then copy to NEWS
+  and then copy to NEWS
+
+- commit
+  git add configure.ac NEWS help/manual/C/gtk-doc-manual.xml
+  git commit -m"release: update news and date in manual"
 
 - dist
   make dist
@@ -36,9 +42,13 @@ http://live.gnome.org/MaintainersCorner/Releasing
   exit
 
 - bump versions in:
-  configure.in
+  configure.ac
   help/manual/C/gtk-doc-manual.xml
 
+- commit
+  git add configure.ac help/manual/C/gtk-doc-manual.xml
+  git commit -m"release: bump versions and back to development"
+
 - update web-pages (gtk-web/gtk-doc)
 
 - if we want a icon on the newsfeed, we should copy a icon like on
diff --git a/NEWS b/NEWS
index aadcd58..537dc36 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+GTK-Doc 1.15    (May 21 2010)
+============
+
+ Changes
+
+ o 614496 : Support for multiple DOC_SOURCE_DIR directories
+ o 615550 : gtk-doc fails to recognize (scope ...) and (skip) annotations
+
+ Contributors
+
+ Andreas Rottmann
+ Jorge González
+ Nicola Fontana
+ Nikos Bakaoukas
+ Stefan Kost
+
 GTK-Doc 1.14    (Mar 28 2010)
 ============
 
diff --git a/configure.ac b/configure.ac
index d3680a8..48bb914 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl Use a simple 2-digit version number for a while, since our old example
 dnl Makefile can only cope with that, i.e. use 1.1, 1.2, 1.3 ... 9.9.
 dnl FIXME: I can't see anything failing (1.14.1), lets try to use a three digit
 dnl number for the development version
-m4_define(gtk_doc_version, 1.14.1)
+m4_define(gtk_doc_version, 1.15)
 
 AC_INIT([gtk-doc], [gtk_doc_version], [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk-doc])
 
diff --git a/help/manual/C/gtk-doc-manual.xml b/help/manual/C/gtk-doc-manual.xml
index 76f6687..ddcebb8 100644
--- a/help/manual/C/gtk-doc-manual.xml
+++ b/help/manual/C/gtk-doc-manual.xml
@@ -77,10 +77,10 @@
     
     <revhistory>
       <revision>
-        <revnumber>1.14.1</revnumber>
-        <date>6 April 2010</date>
+        <revnumber>1.15</revnumber>
+        <date>21 May 2010</date>
         <authorinitials>sk</authorinitials>
-        <revremark>development version</revremark>
+        <revremark>bug and regression fixes</revremark>
       </revision>
       <revision>
         <revnumber>1.14</revnumber>