Merged in feature/fix-gir-version-number (pull request #80)
Feature/fix gir version number
Approved-by: Elliott Sales de Andrade
--- a/gplugin-gtk/meson.build Sun Apr 19 08:59:19 2020 +0000
+++ b/gplugin-gtk/meson.build Fri Apr 24 01:58:41 2020 +0000
@@ -120,7 +120,7 @@
includes : [gplugin_gir[0], 'Gtk-3.0'],
namespace : 'GPluginGtk',
symbol_prefix : 'gplugin_gtk',
- nsversion : '@0@.0'.format(GPLUGIN_MAJOR_VERSION), export_packages: ['gplugin-gtk'],
extra_args : ['--quiet', '-DGPLUGIN_GTK_COMPILATION'])
--- a/gplugin/meson.build Sun Apr 19 08:59:19 2020 +0000
+++ b/gplugin/meson.build Fri Apr 24 01:58:41 2020 +0000
@@ -209,7 +209,7 @@
symbol_prefix : 'gplugin',
- nsversion : '@0@.0'.format(GPLUGIN_MAJOR_VERSION), export_packages : ['gplugin'],
extra_args : ['--quiet', '-DGPLUGIN_COMPILATION'])
--- a/lua/tests/plugins/basic.lua Sun Apr 19 08:59:19 2020 +0000
+++ b/lua/tests/plugins/basic.lua Fri Apr 24 01:58:41 2020 +0000
@@ -16,7 +16,7 @@
local lgi = require 'lgi'
-local GPlugin = lgi.GPlugin+local GPlugin = lgi.require('GPlugin', '1.0') return GPlugin.PluginInfo {
--- a/lua/tests/plugins/dependent.lua Sun Apr 19 08:59:19 2020 +0000
+++ b/lua/tests/plugins/dependent.lua Fri Apr 24 01:58:41 2020 +0000
@@ -16,7 +16,7 @@
local lgi = require 'lgi'
-local GPlugin = lgi.GPlugin+local GPlugin = lgi.require('GPlugin', '1.0') return GPlugin.PluginInfo {
--- a/lua/tests/plugins/load-exception.lua Sun Apr 19 08:59:19 2020 +0000
+++ b/lua/tests/plugins/load-exception.lua Fri Apr 24 01:58:41 2020 +0000
@@ -16,7 +16,7 @@
local lgi = require 'lgi'
-local GPlugin = lgi.GPlugin+local GPlugin = lgi.require('GPlugin', '1.0') return GPlugin.PluginInfo {
--- a/lua/tests/plugins/load-failed.lua Sun Apr 19 08:59:19 2020 +0000
+++ b/lua/tests/plugins/load-failed.lua Fri Apr 24 01:58:41 2020 +0000
@@ -16,7 +16,7 @@
local lgi = require 'lgi'
-local GPlugin = lgi.GPlugin+local GPlugin = lgi.require('GPlugin', '1.0') return GPlugin.PluginInfo {
--- a/lua/tests/plugins/unload-failed.lua Sun Apr 19 08:59:19 2020 +0000
+++ b/lua/tests/plugins/unload-failed.lua Fri Apr 24 01:58:41 2020 +0000
@@ -16,7 +16,7 @@
local lgi = require 'lgi'
-local GPlugin = lgi.GPlugin+local GPlugin = lgi.require('GPlugin', '1.0') return GPlugin.PluginInfo {
--- a/packaging/debian/compat Sun Apr 19 08:59:19 2020 +0000
+++ b/packaging/debian/compat Fri Apr 24 01:58:41 2020 +0000
@@ -1,1 +1,1 @@
--- a/packaging/debian/control Sun Apr 19 08:59:19 2020 +0000
+++ b/packaging/debian/control Fri Apr 24 01:58:41 2020 +0000
@@ -92,7 +92,7 @@
This package contains the gplugin-gtk-viewer application for viewing plugins.
-Package: gir1.2-gplugin-0.0+Package: gir1.2-gplugin-1.0 Depends: ${gir:Depends}, ${misc:Depends}, libgplugin0
@@ -104,6 +104,18 @@
This package can be used by other packages using the GIRepository format to
generate dynamic bindings for libgplugin.
+Package: gir1.2-gplugin-gtk-1.0 +Depends: ${gir:Depends}, ${misc:Depends}, libgplugin0 +Description: typelibe for libgplugin + GPlugin is a GObject based library that implements a reusable plugin system + which supports loading plugins in other languages via loaders. It relies + heavily on GObjectIntrospection to expose its API to the other languages. + This package can be used by other packages using the GIRepository format to + generate dynamic bindings for libgplugin-gtk. Depends: ${misc:Depends}, ${shlibs:Depends}, liblua5.1-0,
--- a/packaging/debian/gir1.2-gplugin-0.0.install Sun Apr 19 08:59:19 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/*/girepository-1.0/-debian/tmp/usr/share/gir-1.0/--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/packaging/debian/gir1.2-gplugin-1.0.install Fri Apr 24 01:58:41 2020 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/lib/*/girepository-1.0/GPlugin-1.0.typelib --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/packaging/debian/gir1.2-gplugin-gtk-1.0.install Fri Apr 24 01:58:41 2020 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/lib/*/girepository-1.0/GPluginGtk-1.0.typelib --- a/packaging/debian/libgplugin-dev.install Sun Apr 19 08:59:19 2020 +0000
+++ b/packaging/debian/libgplugin-dev.install Fri Apr 24 01:58:41 2020 +0000
@@ -3,7 +3,7 @@
debian/tmp/usr/include/gplugin-1.0/gplugin-native.h
debian/tmp/usr/lib/*/libgplugin.so
debian/tmp/usr/lib/*/pkgconfig/gplugin.pc
+debian/tmp/usr/share/gir-1.0/GPlugin-1.0.gir debian/tmp/usr/share/gplugin/valgrind/gplugin.supp
debian/tmp/usr/share/vala/vapi/gplugin.deps
debian/tmp/usr/share/vala/vapi/gplugin.vapi
--- a/packaging/debian/libgplugin-gtk-dev.install Sun Apr 19 08:59:19 2020 +0000
+++ b/packaging/debian/libgplugin-gtk-dev.install Fri Apr 24 01:58:41 2020 +0000
@@ -2,5 +2,6 @@
usr/include/gplugin-1.0/gplugin-gtk.h
debian/tmp/usr/lib/*/libgplugin-gtk.so
debian/tmp/usr/lib/*/pkgconfig/gplugin-gtk.pc
+debian/tmp/usr/share/gir-1.0/GPluginGtk-1.0.gir debian/tmp/usr/share/vala/vapi/gplugin-gtk.deps
-debian/tmp/usr/share/vala/vapi/gplugin-gtk.vapi+debian/tmp/usr/share/vala/vapi/gplugin-gtk.vapi \ No newline at end of file
--- a/packaging/gplugin.spec.in Sun Apr 19 08:59:19 2020 +0000
+++ b/packaging/gplugin.spec.in Fri Apr 24 01:58:41 2020 +0000
@@ -183,10 +183,10 @@
%doc HACKING.md README.md
-%{_datadir}/gir-1.0/GPlugin-0.0.gir+%{_datadir}/gir-1.0/GPlugin-1.0.gir %{_datadir}/gtk-doc/html/gplugin/
%{_includedir}/gplugin-1.0/
-%{_libdir}/girepository-1.0/GPlugin-0.0.typelib+%{_libdir}/girepository-1.0/GPlugin-1.0.typelib %{_libdir}/libgplugin.so.0
%{_libdir}/pkgconfig/gplugin-gtk.pc
@@ -205,10 +205,10 @@
%dir %{_datadir}/glade/catalogs/
-%{_datadir}/gir-1.0/GPluginGtk-0.0.gir+%{_datadir}/gir-1.0/GPluginGtk-1.0.gir %{_datadir}/glade/catalogs/gplugin-gtk.xml
%{_datadir}/gtk-doc/html/gplugin-gtk/
-%{_libdir}/girepository-1.0/GPluginGtk-0.0.typelib+%{_libdir}/girepository-1.0/GPluginGtk-1.0.typelib %{_libdir}/libgplugin-gtk.so
%{_libdir}/libgplugin-gtk.so.0
--- a/perl/tests/plugins/basic.pl Sun Apr 19 08:59:19 2020 +0000
+++ b/perl/tests/plugins/basic.pl Fri Apr 24 01:58:41 2020 +0000
@@ -17,7 +17,7 @@
use Glib::Object::Introspection;
-Glib::Object::Introspection->setup(basename => "GPlugin", version => "0.0", package=> "GPlugin");+Glib::Object::Introspection->setup(basename => "GPlugin", version => "1.0", package=> "GPlugin"); return GPlugin::PluginInfo->new(
--- a/perl/tests/plugins/dependent.pl Sun Apr 19 08:59:19 2020 +0000
+++ b/perl/tests/plugins/dependent.pl Fri Apr 24 01:58:41 2020 +0000
@@ -17,7 +17,7 @@
use Glib::Object::Introspection;
-Glib::Object::Introspection->setup(basename => "GPlugin", version => "0.0", package=> "GPlugin");+Glib::Object::Introspection->setup(basename => "GPlugin", version => "1.0", package=> "GPlugin"); return GPlugin::PluginInfo->new(
--- a/perl/tests/plugins/load-exception.pl Sun Apr 19 08:59:19 2020 +0000
+++ b/perl/tests/plugins/load-exception.pl Fri Apr 24 01:58:41 2020 +0000
@@ -17,7 +17,7 @@
use Glib::Object::Introspection;
-Glib::Object::Introspection->setup(basename => "GPlugin", version => "0.0", package=> "GPlugin");+Glib::Object::Introspection->setup(basename => "GPlugin", version => "1.0", package=> "GPlugin"); return GPlugin::PluginInfo->new(
--- a/perl/tests/plugins/load-failed.pl Sun Apr 19 08:59:19 2020 +0000
+++ b/perl/tests/plugins/load-failed.pl Fri Apr 24 01:58:41 2020 +0000
@@ -17,7 +17,7 @@
use Glib::Object::Introspection;
-Glib::Object::Introspection->setup(basename => "GPlugin", version => "0.0", package=> "GPlugin");+Glib::Object::Introspection->setup(basename => "GPlugin", version => "1.0", package=> "GPlugin"); return GPlugin::PluginInfo->new(
--- a/perl/tests/plugins/unload-failed.pl Sun Apr 19 08:59:19 2020 +0000
+++ b/perl/tests/plugins/unload-failed.pl Fri Apr 24 01:58:41 2020 +0000
@@ -17,7 +17,7 @@
use Glib::Object::Introspection;
-Glib::Object::Introspection->setup(basename => "GPlugin", version => "0.0", package=> "GPlugin");+Glib::Object::Introspection->setup(basename => "GPlugin", version => "1.0", package=> "GPlugin"); return GPlugin::PluginInfo->new(
--- a/python/tests/plugins/basic.py Sun Apr 19 08:59:19 2020 +0000
+++ b/python/tests/plugins/basic.py Fri Apr 24 01:58:41 2020 +0000
@@ -14,7 +14,10 @@
# 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/>.
-from gi.repository import GPlugin+gi.require_version('GPlugin', '1.0') +from gi.repository import GPlugin # noqa --- a/python/tests/plugins/dependent.py Sun Apr 19 08:59:19 2020 +0000
+++ b/python/tests/plugins/dependent.py Fri Apr 24 01:58:41 2020 +0000
@@ -14,7 +14,10 @@
# 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/>.
-from gi.repository import GPlugin+gi.require_version('GPlugin', '1.0') +from gi.repository import GPlugin # noqa --- a/python/tests/plugins/load-exception.py Sun Apr 19 08:59:19 2020 +0000
+++ b/python/tests/plugins/load-exception.py Fri Apr 24 01:58:41 2020 +0000
@@ -14,7 +14,10 @@
# 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/>.
-from gi.repository import GPlugin+gi.require_version('GPlugin', '1.0') +from gi.repository import GPlugin # noqa --- a/python/tests/plugins/load-failed.py Sun Apr 19 08:59:19 2020 +0000
+++ b/python/tests/plugins/load-failed.py Fri Apr 24 01:58:41 2020 +0000
@@ -14,7 +14,10 @@
# 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/>.
-from gi.repository import GPlugin+gi.require_version('GPlugin', '1.0') +from gi.repository import GPlugin # noqa --- a/python/tests/plugins/unload-failed.py Sun Apr 19 08:59:19 2020 +0000
+++ b/python/tests/plugins/unload-failed.py Fri Apr 24 01:58:41 2020 +0000
@@ -14,7 +14,10 @@
# 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/>.
-from gi.repository import GPlugin+gi.require_version('GPlugin', '1.0') +from gi.repository import GPlugin # noqa
