diff options
author | Murray Cumming <murrayc@murrayc.com> | 2017-08-25 11:19:07 +0200 |
---|---|---|
committer | Murray Cumming <murrayc@murrayc.com> | 2017-08-25 11:19:07 +0200 |
commit | 9f89221b024b028286bea35f7a4d9b873bfb3266 (patch) | |
tree | fbda7c3aff3a6f0abef9fc55ca130badb9323b42 | |
parent | dbf53fdad1133aa6f6966f2ef2fbbaafa4da3340 (diff) | |
download | glibmm-9f89221b024b028286bea35f7a4d9b873bfb3266.tar.gz |
Change the ABI to glibmm-2.54
So we can use the 2.53/54 version numbers for more stable releases.
We don't need to release a stable ABI-parallel glibmm until
we need to release gtkmm 4.0, and that won't happen until GTK+ 4.0.0
happens, and we don't know when that might be.
We did this once before:
https://git.gnome.org/browse/glibmm/commit/?id=dee483b29bdaaabc587f3f8b6bff05663e7dccdc
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | docs/Makefile_web.am_fragment | 6 | ||||
-rw-r--r-- | glib/glibmm.h | 4 | ||||
-rw-r--r-- | tools/Makefile.am | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index efe6a094..1e1598cb 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.53.2], +AC_INIT([glibmm], [2.55.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=glibmm], [glibmm], [http://www.gtkmm.org/]) AC_PREREQ([2.59]) @@ -31,8 +31,8 @@ AM_MAINTAINER_MODE AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>]) MM_PREREQ([0.9.10]) -MM_INIT_MODULE([glibmm-2.54]) -MM_INIT_MODULE([giomm-2.54]) +MM_INIT_MODULE([glibmm-2.56]) +MM_INIT_MODULE([giomm-2.56]) # Copy the mm-common .pl scripts into docs/, # and use them from there, diff --git a/docs/Makefile_web.am_fragment b/docs/Makefile_web.am_fragment index 209e87ca..dd59ab94 100644 --- a/docs/Makefile_web.am_fragment +++ b/docs/Makefile_web.am_fragment @@ -1,8 +1,8 @@ web_host = gtkmm.org -web_path_gtkmm = /home/murrayc/gtkmm.org/docs/glibmm-2.54/ -#web_path_gtkmm = /home/groups/g/gt/gtkmm/htdocs/docs/glibmm-2.54/ +web_path_gtkmm = /home/murrayc/gtkmm.org/docs/glibmm-2.56/ +#web_path_gtkmm = /home/groups/g/gt/gtkmm/htdocs/docs/glibmm-2.56/ web_path_docs = $(web_path_gtkmm)docs/ rsync_args = -vz --rsh ssh -gtkmm_docdir = $(datadir)/doc/glibmm-2.54/docs +gtkmm_docdir = $(datadir)/doc/glibmm-2.56/docs diff --git a/glib/glibmm.h b/glib/glibmm.h index a9e90e02..101b80ed 100644 --- a/glib/glibmm.h +++ b/glib/glibmm.h @@ -65,12 +65,12 @@ * * If your source file is @c program.cc, you can compile it with: * @code - * g++ program.cc -o program `pkg-config --cflags --libs glibmm-2.54 giomm-2.54` + * g++ program.cc -o program `pkg-config --cflags --libs glibmm-2.56 giomm-2.56` * @endcode * * Alternatively, if using autoconf, use the following in @c configure.ac: * @code - * PKG_CHECK_MODULES([GLIBMM], [glibmm-2.54 giomm-2.54]) + * PKG_CHECK_MODULES([GLIBMM], [glibmm-2.56 giomm-2.56]) * @endcode * Then use the generated @c GLIBMM_CFLAGS and @c GLIBMM_LIBS variables in the * project Makefile.am files. For example: diff --git a/tools/Makefile.am b/tools/Makefile.am index 77b2a32d..b583e1d5 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -34,16 +34,16 @@ dist_noinst_DATA = README TODO dist_noinst_SCRIPTS = enum.pl noinst_PROGRAMS = extra_defs_gen/generate_defs_glib extra_defs_gen/generate_defs_gio -lib_LTLIBRARIES = extra_defs_gen/libglibmm_generate_extra_defs-2.54.la +lib_LTLIBRARIES = extra_defs_gen/libglibmm_generate_extra_defs-2.56.la extradefs_includedir = $(includedir)/$(GLIBMM_MODULE_NAME)/glibmm_generate_extra_defs extradefs_include_HEADERS = extra_defs_gen/generate_extra_defs.h extradefs_ldflags = -no-undefined -version-info $(LIBGLIBMM_SO_VERSION) -extra_defs_gen_libglibmm_generate_extra_defs_2_54_la_SOURCES = extra_defs_gen/generate_extra_defs.cc -extra_defs_gen_libglibmm_generate_extra_defs_2_54_la_LDFLAGS = $(extradefs_ldflags) -extra_defs_gen_libglibmm_generate_extra_defs_2_54_la_LIBADD = $(GLIBMM_LIBS) +extra_defs_gen_libglibmm_generate_extra_defs_2_56_la_SOURCES = extra_defs_gen/generate_extra_defs.cc +extra_defs_gen_libglibmm_generate_extra_defs_2_56_la_LDFLAGS = $(extradefs_ldflags) +extra_defs_gen_libglibmm_generate_extra_defs_2_56_la_LIBADD = $(GLIBMM_LIBS) extra_defs_gen_generate_defs_glib_SOURCES = extra_defs_gen/generate_defs_glib.cc extra_defs_gen_generate_defs_glib_LDADD = $(GLIBMM_LIBS) $(lib_LTLIBRARIES) |