2.30.02.30.0

4 files changed, 19 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 9d4814ab..ee1eac2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+2.30.0
+
 2011-09-27  Murray Cumming  <murrayc@murrayc.com>
 
 	Gio::DBus::Server: Add constructors.
diff --git a/NEWS b/NEWS
index aca690d7..c7bf048d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+2.30.0:
+
+giomm:
+* DBus::Server: Add constructors.
+* Remove Application and friends, because they are still not ready.
+  See bug ##637445#c29
+  (Murray Cumming)
+
+Documentation:
+* gmmproc: DocParser: Correct the removal of link tags.
+  (José Alburquerque)
+	
 2.29.13:
 
 giomm:
diff --git a/configure.ac b/configure.ac
index 68f618c8..e9003429 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU Lesser General Public License
 ## along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([glibmm], [2.29.13],
+AC_INIT([glibmm], [2.30.0],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=glibmm],
         [glibmm], [http://www.gtkmm.org/])
 AC_PREREQ([2.59])
@@ -60,7 +60,7 @@ AS_IF([test "x$enable_static" = xyes],
   AC_DEFINE([GIOMM_STATIC_LIB],  [1], [Define if giomm is built as a static library])
 ])
 
-glibreq='2.0 >= 2.29.8'
+glibreq='2.0 >= 2.30.0'
 
 GLIBMM_MODULES="sigc++-2.0 >= 2.0.10 glib-$glibreq gobject-$glibreq gmodule-$glibreq"
 GIOMM_MODULES="$GLIBMM_MODULES gio-$glibreq"
diff --git a/gio/src/datainputstream.hg b/gio/src/datainputstream.hg
index 023e4967..412eb082 100644
--- a/gio/src/datainputstream.hg
+++ b/gio/src/datainputstream.hg
@@ -154,7 +154,7 @@ public:
   bool read_until(std::string& data, const std::string& stop_chars, const Glib::RefPtr<Cancellable>& cancellable);
   _IGNORE(g_data_input_stream_read_until)
 
-  //TODO: This will be really deprecated sometime, maybe even before glib 2.28.0.
+  //TODO: This will be really deprecated sometime, maybe sometime after glib 2.30.0.
   /** A non-cancellable version of read_until().
    *
    * Note that, in contrast to read_until_async(),
@@ -172,7 +172,7 @@ public:
    */
   bool read_until(std::string& data, const std::string& stop_chars);
 
-  //TODO: This will be really deprecated sometime after glib 2.28.0.
+  //TODO: This will be really deprecated sometime after glib 2.30.0.
   /** The asynchronous version of read_until(). It is
    * an error to have two outstanding calls to this function.
    *
@@ -195,7 +195,7 @@ public:
   void read_until_async(const std::string& stop_chars, const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable, int io_priority = Glib::PRIORITY_DEFAULT);
   _IGNORE(g_data_input_stream_read_until_async)
 
-  //TODO: This will be really deprecated sometime after glib 2.28.0.
+  //TODO: This will be really deprecated sometime after glib 2.30.0.
   /** Finish an asynchronous call started by read_until_async().
    *
    * @param result The AsyncResult that was provided to the callback slot.