diff options
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | configure.ac | 11 | ||||
-rw-r--r-- | data/Makefile.am | 4 | ||||
-rw-r--r-- | data/icons/Makefile.am | 8 | ||||
-rw-r--r-- | data/libpeas-1.0.pc.in (renamed from data/libpeas-2.0.pc.in) | 4 | ||||
-rw-r--r-- | data/libpeasui-1.0.pc.in (renamed from data/libpeasui-2.0.pc.in) | 6 | ||||
-rw-r--r-- | libpeas/Makefile.am | 22 | ||||
-rw-r--r-- | libpeas/peas-dirs.c | 16 | ||||
-rw-r--r-- | libpeasui/Makefile.am | 26 | ||||
-rw-r--r-- | loaders/c/Makefile.am | 2 | ||||
-rw-r--r-- | loaders/python/Makefile.am | 2 | ||||
-rw-r--r-- | loaders/seed/Makefile.am | 2 | ||||
-rw-r--r-- | peas-demo/Makefile.am | 4 |
13 files changed, 54 insertions, 57 deletions
@@ -25,8 +25,8 @@ Makefile.in /config.sub /configure /configure.lineno -/data/libpeas-2.0.pc -/data/libpeasui-2.0.pc +/data/libpeas-1.0.pc +/data/libpeasui-1.0.pc /depcomp /libpeas/peas-marshal.h /libpeas/peas-marshal.c diff --git a/configure.ac b/configure.ac index c73fc39..f0695f8 100644 --- a/configure.ac +++ b/configure.ac @@ -2,8 +2,8 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.63]) -m4_define(peas_major_version, 2) -m4_define(peas_minor_version, 29) +m4_define(peas_major_version, 0) +m4_define(peas_minor_version, 5) m4_define(peas_micro_version, 0) m4_define(peas_interface_age, 0) @@ -30,9 +30,6 @@ AC_SUBST(PEAS_MICRO_VERSION, peas_micro_version) AC_SUBST(PEAS_VERSION, peas_version) -PEAS_API_VERSION=2.20 -AC_SUBST(PEAS_API_VERSION) - AM_INIT_AUTOMAKE([1.11 dist-bzip2 no-dist-gzip -Wno-portability]) AM_MAINTAINER_MODE([enable]) @@ -265,8 +262,8 @@ loaders/c/Makefile loaders/python/Makefile loaders/seed/Makefile data/Makefile -data/libpeas-2.0.pc -data/libpeasui-2.0.pc +data/libpeas-1.0.pc +data/libpeasui-1.0.pc data/icons/Makefile peas-demo/Makefile peas-demo/plugins/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 0fb0b78..b8dcb7c 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS=icons pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libpeas-2.0.pc libpeasui-2.0.pc +pkgconfig_DATA = libpeas-1.0.pc libpeasui-1.0.pc -EXTRA_DIST = libpeas-2.0.pc.in libpeasui-2.0.pc.in +EXTRA_DIST = libpeas-1.0.pc.in libpeasui-1.0.pc.in diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index b58422a..d172b6d 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -1,7 +1,7 @@ -icons16x16dir = $(pkgdatadir)/icons/hicolor/16x16/actions -icons22x22dir = $(pkgdatadir)/icons/hicolor/22x22/actions -icons32x32dir = $(pkgdatadir)/icons/hicolor/32x32/actions -scalableiconsdir = $(pkgdatadir)/icons/hicolor/scalable/actions +icons16x16dir = $(datadir)/icons/hicolor/16x16/actions +icons22x22dir = $(datadir)/icons/hicolor/22x22/actions +icons32x32dir = $(datadir)/icons/hicolor/32x32/actions +scalableiconsdir = $(datadir)/icons/hicolor/scalable/actions icons16x16_DATA = 16x16/libpeas-plugin.png icons22x22_DATA = 22x22/libpeas-plugin.png diff --git a/data/libpeas-2.0.pc.in b/data/libpeas-1.0.pc.in index 722778e..bb03cb8 100644 --- a/data/libpeas-2.0.pc.in +++ b/data/libpeas-1.0.pc.in @@ -7,5 +7,5 @@ Name: libpeas Description: Gedit's Plugin Engine, as a lib Requires: glib-2.0 >= 2.14 Version: @VERSION@ -Cflags: -I${includedir}/libpeas-2.0 -Libs: -L${libdir} -lpeas-2.0 +Cflags: -I${includedir}/libpeas-1.0 +Libs: -L${libdir} -lpeas-1.0 diff --git a/data/libpeasui-2.0.pc.in b/data/libpeasui-1.0.pc.in index 639c565..93672e8 100644 --- a/data/libpeasui-2.0.pc.in +++ b/data/libpeasui-1.0.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: libpeas Description: Gedit's Plugin Engine UI, as a lib -Requires: glib-2.0 >= 2.14, libpeas-2.0 >= @VERSION@ +Requires: glib-2.0 >= 2.14, libpeas-1.0 >= @VERSION@ Version: @VERSION@ -Cflags: -I${includedir}/libpeas-2.0 -Libs: -L${libdir} -lpeasui-2.0 +Cflags: -I${includedir}/libpeas-1.0 +Libs: -L${libdir} -lpeasui-1.0 diff --git a/libpeas/Makefile.am b/libpeas/Makefile.am index 0f9415b..b6c5141 100644 --- a/libpeas/Makefile.am +++ b/libpeas/Makefile.am @@ -1,4 +1,4 @@ -lib_LTLIBRARIES = libpeas-2.0.la +lib_LTLIBRARIES = libpeas-1.0.la INCLUDES = \ -I$(top_srcdir) \ @@ -10,11 +10,11 @@ INCLUDES = \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" -libpeas_2_0_la_LDFLAGS = \ +libpeas_1_0_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -export-dynamic -no-undefined -export-symbols-regex "^[^_].*" -libpeas_2_0_la_LIBADD = $(PEAS_LIBS) $(IGE_MAC_LIBS) +libpeas_1_0_la_LIBADD = $(PEAS_LIBS) $(IGE_MAC_LIBS) INST_H_FILES = \ peas-plugin-info.h \ @@ -49,13 +49,13 @@ BUILT_SOURCES = \ peas-marshal.c \ peas-marshal.h -libpeas_2_0_la_SOURCES = \ +libpeas_1_0_la_SOURCES = \ $(INST_H_FILES) \ $(NOINST_H_FILES) \ $(BUILT_SOURCES) \ $(C_FILES) -headerdir = $(prefix)/include/libpeas-2.0/libpeas +headerdir = $(prefix)/include/libpeas-1.0/libpeas header_DATA = $(INST_H_FILES) peas-marshal.c: peas-marshal.list $(GLIB_GENMARSHAL) @@ -73,15 +73,15 @@ dist-hook: if HAVE_INTROSPECTION -include $(INTROSPECTION_MAKEFILE) - INTROSPECTION_GIRS = Peas-2.0.gir + INTROSPECTION_GIRS = Peas-1.0.gir introspection_sources = $(INST_H_FILES) $(C_FILES) - Peas-2.0.gir: libpeas-2.0.la - Peas_2_0_gir_INCLUDES = GObject-2.0 GModule-2.0 - Peas_2_0_gir_CFLAGS = $(PEAS_CFLAGS) - Peas_2_0_gir_LIBS = libpeas-2.0.la - Peas_2_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources)) + Peas-1.0.gir: libpeas-1.0.la + Peas_1_0_gir_INCLUDES = GObject-2.0 GModule-2.0 + Peas_1_0_gir_CFLAGS = $(PEAS_CFLAGS) + Peas_1_0_gir_LIBS = libpeas-1.0.la + Peas_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources)) girdir = $(datadir)/gir-1.0 dist_gir_DATA = $(INTROSPECTION_GIRS) diff --git a/libpeas/peas-dirs.c b/libpeas/peas-dirs.c index 1c73472..17a15ae 100644 --- a/libpeas/peas-dirs.c +++ b/libpeas/peas-dirs.c @@ -35,7 +35,7 @@ peas_dirs_get_data_dir (void) gchar *data_dir; #ifndef G_OS_WIN32 - data_dir = g_build_filename (DATADIR, "libpeas-2.0", NULL); + data_dir = g_build_filename (DATADIR, "libpeas-1.0", NULL); #elif defined (OS_OSX) IgeMacBundle *bundle = ige_mac_bundle_get_default (); @@ -43,18 +43,18 @@ peas_dirs_get_data_dir (void) { const gchar *bundle_data_dir = ige_mac_bundle_get_datadir (bundle); - data_dir = g_build_filename (bundle_data_dir, "libpeas-2.0", NULL); + data_dir = g_build_filename (bundle_data_dir, "libpeas-1.0", NULL); } else { - data_dir = g_build_filename (DATADIR, "libpeas-2.0", NULL); + data_dir = g_build_filename (DATADIR, "libpeas-1.0", NULL); } #else gchar *win32_dir; win32_dir = g_win32_get_package_installation_directory_of_module (NULL); - data_dir = g_build_filename (win32_dir, "share", "libpeas-2.0", NULL); + data_dir = g_build_filename (win32_dir, "share", "libpeas-1.0", NULL); g_free (win32_dir); #endif @@ -67,7 +67,7 @@ peas_dirs_get_lib_dir (void) gchar *lib_dir; #ifndef G_OS_WIN32 - lib_dir = g_build_filename (LIBDIR, "libpeas-2.0", NULL); + lib_dir = g_build_filename (LIBDIR, "libpeas-1.0", NULL); #elif defined (OS_OSX) IgeMacBundle *bundle = ige_mac_bundle_get_default (); @@ -75,18 +75,18 @@ peas_dirs_get_lib_dir (void) { const gchar *path = ige_mac_bundle_get_resourcesdir (bundle); - lib_dir = g_build_filename (path, "lib", "libpeas-2.0", NULL); + lib_dir = g_build_filename (path, "lib", "libpeas-1.0", NULL); } else { - lib_dir = g_build_filename (LIBDIR, "libpeas-2.0", NULL); + lib_dir = g_build_filename (LIBDIR, "libpeas-1.0", NULL); } #else gchar *win32_dir; win32_dir = g_win32_get_package_installation_directory_of_module (NULL); - data_dir = g_build_filename (win32_dir, "lib", "libpeas-2.0", NULL); + data_dir = g_build_filename (win32_dir, "lib", "libpeas-1.0", NULL); g_free (win32_dir); #endif diff --git a/libpeasui/Makefile.am b/libpeasui/Makefile.am index 7f1e84d..29acb1f 100644 --- a/libpeasui/Makefile.am +++ b/libpeasui/Makefile.am @@ -1,4 +1,4 @@ -lib_LTLIBRARIES = libpeasui-2.0.la +lib_LTLIBRARIES = libpeasui-1.0.la INCLUDES = \ -I$(top_srcdir) \ @@ -8,42 +8,42 @@ INCLUDES = \ $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED) -libpeasui_2_0_la_LDFLAGS = \ +libpeasui_1_0_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -export-dynamic -no-undefined -export-symbols-regex "^[^_].*" -libpeasui_2_0_la_LIBADD = \ +libpeasui_1_0_la_LIBADD = \ $(PEAS_LIBS) \ $(PEASUI_LIBS) \ - $(top_builddir)/libpeas/libpeas-2.0.la + $(top_builddir)/libpeas/libpeas-1.0.la INST_H_FILES = \ peas-ui-configurable.h \ peas-ui-plugin-info.h \ peas-ui-plugin-manager.h -libpeasui_2_0_la_SOURCES = \ +libpeasui_1_0_la_SOURCES = \ peas-ui-configurable.c \ peas-ui-plugin-info.c \ peas-ui-plugin-manager.c \ $(INST_H_FILES) -headerdir = $(prefix)/include/libpeas-2.0/libpeasui +headerdir = $(prefix)/include/libpeas-1.0/libpeasui header_DATA = $(INST_H_FILES) if HAVE_INTROSPECTION -include $(INTROSPECTION_MAKEFILE) - INTROSPECTION_GIRS = PeasUI-2.0.gir + INTROSPECTION_GIRS = PeasUI-1.0.gir INTROSPECTION_SCANNER_ARGS = --add-include-path=$(top_builddir)/libpeas INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)/libpeas - introspection_sources = $(libpeasui_2_0_la_SOURCES) + introspection_sources = $(libpeasui_1_0_la_SOURCES) - PeasUI-2.0.gir: libpeasui-2.0.la - PeasUI_2_0_gir_INCLUDES = GObject-2.0 $(GTK_TYPELIB) Peas-2.0 - PeasUI_2_0_gir_CFLAGS = $(PEAS_CFLAGS) $(PEASUI_CFLAGS) -I$(top_srcdir) - PeasUI_2_0_gir_LIBS = libpeasui-2.0.la - PeasUI_2_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources)) + PeasUI-1.0.gir: libpeasui-1.0.la + PeasUI_1_0_gir_INCLUDES = GObject-2.0 $(GTK_TYPELIB) Peas-1.0 + PeasUI_1_0_gir_CFLAGS = $(PEAS_CFLAGS) $(PEASUI_CFLAGS) -I$(top_srcdir) + PeasUI_1_0_gir_LIBS = libpeasui-1.0.la + PeasUI_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources)) girdir = $(datadir)/gir-1.0 dist_gir_DATA = $(INTROSPECTION_GIRS) diff --git a/loaders/c/Makefile.am b/loaders/c/Makefile.am index c4cf91a..88aa841 100644 --- a/loaders/c/Makefile.am +++ b/loaders/c/Makefile.am @@ -1,6 +1,6 @@ # C plugin loader -loaderdir = $(libdir)/libpeas-2.0/loaders +loaderdir = $(libdir)/libpeas-1.0/loaders INCLUDES = \ -I$(top_srcdir) \ diff --git a/loaders/python/Makefile.am b/loaders/python/Makefile.am index d64fc07..a9a966d 100644 --- a/loaders/python/Makefile.am +++ b/loaders/python/Makefile.am @@ -1,6 +1,6 @@ # C plugin loader -loaderdir = $(libdir)/libpeas-2.0/loaders +loaderdir = $(libdir)/libpeas-1.0/loaders INCLUDES = \ -I$(top_srcdir) \ diff --git a/loaders/seed/Makefile.am b/loaders/seed/Makefile.am index 89a7e1a..b707859 100644 --- a/loaders/seed/Makefile.am +++ b/loaders/seed/Makefile.am @@ -1,6 +1,6 @@ # Seed plugin loader -loaderdir = $(libdir)/libpeas-2.0/loaders +loaderdir = $(libdir)/libpeas-1.0/loaders INCLUDES = \ -I$(top_srcdir) \ diff --git a/peas-demo/Makefile.am b/peas-demo/Makefile.am index 9e96c2e..e1a4c44 100644 --- a/peas-demo/Makefile.am +++ b/peas-demo/Makefile.am @@ -18,8 +18,8 @@ peas_demo_SOURCES = \ peas_demo_LDADD = \ $(PEAS_LIBS) \ $(PEASUI_LIBS) \ - ../libpeas/libpeas-2.0.la \ - ../libpeasui/libpeasui-2.0.la + ../libpeas/libpeas-1.0.la \ + ../libpeasui/libpeasui-1.0.la peas_demo_CFLAGS = \ $(PEAS_CFLAGS) \ |